[helix-maintainers] Ubuntu helix-player 1.0.9-0ubuntu5

[Ubuntu Merge-o-Matic]

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.7
Date: Tue, 01 Apr 2008 01:54:26 +0200
Source: helix-player
Binary: mozilla-helix-player helix-player
Architecture: source
Version: 1.0.9-0ubuntu5
Distribution: hardy
Urgency: low
Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
Changed-By: Alexander Sack <asac at ubuntu.com>
Description: 
 helix-player - Helix audio and video player
 mozilla-helix-player - Helix audio and video player (browser plugin)
Changes: 
 helix-player (1.0.9-0ubuntu5) hardy; urgency=low
 .
   * support xulrunner-1.9 by installing/removing alternative
     - update debian/mozilla-helix-player.postinst
     - update debian/mozilla-helix-player.postrm
   * add xulrunner-1.9 as a Depends: option
Files: 
 92f89accd01585e5cf1946da8453c4f4 1455 graphics optional helix-player_1.0.9-0ubuntu5.dsc
 df3e98c7e0d88bc623c4a4d50189600c 17999 graphics optional helix-player_1.0.9-0ubuntu5.diff.gz
Original-Maintainer: Daniel Baumann <daniel at debian.org>
-------------- next part --------------
diff -pruN 1.0.9-0ubuntu4/debian/changelog 1.0.9-0ubuntu5/debian/changelog
--- 1.0.9-0ubuntu4/debian/changelog	2008-04-28 22:36:08.000000000 +0100
+++ 1.0.9-0ubuntu5/debian/changelog	2008-04-28 22:35:54.000000000 +0100
@@ -1,3 +1,12 @@
+helix-player (1.0.9-0ubuntu5) hardy; urgency=low
+
+  * support xulrunner-1.9 by installing/removing alternative
+    - update debian/mozilla-helix-player.postinst
+    - update debian/mozilla-helix-player.postrm
+  * add xulrunner-1.9 as a Depends: option
+
+ -- Alexander Sack <asac at ubuntu.com>  Tue, 01 Apr 2008 01:54:26 +0200
+
 helix-player (1.0.9-0ubuntu4) hardy; urgency=low
 
   * Grumble. *Properly* remove empty .po files during install.
diff -pruN 1.0.9-0ubuntu4/debian/control 1.0.9-0ubuntu5/debian/control
--- 1.0.9-0ubuntu4/debian/control	2008-04-28 22:36:08.000000000 +0100
+++ 1.0.9-0ubuntu5/debian/control	2008-04-28 22:35:54.000000000 +0100
@@ -29,7 +29,7 @@ Description: Helix audio and video playe
 Package: mozilla-helix-player
 Section: web
 Architecture: i386 powerpc sparc amd64 lpia
-Depends: helix-player (= ${Source-Version}), iceweasel | iceape | www-browser
+Depends: helix-player (= ${Source-Version}), xulrunner-1.9 | iceweasel | iceape | www-browser
 Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a 
 Xb-Npp-Name: Helix DNA Plugin: RealPlayer G2 Plug-In Compatible
 Xb-Npp-MimeType: audio/x-pn-realaudio-plugin
diff -pruN 1.0.9-0ubuntu4/debian/mozilla-helix-player.postinst 1.0.9-0ubuntu5/debian/mozilla-helix-player.postinst
--- 1.0.9-0ubuntu4/debian/mozilla-helix-player.postinst	2008-04-28 22:36:08.000000000 +0100
+++ 1.0.9-0ubuntu5/debian/mozilla-helix-player.postinst	2008-04-28 22:35:54.000000000 +0100
@@ -36,6 +36,21 @@ case ${1} in
 				iceweasel_nphelix.xpt \
 				${plugins}/nphelix.xpt ${priority}
 		fi
+
+		xulrunner="/usr/lib/xulrunner-addons/plugins"
+		if [ -d ${xulrunner} ] || \
+			install -d -m 755 ${xulrunner}
+		then
+			update-alternatives --install \
+				${xulrunner}/nphelix.so \
+				xulrunner_nphelix.so \
+				${plugins}/nphelix.so ${priority}
+
+			update-alternatives --install \
+				${xulrunner}/nphelix.xpt \
+				xulrunner_nphelix.xpt \
+				${plugins}/nphelix.xpt ${priority}
+		fi
 		;;
 
 	abort-upgrade|abort-remove|abort-deconfigure)
diff -pruN 1.0.9-0ubuntu4/debian/mozilla-helix-player.prerm 1.0.9-0ubuntu5/debian/mozilla-helix-player.prerm
--- 1.0.9-0ubuntu4/debian/mozilla-helix-player.prerm	2008-04-28 22:36:08.000000000 +0100
+++ 1.0.9-0ubuntu5/debian/mozilla-helix-player.prerm	2008-04-28 22:35:54.000000000 +0100
@@ -15,6 +15,11 @@ case ${1} in
 			iceweasel_nphelix.so ${plugins}/nphelix.so
 		update-alternatives --remove \
 			iceweasel_nphelix.xpt ${plugins}/nphelix.xpt
+
+		update-alternatives --remove \
+			xulrunner_nphelix.so ${plugins}/nphelix.so
+		update-alternatives --remove \
+			xulrunner_nphelix.xpt ${plugins}/nphelix.xpt
 		;;
 
 	upgrade|failed-upgrade)