[lightspark] 01/01: Run dpkg-vendor at build time.

Gabriele Giacone gg0-guest at moszumanska.debian.org
Wed Jul 15 15:41:06 UTC 2015


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

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

commit 3ab2c50153c2f156677a99c07a242c9a21bc727f
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Wed Jul 15 17:20:05 2015 +0200

    Run dpkg-vendor at build time.
---
 ...postinst => browser-plugin-lightspark.postinst.in} |  8 +-------
 ...spark.prerm => browser-plugin-lightspark.prerm.in} |  6 +-----
 debian/changelog                                      |  5 +++--
 debian/rules                                          | 19 ++++++++++++++++++-
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/debian/browser-plugin-lightspark.postinst b/debian/browser-plugin-lightspark.postinst.in
similarity index 51%
rename from debian/browser-plugin-lightspark.postinst
rename to debian/browser-plugin-lightspark.postinst.in
index bf85462..9b647a1 100644
--- a/debian/browser-plugin-lightspark.postinst
+++ b/debian/browser-plugin-lightspark.postinst.in
@@ -4,14 +4,8 @@ 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 \
-		$ALTLINK $ALTNAME \
+		@ALTLINK@ @ALTNAME@ \
 		/usr/lib/lightspark/liblightsparkplugin.so 0
     ;;
 
diff --git a/debian/browser-plugin-lightspark.prerm b/debian/browser-plugin-lightspark.prerm.in
similarity index 56%
rename from debian/browser-plugin-lightspark.prerm
rename to debian/browser-plugin-lightspark.prerm.in
index e70892c..df95349 100644
--- a/debian/browser-plugin-lightspark.prerm
+++ b/debian/browser-plugin-lightspark.prerm.in
@@ -4,11 +4,7 @@ set -e
 
 case "$1" in
     remove|upgrade|deconfigure)
-        ALTNAME=flash-mozilla.so
-        if dpkg-vendor --derives-from Ubuntu; then
-            ALTNAME=mozilla-flashplugin
-        fi
-        update-alternatives --quiet --remove $ALTNAME \
+        update-alternatives --quiet --remove @ALTNAME@ \
 		/usr/lib/lightspark/liblightsparkplugin.so
     ;;
 
diff --git a/debian/changelog b/debian/changelog
index c04a368..a3b0535 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-lightspark (0.7.2+git20150512-2) UNRELEASED; urgency=medium
+lightspark (0.7.2+git20150512-2) unstable; urgency=medium
 
+  * Run dpkg-vendor at build time (Closes: #790807).
   * Remove Didier from Uploaders, add myself.
 
- -- Gabriele Giacone <1o5g4r8o at gmail.com>  Mon, 08 Jun 2015 23:41:16 +0200
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Wed, 15 Jul 2015 17:19:30 +0200
 
 lightspark (0.7.2+git20150512-1) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index fe37aba..a8be9c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,19 @@ endif
 
 UVER := $(shell dpkg-parsechangelog|sed -n '/^Version/{s/Version: \(.*\)/\1/p}'|cut -f1 -d-)
 
+ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
+	ALTLINK=/usr/lib/mozilla/plugins/flashplugin-alternative.so
+	ALTNAME=mozilla-flashplugin
+else
+	ALTLINK=/usr/lib/mozilla/plugins/flash-mozilla.so
+	ALTNAME=flash-mozilla.so
+endif
+INFILES := $(wildcard debian/*.in)
+GENERATED := $(INFILES:.in=)
+
+$(GENERATED):
+	sed -e "s#@ALTLINK@#$(ALTLINK)#" -e "s#@ALTNAME@#$(ALTNAME)#" $@.in > $@
+
 %:
 	dh $@ --parallel
 
@@ -19,7 +32,7 @@ override_dh_auto_configure:
 override_dh_strip:
 	dh_strip --dbg-package=lightspark-dbg
 
-override_dh_install:
+override_dh_install: $(GENERATED)
 	dh_install --list-missing
 
 override_dh_shlibdeps:
@@ -33,6 +46,10 @@ override_dh_shlibdeps:
 override_dh_makeshlibs:
 	dh_makeshlibs -X/usr/lib/lightspark
 
+override_dh_clean:
+	dh_clean
+	rm -f $(GENERATED)
+
 VER = $(UVER)+git$(shell date -u '+%Y%m%d')
 TMPDIR = lightspark-$(VER)
 get-orig-source:

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



More information about the pkg-flash-devel mailing list