[SCM] libdvd-pkg/master: complete purge (do not leave files behind):

onlyjob at users.alioth.debian.org onlyjob at users.alioth.debian.org
Sat Nov 23 18:59:09 UTC 2013


The following commit has been merged in the master branch:
commit bb6a6ad934f38af653ce1b006dad7071205a099d
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Wed Nov 13 20:44:36 2013 +1100

    complete purge (do not leave files behind):
    
     * prerm --> postrm (purge fires from postrm).
     * postrm is self-sufficient and don't need VARS any more.
     * VARS: find guest package version on build time.
     * rules: substitute variables in templates.

diff --git a/debian/VARS b/debian/VARS.in
similarity index 59%
rename from debian/VARS
rename to debian/VARS.in
index 0c73916..3a12b1a 100644
--- a/debian/VARS
+++ b/debian/VARS.in
@@ -1,11 +1,11 @@
-PKGI="libdvd-pkg"
+PKGI=@PKGI@
 DIR="/usr/src/${PKGI}"
 PKGG="libdvdcss2"
 PKGG_ALL="libdvdcss2 libdvdcss-dev"
-P88="88libdvdcss-pkg"
+P88=@P88@
 
-## get version of bundled "guest" package
-VERGG=$(dpkg-parsechangelog -l/usr/share/${PKGI}/debian/changelog | sed -n 's/^Version: *//p')
+## version of bundled "guest" package
+VERGG=@VERGG@
 
 ## get installed guest-package version
 VERG="$(dpkg --status ${PKGG} 2>/dev/null | perl -0ne 'print $1 if m{^Status:\s+install\s+ok\s+installed}sm and m{^Version:\s+(\S+)}sm;')"
diff --git a/debian/prerm b/debian/postrm.in
similarity index 76%
rename from debian/prerm
rename to debian/postrm.in
index d5f34cd..39e8fc0 100644
--- a/debian/prerm
+++ b/debian/postrm.in
@@ -2,7 +2,11 @@
 
 set -e
 
-. /usr/lib/libdvd-pkg/VARS
+PKGI=@PKGI@
+P88="88libdvdcss-pkg"
+
+## version of bundled "guest" package
+VERGG=@VERGG@
 
 case "$1" in
     purge|abort-install)
diff --git a/debian/rules b/debian/rules
index c35d3bd..3b182b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,18 +8,27 @@ PKD  = $(abspath $(dir $(MAKEFILE_LIST)))
 PKG  = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
 PKGG = $(patsubst %-pkg,%,$(PKG))css
 VER  = $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{Version:\s+(\d.*)(?:\-\d+.*)};')
-VERG = $(shell dpkg-parsechangelog -l$(PKGG)/debian/changelog | perl -ne 'print $$1 if m{Version:\s+(\d.*)};')
+VERG = $(shell dpkg-parsechangelog -l$(PKGG)/debian/changelog | sed -n 's/^Version: *//p')
+P88  = $(patsubst debian/%,%,$(wildcard debian/88*))
+TMPL = $(patsubst %.in,%,$(wildcard debian/*.in))
 ## check if host package version (without debian revision) match full version of encapsulated guest package
 ifneq ($(VER), $(VERG))
     $(error Error: Packages' version mismatch: host(upstream part)/$(VER) != guest/$(VERG))
 endif
 
-%: debian/po/templates.pot
+%: debian/po/templates.pot $(TMPL)
 	dh $@
 
 debian/po/templates.pot:
 	debconf-updatepo --verbose
 
+$(TMPL):
+	perl -p -E's{\@VERGG\@}{$(VERG)}sg;' -E's{\@PKGI\@}{$(PKG)}sg;' -E's{\@P88\@}{$(P88)}sg;' "$@.in" >"$@"
+	chmod $$(stat --format=%a "$@.in") "$@"
+
+override_dh_clean:
+	dh_clean $(TMPL)
+
 override_dh_installchangelogs:
 	dh_installchangelogs $(PKGG)/debian/changelog
 

-- 
libdvdcss-pkg packaging



More information about the pkg-multimedia-commits mailing list