[gnash] 02/02: Fix alternatives on ubuntu (LP: 1266088)

Gabriele Giacone gg0-guest at moszumanska.debian.org
Fri Aug 1 19:14:38 UTC 2014


This is an automated email from the git hooks/post-receive script.

gg0-guest pushed a commit to branch master
in repository gnash.

commit 28dde6cfa2e14277d7390de982f77c73fd0bfdf7
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Fri Aug 1 11:30:07 2014 +0200

    Fix alternatives on ubuntu (LP: 1266088)
---
 debian/browser-plugin-gnash.postinst | 10 ++++++++--
 debian/browser-plugin-gnash.prerm    |  6 +++++-
 debian/changelog                     |  6 ++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/debian/browser-plugin-gnash.postinst b/debian/browser-plugin-gnash.postinst
index e03517d..e8dd384 100644
--- a/debian/browser-plugin-gnash.postinst
+++ b/debian/browser-plugin-gnash.postinst
@@ -20,9 +20,15 @@ set -e
 
 case "$1" in
     configure)
+        ALTLINK=/usr/lib/mozilla/plugins/flash-mozilla.so
+        ALTNAME=flash-mozilla.so
+        if dpkg-vendor --derives-from Ubuntu; then
+            ALTLINK=/usr/lib/mozilla/plugins/flashplugin-alternative.so
+            ALTNAME=mozilla-flashplugin
+        fi
         update-alternatives --quiet --install \
-            /usr/lib/mozilla/plugins/flash-mozilla.so \
-            flash-mozilla.so \
+            $ALTLINK \
+            $ALTNAME \
             /usr/lib/gnash/libgnashplugin.so \
            10
     ;;
diff --git a/debian/browser-plugin-gnash.prerm b/debian/browser-plugin-gnash.prerm
index bbbc310..3d6af9e 100644
--- a/debian/browser-plugin-gnash.prerm
+++ b/debian/browser-plugin-gnash.prerm
@@ -18,9 +18,13 @@ set -e
 
 
 case "$1" in
+    ALTNAME=flash-mozilla.so
+    if dpkg-vendor --derives-from Ubuntu; then
+        ALTNAME=mozilla-flashplugin
+    fi
     remove|upgrade|deconfigure)
         update-alternatives --quiet --remove \
-            flash-mozilla.so \
+            $ALTNAME \
             /usr/lib/gnash/libgnashplugin.so
     ;;
 
diff --git a/debian/changelog b/debian/changelog
index 65a2271..b0f41f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gnash (0.8.11~git20140708-4) UNRELEASED; urgency=medium
+
+  * Fix alternative system on ubuntu (LP: #1266088).
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Fri, 01 Aug 2014 11:28:28 +0200
+
 gnash (0.8.11~git20140708-3) unstable; urgency=medium
 
   * Fix libgnashsound.so install, FTBFS on hurd.

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-flash/gnash.git



More information about the pkg-flash-devel mailing list