Your message dated Wed, 05 Jun 2013 15:19:54 +0000
with message-id <e1ukfvc-0003ti...@franck.debian.org>
and subject line Bug#686216: fixed in java-package 0.52
has caused the Debian Bug report #686216,
regarding java-package: fix plugin directories
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
686216: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=686216
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: java-package
Version: 0.51~exp1
Tags: patch

In Debian, the only javaplugin location handled by openjdk alternatives
system is

/usr/lib/mozilla/plugin/libjavaplugin.so mozilla-javaplugin.so

java-package introduces /usr/lib/{firefox,iceweasel,chromium}/plugins
directories which break update-java-alternatives.

Attached patch distinguishes between Debian and Ubuntu plugin
directories as done for icedtea plugin [1].
Thanks for considering.

[1]
http://bazaar.launchpad.net/~openjdk/openjdk/icedtea-web/view/head:/rules
diff --git a/lib/common.sh b/lib/common.sh
index 4f9edd4..a9ed231 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -192,3 +192,13 @@ get_architecture() {
     
     echo "Detected Debian GNU type: ${DEB_BUILD_GNU_TYPE:-N/A}"
 }
+
+# get browser plugin directories
+get_browser_plugin_dirs() {
+    if [ $(lsb_release --id --short) = Ubuntu ]; then
+        export browser_plugin_dirs="xulrunner-addons firefox iceape iceweasel 
mozilla midbrowser xulrunner"
+    else
+        export browser_plugin_dirs=mozilla
+    fi
+}
+
diff --git a/lib/oracle-j2re.sh b/lib/oracle-j2re.sh
index f371e17..db287cd 100644
--- a/lib/oracle-j2re.sh
+++ b/lib/oracle-j2re.sh
@@ -67,10 +67,9 @@ install_no_man_alternatives $jvm_base$j2se_name/bin 
$oracle_no_man_jre_bin_jre
 install_no_man_alternatives $jvm_base$j2se_name/lib $oracle_jre_lib_hl
 
 plugin_dir="$jvm_base$j2se_name/lib/$DEB_BUILD_ARCH"
-install_browser_plugin "/usr/lib/iceweasel/plugins" "libjavaplugin.so" 
"iceweasel-javaplugin.so" "\$plugin_dir/libnpjp2.so"
-install_browser_plugin "/usr/lib/chromium/plugins" "libjavaplugin.so" 
"chromium-javaplugin.so" "\$plugin_dir/libnpjp2.so"
-install_browser_plugin "/usr/lib/mozilla/plugins" "libjavaplugin.so" 
"mozilla-javaplugin.so" "\$plugin_dir/libnpjp2.so"
-install_browser_plugin "/usr/lib/firefox/plugins" "libjavaplugin.so" 
"firefox-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+for b in $browser_plugin_dirs;do
+    install_browser_plugin "/usr/lib/\$b/plugins" "libjavaplugin.so" 
"\$b-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+done
 EOF
 }
 
@@ -86,10 +85,9 @@ remove_alternatives $jvm_base$j2se_name/bin 
$oracle_no_man_jre_bin_jre
 remove_alternatives $jvm_base$j2se_name/lib $oracle_jre_lib_hl
 
 plugin_dir="$jvm_base$j2se_name/lib/$DEB_BUILD_ARCH"
-remove_browser_plugin "iceweasel-javaplugin.so" "\$plugin_dir/libnpjp2.so"
-remove_browser_plugin "chromium-javaplugin.so" "\$plugin_dir/libnpjp2.so"
-remove_browser_plugin "mozilla-javaplugin.so" "\$plugin_dir/libnpjp2.so"
-remove_browser_plugin "firefox-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+for b in $browser_plugin_dirs;do
+    remove_browser_plugin "\$b-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+done
 EOF
 }
 
@@ -103,9 +101,8 @@ EOF
     jinfos "jre" $jvm_base$j2se_name/bin/ $oracle_jre_bin_jre
     jinfos "jre" $jvm_base$j2se_name/bin/ $oracle_no_man_jre_bin_jre
     jinfos "hl" $jvm_base$j2se_name/lib/ $oracle_jre_lib_hl
