From: Emmanuel Bourg Date: Thu, 24 Apr 2014 21:21:10 +0000 (+0200) Subject: Removed trailing spaces X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fjava-package.git;a=commitdiff_plain;h=2a9168df2bfed5c3353dfea956029a572d2a1e9b Removed trailing spaces --- diff --git a/README b/README index 7367c22..4436370 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ -* To be done : +* To be done : - update java-package wiki page : http://wiki.debian.org/JavaPackage?action=edit&editor=text - make symbolic links for j2se/jre/bin/* in j2se/bin/ to avoid duplication diff --git a/debian/changelog b/debian/changelog index 2534523..10defdb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -138,7 +138,7 @@ java-package (0.50) unstable; urgency=low * debian-rules-missing-recommended-target removed * maintainer-script-lacks-debhelper-token removed * Declare the debian/compat to 7 to avoid warnings - + [ Michael Koch ] * Remove Java plugins for all browsers (Closes: #367887). * Add support for Sun Java 6 Update XX (Closes: #514364). @@ -261,13 +261,13 @@ java-package (0.28) unstable; urgency=low (Closes: #338569) * Corrected pathing for alternatives installation for Mozilla and Firefox plugins (Closes: #341751) - * Relaxed architectural restrictions on plugin alternative + * Relaxed architectural restrictions on plugin alternative installation for IBM Java 5 JREs and JDKs (Closes: #343837) * Added plugin installation for the new packaging of Firefox 1.5 and later (Closes: #341749) - * Modified warning suppression for dh_shlibdeps to accommodate + * Modified warning suppression for dh_shlibdeps to accommodate changes in dpkg-dev (Closes: #354427) - * Added quotes to variable tests for maintainer name and email + * Added quotes to variable tests for maintainer name and email (Closes: #342623) * Refactored architecture evaluation to eliminate repetition and evaluate DEB_BUILD_GNU_TYPE correctly for i486-linux-gnu @@ -293,7 +293,7 @@ java-package (0.26) unstable; urgency=low * Resolve issues with powerpc-linux support detection (Closes: #317671) * Added support for Blackdown 1.4.2+02 release (Closes: #316831) * Added support for packaging Sun JDK documentation (Closes: #272971) - * Modified make-jpkg behavior to default the generated packages' + * Modified make-jpkg behavior to default the generated packages' name and email address for the maintainer to Debian Java Maintainers (Closes: #325554) @@ -309,7 +309,7 @@ java-package (0.25) unstable; urgency=low java-package (0.24) unstable; urgency=low * Added plugin alternatives support for i386 IBM JREs and JDKs - * Corrected pathing for plugin alternatives to reflect difference in + * Corrected pathing for plugin alternatives to reflect difference in layout between JREs and JDKs for Sun and Blackdown (Closes: #305219, #301806) @@ -317,7 +317,7 @@ java-package (0.24) unstable; urgency=low java-package (0.23.1) experimental; urgency=low - * Added architecture-specific pathing for plugin alternatives for + * Added architecture-specific pathing for plugin alternatives for Blackdown 1.3 and 1.4 JREs and JDKs -- Barry Hawkins Wed, 06 Apr 2005 00:03:40 -0500 @@ -325,9 +325,9 @@ java-package (0.23.1) experimental; urgency=low java-package (0.23) unstable; urgency=low * Further expanded 1.3.1 Blackdown JRE/JDK support for i386 - * Added architecture-specific pathing for plugin alternatives for + * Added architecture-specific pathing for plugin alternatives for Sun 1.4 and 1.5 JREs and JDKs (Closes: #301806) - * Added recommends for system elements required by applets and + * Added recommends for system elements required by applets and graphical user interface elements (Closes: #300817) * Jeroen van Wolffelaar: + Fixed packages description to not have too long lines, and make the 3 @@ -340,24 +340,24 @@ java-package (0.22.1) experimental; urgency=low * Corrected IBM and Blackdown JRE/JDK file size specifications * Added support for additional 1.3.1 Blackdown JREs and JDKs for i386, powerpc (Closes: #301092) - * Added installation of javaws alternative for Sun 1.5 JREs and JDKs + * Added installation of javaws alternative for Sun 1.5 JREs and JDKs (Closes: #300303) -- Barry Hawkins Thu, 24 Mar 2005 13:20:18 -0500 java-package (0.22) unstable; urgency=low - * Corrected IBM JRE/JDK scripts to accurately reflect the supported + * Corrected IBM JRE/JDK scripts to accurately reflect the supported IBM JDKs and JREs in the generated SUPPORTED file -- Barry Hawkins Fri, 18 Mar 2005 10:21:53 -0500 java-package (0.21) unstable; urgency=low - * Enable support for IBM JDKs and JREs for x86, amd64, powerpc, - powerpc64, and s390 architectures, based upon a patch by Rico + * Enable support for IBM JDKs and JREs for x86, amd64, powerpc, + powerpc64, and s390 architectures, based upon a patch by Rico Schiekel (Closes: #264137) - * Enable suppport for Blackdown 1.3.1 JDK and JRE for PowerPC + * Enable suppport for Blackdown 1.3.1 JDK and JRE for PowerPC architecture. (Closes: #296205) * Update documentation and to reflect current supported JDKs and JREs @@ -479,7 +479,7 @@ java-package (0.12) unstable; urgency=low java-package (0.11) unstable; urgency=low - * change package name java-package and the command build package is + * change package name java-package and the command build package is make-jpkg. -- Takashi Okamoto Sat, 31 Jul 2004 15:07:36 +0900 @@ -487,9 +487,9 @@ java-package (0.11) unstable; urgency=low java-package (0.10) unstable; urgency=low * change package name mpkg-j2se. - * not use *-j2[re|sdk]debian package. Instead of this, add package - dependency to generated package. This reduce the installation for - such extra package. + * not use *-j2[re|sdk]debian package. Instead of this, add package + dependency to generated package. This reduce the installation for + such extra package. * SUN's jdk1.5 beta2 support. -- Takashi Okamoto Sun, 18 Jul 2004 13:53:36 +0900 diff --git a/debian/copyright b/debian/copyright index 3028586..e77187e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -19,7 +19,7 @@ License: GPL-2 . You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. . On Debian systems, the complete text of the GNU General Public License diff --git a/lib/common.sh b/lib/common.sh index a9ed231..ec10531 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -69,7 +69,7 @@ EOF mkdir "$extract_dir" cd "$extract_dir" echo - + local extract_cmd case "$archive_path" in *.tar) @@ -83,7 +83,7 @@ EOF *) extract_cmd=sh esac - + if ! $extract_cmd "$archive_path"; then cat << EOF @@ -137,7 +137,7 @@ read_maintainer_info() { maintainer_name="$DEBNAME" else default_name="$(getent passwd $(id -run) | cut -d: -f5| cut -d, -f1)" - + cat << EOF Please enter your full name. This value will be used in the maintainer @@ -154,12 +154,12 @@ EOF done fi fi - + if [ -z "$maintainer_email" ]; then local default_email= if [ -n "$DEBEMAIL" ]; then maintainer_email="$DEBEMAIL" - else + else if [ -r "/etc/mailname" ]; then default_email="$( id -run )@$( cat /etc/mailname )" else @@ -187,9 +187,9 @@ get_architecture() { export DEB_BUILD_ARCH=$(dpkg-architecture -qDEB_BUILD_ARCH) export DEB_BUILD_GNU_TYPE=$(dpkg-architecture -qDEB_BUILD_GNU_TYPE) - + echo "Detected Debian build architecture: ${DEB_BUILD_ARCH:-N/A}" - + echo "Detected Debian GNU type: ${DEB_BUILD_GNU_TYPE:-N/A}" } diff --git a/lib/javase.sh b/lib/javase.sh index b1a1111..20756e7 100644 --- a/lib/javase.sh +++ b/lib/javase.sh @@ -3,7 +3,7 @@ j2se_readme() { Package for $j2se_title --- -This package has been automatically created with java-package ($version). +This package has been automatically created with java-package ($version). All files from the original distribution should have been installed in the directory $jvm_base$j2se_name. Please take a look at this directory for further information. @@ -45,7 +45,7 @@ subdirectories. ---------------------------------------------------------------------- EOF - ( + ( cd "$install_dir" find * -type f -iname copyright | while read file; do @@ -122,7 +122,7 @@ fi exit 0 EOF chmod 755 "$debian_dir/postinst" - + cat > "$debian_dir/prerm" << EOF #!/bin/bash @@ -186,7 +186,7 @@ jinfos() { j2se_build() { cd "$tmp" echo "Create debian package:" - + #export DH_VERBOSE=1 export DH_COMPAT=7 export DH_OPTIONS=--tmpdir="$install_dir" @@ -232,7 +232,7 @@ j2se_build() { local deb_filename="$( echo "${j2se_package}_"*.deb )" echo " copy $deb_filename into directory $working_dir/" cp "$deb_filename" "$working_dir/" - if [ -n "$genchanges" ]; then + if [ -n "$genchanges" ]; then echo " dpkg-genchanges" local changes_filename="${deb_filename%.deb}.changes" dpkg-genchanges -b -u. > "$changes_filename" diff --git a/lib/oracle-jdk.sh b/lib/oracle-jdk.sh index 6d45ce5..aba8be5 100644 --- a/lib/oracle-jdk.sh +++ b/lib/oracle-jdk.sh @@ -74,8 +74,8 @@ oracle_j2sdk_detect() { echo "The archive $archive_name is not supported on the ${DEB_BUILD_ARCH} architecture" return fi - - + + cat << EOF Detected product: diff --git a/make-jpkg b/make-jpkg index f22594a..758bcf8 100755 --- a/make-jpkg +++ b/make-jpkg @@ -15,8 +15,8 @@ lib_dir="/usr/share/java-package" [ "$J2SE_PACKAGE_LIBDIR" ] && lib_dir="$J2SE_PACKAGE_LIBDIR" # If a default has been set for either of the -# environment variables, use it; otherwise, -# default to the name and email used by the +# environment variables, use it; otherwise, +# default to the name and email used by the # Debian Java Maintainers project. if [ -z "$J2SE_PACKAGE_FULL_NAME" ]; then maintainer_name="Debian Java Maintainers" @@ -226,7 +226,7 @@ jvm_base="/usr/lib/jvm/" javadoc_base="/usr/share/doc/" j2se_found= -for var in ${!j2se_detect_*}; do +for var in ${!j2se_detect_*}; do eval "\$$var" if [[ "$j2se_found" == "true" ]]; then break; diff --git a/make-jpkg.1 b/make-jpkg.1 index 9575561..2b6baad 100644 --- a/make-jpkg.1 +++ b/make-jpkg.1 @@ -22,7 +22,7 @@ make-jpkg \- builds Debian packages from Java binary distributions [\fIOPTION\fR]... [\fIFILE\fR] .SH DESCRIPTION .\" TeX users may be more comfortable with the \fB\fP and -.\" \fI\fP escape sequences to invode bold face and italics, +.\" \fI\fP escape sequences to invode bold face and italics, .\" respectively. .PP \fBmake-jpkg\fP builds a Debian package from the given Java @@ -65,7 +65,7 @@ information and builds a Debian binary package in the current directory. .PP The program requires about 200 MB free disk space in a temporary -directory. The temporary directory defaults to +directory. The temporary directory defaults to .I /tmp but you can specify an alternate directory by setting the environment variable \fITMPDIR\fR.