Author: barryh-guest Date: 2006-05-04 02:30:20 +0000 (Thu, 04 May 2006) New Revision: 2104
Added: trunk/java-package/lib/install-common trunk/java-package/lib/remove-common Removed: trunk/java-package/.cvsignore trunk/java-package/debian/.cvsignore Modified: trunk/java-package/ trunk/java-package/debian/ trunk/java-package/debian/control trunk/java-package/debian/rules trunk/java-package/ibm-j2re1.5/install trunk/java-package/ibm-j2re1.5/remove trunk/java-package/ibm-j2sdk1.5/install trunk/java-package/ibm-j2sdk1.5/remove trunk/java-package/lib/j2se.sh Log: Cleanup of CVS ignore files, adding values to svn:ignore Addition of refactored install and remove functions, including their usage in the IBM Java 5 JRE and JDK scripts Update of standards version to 3.7.0 for both java-package and the packages it generates Property changes on: trunk/java-package ___________________________________________________________________ Name: svn:ignore - make-jpkg.out build-stamp SUPPORTED semantic.cache + make-jpkg.out build-stamp SUPPORTED semantic.cache Deleted: trunk/java-package/.cvsignore =================================================================== --- trunk/java-package/.cvsignore 2006-05-02 16:42:44 UTC (rev 2103) +++ trunk/java-package/.cvsignore 2006-05-04 02:30:20 UTC (rev 2104) @@ -1,4 +0,0 @@ -make-jpkg.out -build-stamp -SUPPORTED -semantic.cache Property changes on: trunk/java-package/debian ___________________________________________________________________ Name: svn:ignore - files java-package SUPPORTED semantic.cache + files java-package SUPPORTED semantic.cache Deleted: trunk/java-package/debian/.cvsignore =================================================================== --- trunk/java-package/debian/.cvsignore 2006-05-02 16:42:44 UTC (rev 2103) +++ trunk/java-package/debian/.cvsignore 2006-05-04 02:30:20 UTC (rev 2104) @@ -1,4 +0,0 @@ -files -java-package -SUPPORTED -semantic.cache Modified: trunk/java-package/debian/control =================================================================== --- trunk/java-package/debian/control 2006-05-02 16:42:44 UTC (rev 2103) +++ trunk/java-package/debian/control 2006-05-04 02:30:20 UTC (rev 2104) @@ -4,7 +4,7 @@ Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Carlos Laviola <[EMAIL PROTECTED]>, Arnaud Vandyck <[EMAIL PROTECTED]>, Jeroen van Wolffelaar <[EMAIL PROTECTED]>, Barry Hawkins <[EMAIL PROTECTED]> Build-Depends: debhelper (>= 4.0.0) -Standards-Version: 3.6.2.1 +Standards-Version: 3.7.0 Package: java-package Architecture: all Modified: trunk/java-package/debian/rules =================================================================== --- trunk/java-package/debian/rules 2006-05-02 16:42:44 UTC (rev 2103) +++ trunk/java-package/debian/rules 2006-05-04 02:30:20 UTC (rev 2104) @@ -20,7 +20,7 @@ dh_testdir dh_testroot rm -f build-stamp SUPPORTED make-jpkg.out - dh_clean + dh_clean install: build dh_testdir @@ -29,7 +29,7 @@ dh_installdirs install -m 755 make-jpkg.out $(B)/usr/bin/make-jpkg - cp lib/*.sh $(B)/usr/share/java-package/ + cp lib/*.sh lib/*-common $(B)/usr/share/java-package/ for dir in $(wildcard blackdown-j2*) $(wildcard sun-j2*) $(wildcard ibm-j2*); do \ cp -a $$dir $(B)/usr/share/java-package/; \ done @@ -46,6 +46,8 @@ binary: binary-indep +binary-arch: + binary-indep: build install dh_testdir dh_testroot Modified: trunk/java-package/ibm-j2re1.5/install =================================================================== --- trunk/java-package/ibm-j2re1.5/install 2006-05-02 16:42:44 UTC (rev 2103) +++ trunk/java-package/ibm-j2re1.5/install 2006-05-04 02:30:20 UTC (rev 2104) @@ -1,69 +1,77 @@ -suffix=j2re1.5-ibm -j2se_base="/usr/lib/$suffix" -priority=315 -if [ ! -e "$j2se_base/debian/info" ]; then - exit 0 -fi + suffix=j2re1.5-ibm + j2se_base="/usr/lib/$suffix" + priority=315 -# alternative <program> -function program_alternative() { - local program="$1" - cat >/usr/bin/$program-$suffix <<EOF + if [ ! -e "$j2se_base/debian/info" ]; then + exit 0 + fi + + # alternative <program> + function program_alternative() { + local program="$1" + cat >/usr/bin/$program-$suffix <<EOF #! /bin/sh exec $j2se_base/jre/bin/$program \${1+"\$@"} EOF - chmod 755 /usr/bin/$program-$suffix - update-alternatives \ - --install "/usr/bin/$program" "$program" \ - "/usr/bin/$program-$suffix" "$priority" -} + chmod 755 /usr/bin/$program-$suffix + update-alternatives \ + --install "/usr/bin/$program" "$program" \ + "/usr/bin/$program-$suffix" "$priority" + } -# kinit, klist, and ktab not installed at this -# time; handling of /etc/krb5.conf not addressed -program_alternative ControlPanel -program_alternative ikeyman -program_alternative java -program_alternative javaw -program_alternative javaws -program_alternative jextract -program_alternative keytool -program_alternative pack200 -program_alternative policytool -program_alternative rmid -program_alternative rmiregistry -program_alternative tnameserv -program_alternative unpack200 + # kinit, klist, and ktab not installed at this + # time; handling of /etc/krb5.conf not addressed + program_alternative ControlPanel + program_alternative ikeyman + program_alternative java + program_alternative javaw + program_alternative javaws + program_alternative jextract + program_alternative keytool + program_alternative pack200 + program_alternative policytool + program_alternative rmid + program_alternative rmiregistry + program_alternative tnameserv + program_alternative unpack200 -# the plugin is only available for i386 architecture + # the plugin is only available for i386 architecture -if [ $(dpkg --print-architecture) = i386 ] ; then + if [ $(dpkg --print-architecture) = i386 ] ; then - # assemble the plugin path - plugin_dir="$j2se_base/jre/bin" + # assemble the plugin path + plugin_dir="$j2se_base/jre/bin" - # netscape - netscape_dir="/usr/lib/netscape/plugins-libc6" - [ -d "$netscape_dir" ] || install -d -m 755 "$netscape_dir" - update-alternatives \ - --install "$netscape_dir/libjavaplugin.so" \ - "netscape-javaplugin.so" \ - "$plugin_dir/libjavaplugin_oji.so" "$priority" + # netscape + netscape_dir="/usr/lib/netscape/plugins-libc6" - # mozilla - mozilla_dir="/usr/lib/mozilla/plugins" - [ -d "$mozilla_dir" ] || install -d -m 755 "$mozilla_dir" - update-alternatives \ - --install "$mozilla_dir/libjavaplugin.so" \ - "mozilla-javaplugin.so" \ - "$plugin_dir/libjavaplugin_oji.so" "$priority" + install_java_plugin "$netscape_dir" "libjavaplugin.so" \ + "netscape-javaplugin.so" \ + "$plugin_dir/libjavaplugin_oji.so" \ + "$priority" - # firefox - firefox_dir="/usr/lib/mozilla-firefox/plugins" - [ -d "$firefox_dir" ] || install -d -m 755 "$firefox_dir" - update-alternatives \ - --install "$firefox_dir/libjavaplugin.so" \ - "firefox-javaplugin.so" \ - "$plugin_dir/libjavaplugin_oji.so" "$priority" + # mozilla + mozilla_dir="/usr/lib/mozilla/plugins" -fi + install_java_plugin "$mozilla_dir" "libjavaplugin.so" \ + "mozilla-javaplugin.so" \ + "$plugin_dir/libjavaplugin_oji.so" \ + "$priority" + + # mozilla-firefox + mozilla_firefox_dir="/usr/lib/mozilla-firefox/plugins" + + install_java_plugin "$mozilla_firefox_dir" "libjavaplugin.so" \ + "mozilla-firefox-javaplugin.so" \ + "$plugin_dir/libjavaplugin_oji.so" \ + "$priority" + + # firefox (1.5+) + firefox_dir="/usr/lib/firefox/plugins" + + install_java_plugin "$firefox_dir" "libjavaplugin.so"\ + "firefox-javaplugin.so" \ + "$plugin_dir/ns7/libjavaplugin_oji.so" \ + "$priority" + fi Modified: trunk/java-package/ibm-j2re1.5/remove =================================================================== --- trunk/java-package/ibm-j2re1.5/remove 2006-05-02 16:42:44 UTC (rev 2103) +++ trunk/java-package/ibm-j2re1.5/remove 2006-05-04 02:30:20 UTC (rev 2104) @@ -1,48 +1,52 @@ -suffix=j2re1.5-ibm -j2se_base="/usr/lib/$suffix" -if [ ! -e "$j2se_base/debian/info" ]; then - exit 0 -fi + suffix=j2re1.5-ibm + j2se_base="/usr/lib/$suffix" -# alternative <program> -function program_alternative() { - local program="$1" - update-alternatives \ - --remove "$program" "/usr/bin/$program-$suffix" - rm "/usr/bin/$program-$suffix" -} + if [ ! -e "$j2se_base/debian/info" ]; then + exit 0 + fi -program_alternative ControlPanel -program_alternative ikeyman -program_alternative java -program_alternative javaw -program_alternative javaws -program_alternative jextract -program_alternative keytool -program_alternative pack200 -program_alternative policytool -program_alternative rmid -program_alternative rmiregistry -program_alternative tnameserv -program_alternative unpack200 + # alternative <program> + function program_alternative() { + local program="$1" + update-alternatives \ + --remove "$program" "/usr/bin/$program-$suffix" + rm "/usr/bin/$program-$suffix" + } -# the plugin is only available for i386 architecture -if [ $(dpkg --print-architecture) = i386 ] ; then + program_alternative ControlPanel + program_alternative ikeyman + program_alternative java + program_alternative javaw + program_alternative javaws + program_alternative jextract + program_alternative keytool + program_alternative pack200 + program_alternative policytool + program_alternative rmid + program_alternative rmiregistry + program_alternative tnameserv + program_alternative unpack200 - # assemble the plugin path - plugin_dir="$j2se_base/jre/bin" + # the plugin is only available for i386 architecture + if [ $(dpkg --print-architecture) = i386 ] ; then - # netscape - update-alternatives \ - --remove "netscape-javaplugin.so" "$plugin_dir/libjavaplugin_oji.so" + # assemble the plugin path + plugin_dir="$j2se_base/jre/bin" - # mozilla - update-alternatives \ - --remove "mozilla-javaplugin.so" "$plugin_dir/libjavaplugin_oji.so" + # netscape + remove_java_plugin "netscape-javaplugin.so" \ + "$plugin_dir/libjavaplugin_oji.so" - # firefox - update-alternatives \ - --remove "firefox-javaplugin.so" "$plugin_dir/libjavaplugin_oji.so" + # mozilla + remove_java_plugin "mozilla-javaplugin.so" \ + "$plugin_dir/libjavaplugin_oji.so" -fi + # mozilla-firefox (pre-1.5) + remove_java_plugin "mozilla-firefox-javaplugin.so"\ + "$plugin_dir/libjavaplugin_oji.so" + # firefox + remove_java_plugin "firefox-javaplugin.so" \ + "$plugin_dir/libjavaplugin_oji.so" + + fi Modified: trunk/java-package/ibm-j2sdk1.5/install =================================================================== --- trunk/java-package/ibm-j2sdk1.5/install 2006-05-02 16:42:44 UTC (rev 2103) +++ trunk/java-package/ibm-j2sdk1.5/install 2006-05-04 02:30:20 UTC (rev 2104) @@ -1,80 +1,88 @@ -suffix=j2sdk1.5-ibm -j2se_base="/usr/lib/$suffix" -priority=315 -if [ ! -e "$j2se_base/debian/info" ]; then - exit 0 -fi + suffix=j2sdk1.5-ibm + j2se_base="/usr/lib/$suffix" + priority=315 -# alternative <program> -function program_alternative() { - local program="$1" - cat >/usr/bin/$program-$suffix <<EOF + if [ ! -e "$j2se_base/debian/info" ]; then + exit 0 + fi + + # alternative <program> + function program_alternative() { + local program="$1" + cat >/usr/bin/$program-$suffix <<EOF #! /bin/sh exec $j2se_base/bin/$program \${1+"\$@"} EOF - chmod 755 /usr/bin/$program-$suffix - update-alternatives \ - --install "/usr/bin/$program" "$program" \ - "/usr/bin/$program-$suffix" "$priority" -} + chmod 755 /usr/bin/$program-$suffix + update-alternatives \ + --install "/usr/bin/$program" "$program" \ + "/usr/bin/$program-$suffix" "$priority" + } -program_alternative appletviewer -program_alternative apt -program_alternative extcheck -program_alternative HtmlConverter -program_alternative idlj -program_alternative jar -program_alternative jarsigner -program_alternative java -program_alternative javac -program_alternative javadoc -program_alternative javah -program_alternative javap -program_alternative java-rmi.cgi -program_alternative javaw -program_alternative javaws -program_alternative jconsole -program_alternative jdb -program_alternative jdmpview -program_alternative keytool -program_alternative native2ascii -program_alternative policytool -program_alternative rmic -program_alternative rmid -program_alternative rmiregistry -program_alternative serialver -program_alternative tnameserv + program_alternative appletviewer + program_alternative apt + program_alternative extcheck + program_alternative HtmlConverter + program_alternative idlj + program_alternative jar + program_alternative jarsigner + program_alternative java + program_alternative javac + program_alternative javadoc + program_alternative javah + program_alternative javap + program_alternative java-rmi.cgi + program_alternative javaw + program_alternative javaws + program_alternative jconsole + program_alternative jdb + program_alternative jdmpview + program_alternative keytool + program_alternative native2ascii + program_alternative policytool + program_alternative rmic + program_alternative rmid + program_alternative rmiregistry + program_alternative serialver + program_alternative tnameserv -# the plugin is only available for i386 architecture + # the plugin is only available for i386 architecture -if [ $(dpkg --print-architecture) = i386 ] ; then + if [ $(dpkg-architecture -qDEB_BUILD_ARCH) = i386 ] ; then - # assemble the plugin path - plugin_dir="$j2se_base/jre/bin" + # assemble the java plugin path + plugin_dir="$j2se_base/jre/bin" - # netscape - netscape_dir="/usr/lib/netscape/plugins-libc6" - [ -d "$netscape_dir" ] || install -d -m 755 "$netscape_dir" - update-alternatives \ - --install "$netscape_dir/libjavaplugin.so" \ - "netscape-javaplugin.so" \ - "$plugin_dir/libjavaplugin_oji.so" "$priority" + # netscape + netscape_dir="/usr/lib/netscape/plugins-libc6" + + install_java_plugin "$netscape_dir" "libjavaplugin.so" \ + "netscape-javaplugin.so" \ + "$plugin_dir/libjavaplugin_oji.so" \ + "$priority" - # mozilla - mozilla_dir="/usr/lib/mozilla/plugins" - [ -d "$mozilla_dir" ] || install -d -m 755 "$mozilla_dir" - update-alternatives \ - --install "$mozilla_dir/libjavaplugin.so" \ - "mozilla-javaplugin.so" \ - "$plugin_dir/libjavaplugin_oji.so" "$priority" + # mozilla + mozilla_dir="/usr/lib/mozilla/plugins" + + install_java_plugin "$mozilla_dir" "libjavaplugin.so" \ + "mozilla-javaplugin.so" \ + "$plugin_dir/libjavaplugin_oji.so" \ + "$priority" - # firefox - firefox_dir="/usr/lib/mozilla-firefox/plugins" - [ -d "$firefox_dir" ] || install -d -m 755 "$firefox_dir" - update-alternatives \ - --install "$firefox_dir/libjavaplugin.so" \ - "firefox-javaplugin.so" \ - "$plugin_dir/libjavaplugin_oji.so" "$priority" + # mozilla-firefox (pre-1.5) + mozilla_firefox_dir="/usr/lib/mozilla-firefox/plugins" + + install_java_plugin "$mozilla_firefox_dir" "libjavaplugin.so" \ + "mozilla-firefox-javaplugin.so" \ + "$plugin_dir/libjavaplugin_oji.so" \ + "$priority" -fi + # firefox (1.5+) + firefox_dir="/usr/lib/firefox/plugins" + + install_java_plugin "$firefox_dir" "libjavaplugin.so" \ + "firefox-javaplugin.so" \ + "$plugin_dir/ns7/libjavaplugin_oji.so" \ + "$priority" + fi Modified: trunk/java-package/ibm-j2sdk1.5/remove =================================================================== --- trunk/java-package/ibm-j2sdk1.5/remove 2006-05-02 16:42:44 UTC (rev 2103) +++ trunk/java-package/ibm-j2sdk1.5/remove 2006-05-04 02:30:20 UTC (rev 2104) @@ -1,61 +1,65 @@ -suffix=j2sdk1.5-ibm -j2se_base="/usr/lib/$suffix" -if [ ! -e "$j2se_base/debian/info" ]; then - exit 0 -fi + suffix=j2sdk1.5-ibm + j2se_base="/usr/lib/$suffix" -# alternative <program> -function program_alternative() { - local program="$1" - update-alternatives \ - --remove "$program" "/usr/bin/$program-$suffix" - rm "/usr/bin/$program-$suffix" -} + if [ ! -e "$j2se_base/debian/info" ]; then + exit 0 + fi -program_alternative appletviewer -program_alternative apt -program_alternative extcheck -program_alternative HtmlConverter -program_alternative idlj -program_alternative jar -program_alternative jarsigner -program_alternative java -program_alternative javac -program_alternative javadoc -program_alternative javah -program_alternative javap -program_alternative java-rmi.cgi -program_alternative javaw -program_alternative javaws -program_alternative jconsole -program_alternative jdb -program_alternative jdmpview -program_alternative keytool -program_alternative native2ascii -program_alternative policytool -program_alternative rmic -program_alternative rmid -program_alternative rmiregistry -program_alternative serialver -program_alternative tnameserv + # alternative <program> + function program_alternative() { + local program="$1" + update-alternatives \ + --remove "$program" "/usr/bin/$program-$suffix" + rm "/usr/bin/$program-$suffix" + } -# the plugin is only available for i386 architecture -if [ $(dpkg --print-architecture) = i386 ] ; then + program_alternative appletviewer + program_alternative apt + program_alternative extcheck + program_alternative HtmlConverter + program_alternative idlj + program_alternative jar + program_alternative jarsigner + program_alternative java + program_alternative javac + program_alternative javadoc + program_alternative javah + program_alternative javap + program_alternative java-rmi.cgi + program_alternative javaw + program_alternative javaws + program_alternative jconsole + program_alternative jdb + program_alternative jdmpview + program_alternative keytool + program_alternative native2ascii + program_alternative policytool + program_alternative rmic + program_alternative rmid + program_alternative rmiregistry + program_alternative serialver + program_alternative tnameserv - # assemble the plugin path - plugin_dir="$j2se_base/jre/bin" + # the plugin is only available for i386 architecture + if [ $(dpkg --print-architecture) = i386 ] ; then - # netscape - update-alternatives \ - --remove "netscape-javaplugin.so" "$plugin_dir/libjavaplugin_oji.so" + # assemble the plugin path + plugin_dir="$j2se_base/jre/bin" - # mozilla - update-alternatives \ - --remove "mozilla-javaplugin.so" "$plugin_dir/libjavaplugin_oji.so" + # netscape + remove_java_plugin "netscape-javaplugin.so" \ + "$plugin_dir/libjavaplugin_oji.so" - # firefox - update-alternatives \ - --remove "firefox-javaplugin.so" "$plugin_dir/libjavaplugin_oji.so" + # mozilla + remove_java_plugin "mozilla-javaplugin.so" \ + "$plugin_dir/libjavaplugin_oji.so" + + # mozilla-firefox (pre-1.5) + remove_java_plugin "mozilla-firefox-javaplugin.so" \ + "$plugin_dir/libjavaplugin_oji.so" -fi + # firefox (1.5+) + remove_java_plugin "firefox-javaplugin.so" \ + "$plugin_dir/libjavaplugin_oji.so" + fi Added: trunk/java-package/lib/install-common =================================================================== --- trunk/java-package/lib/install-common 2006-05-02 16:42:44 UTC (rev 2103) +++ trunk/java-package/lib/install-common 2006-05-04 02:30:20 UTC (rev 2104) @@ -0,0 +1,22 @@ + # Common functions for all install scripts + + # install_alternative -- add an alternative + # + # install_alternative program + function install_alternative() { + local program="$1" + update-alternatives \ + --install "/usr/bin/$program" "$program" \ + "$j2se_base/bin/$program" "$priority" \ + --slave "/usr/share/man/man1/$program.1.gz" "$program.1.gz" \ + "$j2se_base/man/man1/$program.1.gz" + } + + # install_java_plugin -- add an alternative for a browser plugin + # + # install_java_plugin browser_plugin_path java_plugin_path priority + function install_java_plugin() { + [ -d "$1" ] || install -d -m 755 "$1" + update-alternatives \ + --install "$1/$2" "$3" "$4" "$5" + } Modified: trunk/java-package/lib/j2se.sh =================================================================== --- trunk/java-package/lib/j2se.sh 2006-05-02 16:42:44 UTC (rev 2103) +++ trunk/java-package/lib/j2se.sh 2006-05-04 02:30:20 UTC (rev 2104) @@ -29,7 +29,7 @@ Priority: optional Maintainer: $maintainer_name <$maintainer_email> Build-Depends: debhelper (>= 4.0.0) -Standards-Version: 3.6.2.1 +Standards-Version: 3.7.0 EOF } @@ -94,7 +94,7 @@ case "\$1" in remove | deconfigure) EOF - cat "$lib_dir/remove-common" >> "$debian_dir/postinst" + cat "$lib_dir/remove-common" >> "$debian_dir/prerm" cat "$lib_dir/$j2se_package/remove" >> "$debian_dir/prerm" Added: trunk/java-package/lib/remove-common =================================================================== --- trunk/java-package/lib/remove-common 2006-05-02 16:42:44 UTC (rev 2103) +++ trunk/java-package/lib/remove-common 2006-05-04 02:30:20 UTC (rev 2104) @@ -0,0 +1,19 @@ + # Common functions for all install scripts + + # remove_alternative -- remove an alternative + # + # remove_alternative program + function remove_alternative() { + local program="$1" + update-alternatives \ + --remove "$program" "/usr/bin/$program-$suffix" + rm "/usr/bin/$program-$suffix" + } + + # remove_java_plugin -- add an alternative for a browser plugin + # + # remove_java_plugin plugins_path + function remove_java_plugin() { + update-alternatives \ + --remove "firefox-javaplugin.so" "$plugin_dir/libjavaplugin_oji.so" + } _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