-    echo "plugin iceweasel-javaplugin.so 
$jvm_base$j2se_name/lib/$DEB_BUILD_ARCH/libnpjp2.so"
-    echo "plugin chromium-javaplugin.so 
$jvm_base$j2se_name/lib/$DEB_BUILD_ARCH/libnpjp2.so"
-    echo "plugin mozilla-javaplugin.so 
$jvm_base$j2se_name/lib/$DEB_BUILD_ARCH/libnpjp2.so"
-    echo "plugin firefox-javaplugin.so 
$jvm_base$j2se_name/lib/$DEB_BUILD_ARCH/libnpjp2.so"
+    for b in $browser_plugin_dirs;do
+        echo "plugin $b-javaplugin.so 
$jvm_base$j2se_name/lib/$DEB_BUILD_ARCH/libnpjp2.so"
+    done
 }
 
diff --git a/lib/oracle-j2sdk.sh b/lib/oracle-j2sdk.sh
index ff93d2a..7791388 100644
--- a/lib/oracle-j2sdk.sh
+++ b/lib/oracle-j2sdk.sh
@@ -69,10 +69,9 @@ install_no_man_alternatives $jvm_base$j2se_name/jre/lib 
$oracle_jre_lib_hl
 install_alternatives $jvm_base$j2se_name/bin $oracle_bin_jdk
 
 plugin_dir="$jvm_base$j2se_name/jre/lib/$DEB_BUILD_ARCH"
-install_browser_plugin "/usr/lib/iceweasel/plugins" "libjavaplugin.so" 
"iceweasel-javaplugin.so" "\$plugin_dir/libnpjp2.so"
-install_browser_plugin "/usr/lib/chromium/plugins" "libjavaplugin.so" 
"chromium-javaplugin.so" "\$plugin_dir/libnpjp2.so"
-install_browser_plugin "/usr/lib/mozilla/plugins" "libjavaplugin.so" 
"mozilla-javaplugin.so" "\$plugin_dir/libnpjp2.so"
-install_browser_plugin "/usr/lib/firefox/plugins" "libjavaplugin.so" 
"firefox-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+for b in $browser_plugin_dirs;do
+           install_browser_plugin "/usr/lib/\$b/plugins" "libjavaplugin.so" 
"\$b-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+done
 EOF
 }
 
@@ -89,10 +88,9 @@ remove_alternatives $jvm_base$j2se_name/jre/lib 
$oracle_jre_lib_hl
 remove_alternatives $jvm_base$j2se_name/bin $oracle_bin_jdk
 
 plugin_dir="$jvm_base$j2se_name/jre/lib/$DEB_BUILD_ARCH"
-remove_browser_plugin "iceweasel-javaplugin.so" "\$plugin_dir/libnpjp2.so"
-remove_browser_plugin "chromium-javaplugin.so" "\$plugin_dir/libnpjp2.so"
-remove_browser_plugin "mozilla-javaplugin.so" "\$plugin_dir/libnpjp2.so"
-remove_browser_plugin "firefox-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+for b in $browser_plugin_dirs;do
+    remove_browser_plugin "\$b-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+done
 EOF
 }
 
@@ -107,8 +105,7 @@ EOF
     jinfos "jre" $jvm_base$j2se_name/jre/bin/ $oracle_no_man_jre_bin_jre
     jinfos "hl" $jvm_base$j2se_name/jre/lib/ $oracle_jre_lib_hl
     jinfos "jdk" $jvm_base$j2se_name/bin/ $oracle_bin_jdk
-    echo "plugin iceweasel-javaplugin.so 
$jvm_base$j2se_name/jre/lib/$DEB_BUILD_ARCH/libnpjp2.so"
-    echo "plugin chromium-javaplugin.so 
$jvm_base$j2se_name/jre/lib/$DEB_BUILD_ARCH/libnpjp2.so"
-    echo "plugin mozilla-javaplugin.so 
$jvm_base$j2se_name/jre/lib/$DEB_BUILD_ARCH/libnpjp2.so"
-    echo "plugin firefox-javaplugin.so 
$jvm_base$j2se_name/jre/lib/$DEB_BUILD_ARCH/libnpjp2.so"
+    for b in $browser_plugin_dirs;do
+        echo "plugin iceweasel-javaplugin.so 
$jvm_base$j2se_name/jre/lib/$DEB_BUILD_ARCH/libnpjp2.so"
+    done
 }
diff --git a/make-jpkg b/make-jpkg
index 7173cb5..101d697 100755
--- a/make-jpkg
+++ b/make-jpkg
@@ -219,6 +219,9 @@ echo
 # get architecture information
 get_architecture
 
