[gnash] 04/05: Fix ubuntu alternatives fix.

[Gabriele Giacone]

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

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

commit 9c027241af67012d9c9f7ae89c87acce833880e6
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sun Apr 19 17:11:43 2015 +0200

    Fix ubuntu alternatives fix.
---
 debian/browser-plugin-gnash.postinst | 5 +++--
 debian/browser-plugin-gnash.prerm    | 9 +++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/browser-plugin-gnash.postinst b/debian/browser-plugin-gnash.postinst
index e8dd384..8294ba5 100644
--- a/debian/browser-plugin-gnash.postinst
+++ b/debian/browser-plugin-gnash.postinst
@@ -20,11 +20,12 @@ 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
+        else
+            ALTLINK=/usr/lib/mozilla/plugins/flash-mozilla.so
+            ALTNAME=flash-mozilla.so
         fi
         update-alternatives --quiet --install \
             $ALTLINK \
diff --git a/debian/browser-plugin-gnash.prerm b/debian/browser-plugin-gnash.prerm
index 3d6af9e..6694fea 100644
--- a/debian/browser-plugin-gnash.prerm
+++ b/debian/browser-plugin-gnash.prerm
@@ -18,11 +18,12 @@ set -e
 
 
 case "$1" in
-    ALTNAME=flash-mozilla.so
-    if dpkg-vendor --derives-from Ubuntu; then
-        ALTNAME=mozilla-flashplugin
-    fi
     remove|upgrade|deconfigure)
+        if dpkg-vendor --derives-from Ubuntu; then
+            ALTNAME=mozilla-flashplugin
+        else
+            ALTNAME=flash-mozilla.so
+        fi
         update-alternatives --quiet --remove \
             $ALTNAME \
             /usr/lib/gnash/libgnashplugin.so

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