+# get browser plugin directories
+get_browser_plugin_dirs
+
 jvm_base="/usr/lib/jvm/"
 javadoc_base="/usr/share/doc/"
 

--- End Message ---
--- Begin Message ---
Source: java-package
Source-Version: 0.52

We believe that the bug you reported is fixed in the latest version of
java-package, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 686...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Sylvestre Ledru <sylves...@debian.org> (supplier of updated java-package 
package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Wed, 05 Jun 2013 13:43:55 +0200
Source: java-package
Binary: java-package
Architecture: source all
Version: 0.52
Distribution: unstable
Urgency: low
Maintainer: Debian Java Maintainers 
<pkg-java-maintainers@lists.alioth.debian.org>
Changed-By: Sylvestre Ledru <sylves...@debian.org>
Description: 
 java-package - Utility for creating Java Debian packages
Closes: 686216 687375 691063 696227
Changes: 
 java-package (0.52) unstable; urgency=low
 .
   [ Sylvestre Ledru ]
   * Team upload
   * Upload to unstable
   * Ack the NMU of David Prévot (thanks!)
   * Standards-Version updated to version 3.9.4
   * Remove obsolete variable from the changelog
   * Add support of ARM upstream binary by James Page and Matthias Vill.
     Thanks guys! (Closes: #687375)
   * Change the installation path from
     /usr/lib/jvm/jdk-6.38-oracle-x64 or /usr/lib/jvm/jdk-7.10-oracle-x64
     to
     /usr/lib/jvm/jdk-6-oracle-x64 and /usr/lib/jvm/jdk-7-oracle-x64
     Thanks to Constantin Makshin for the patch (Closes: #696227)
 .
   [ Cédric Pineau ]
   * Fix lintian errors and warnings
 .
   [ Gabriele Giacone ]
   * Add {mozilla,firefox}-javaplugin.so for update-java-alternatives.
   * Fix plugin directories. Closes: #686216
 .
   [ Emmanuel Bourg ]
   * Switched to the 3.0 (native) package format
   * debian/control: Use canonical URLs for the Vcs-* fields
   * debian/copyright: Switched to the Machine-readable format 1.0
   * Updated the manpages to reflect the latest naming changes
   * Removed the unused provided dependencies (j2sdk<version>, j2re<version>)
   * Provide the java<version-1>-runtime and java<version-2>-runtime 
dependencies
     (Closes: #691063)
   * Provide the java<version>-sdk dependencies to match the openjdk package
   * Use the upstream versioning scheme (i.e 7u13 instead of 7.13)
     to match the convention used by the new openjdk packages
   * Renamed the script files (j2sdk->jdk, j2re->jre, j2se->javase)
Checksums-Sha1: 
 bdf0e8e1fc1a38b8bbfdb115aa2a2fce3f1e747e 1002 java-package_0.52.dsc
 b339f7f98fa318954b628d95a022f89482ac0bfa 19256 java-package_0.52.tar.gz
 1e470aa0ea26a732df5beacaf6af8f12dcaa308a 20730 java-package_0.52_all.deb
Checksums-Sha256: 
 9d9cd4ae6641c3012c0e59ee1ed0f32916c4441b79ca2b2e0988bb4ffa38d3c9 1002 
java-package_0.52.dsc
 e80be7e12e0642275aaaf4f46a1115fadd48c6a1098809e9b335e89dc6c7e993 19256 
java-package_0.52.tar.gz
 5215e97e41deb599ef2499335c17f7a78a0682661f1cc80e8bf0a7ae94170f53 20730 
java-package_0.52_all.deb
Files: 
 9f0d7f0d834216956fc6c39e33cb194e 1002 contrib/misc optional 
java-package_0.52.dsc
 0f27485d6db248605ceeef4aae42f360 19256 contrib/misc optional 
java-package_0.52.tar.gz
 96f0fa84208a75d3b068c20d49bda67b 20730 contrib/misc optional 
java-package_0.52_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iEYEARECAAYFAlGvUWMACgkQiOXXM92JlhBR0gCfU9bnSCUuIf3SQbY1j7zggCF9
vNkAoLZuM7qymvE2d3pnzNfO8c4UL0/D
=GPKp
-----END PGP SIGNATURE-----

--- End Message ---
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Reply via email to