[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.6.0really4.4.3-1-27-gcdc8ae0

Modestas Vainius modax at alioth.debian.org
Sun Feb 27 00:08:56 UTC 2011


The following commit has been merged in the master branch:
commit 42af6be96f967babca22335559d2ef70fcd46d7c
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Feb 27 01:11:51 2011 +0200

    Show phonon-backend-null debconf warning during preconfigure.
---
 debian/phonon-backend-null.config                  |    7 +++++++
 ...ostinst.in => phonon-backend-null.dc-config.in} |    4 ++--
 debian/phonon-backend-null.postinst                |    2 +-
 debian/phonon.config                               |    7 +++++++
 debian/phonon.postinst                             |    2 +-
 debian/rules                                       |    1 +
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/debian/phonon-backend-null.config b/debian/phonon-backend-null.config
new file mode 100644
index 0000000..5bd0a92
--- /dev/null
+++ b/debian/phonon-backend-null.config
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+#INCLUDE debian/phonon-backend-null.dc-config.in#
+
+#DEBHELPER#
diff --git a/debian/phonon-backend-null.dc-postinst.in b/debian/phonon-backend-null.dc-config.in
similarity index 94%
rename from debian/phonon-backend-null.dc-postinst.in
rename to debian/phonon-backend-null.dc-config.in
index 6322618..742964a 100644
--- a/debian/phonon-backend-null.dc-postinst.in
+++ b/debian/phonon-backend-null.dc-config.in
@@ -1,4 +1,4 @@
-# START POSTINST[phonon-null-backend/isnt_functional]
+# START CONFIG[phonon-null-backend/isnt_functional]
 
 . /usr/share/debconf/confmodule
 
@@ -46,4 +46,4 @@ warn_about_phonon_backend_null "$@"
 
 # vim: set syntax=sh
 
-# END POSTINST[phonon-null-backend/isnt_functional]
+# END CONFIG[phonon-null-backend/isnt_functional]
diff --git a/debian/phonon-backend-null.postinst b/debian/phonon-backend-null.postinst
index b5c0bdd..0ae7a18 100644
--- a/debian/phonon-backend-null.postinst
+++ b/debian/phonon-backend-null.postinst
@@ -2,6 +2,6 @@
 
 set -e
 
-#INCLUDE debian/phonon-backend-null.dc-postinst.in#
+. /usr/share/debconf/confmodule
 
 #DEBHELPER#
diff --git a/debian/phonon.config b/debian/phonon.config
new file mode 100644
index 0000000..5bd0a92
--- /dev/null
+++ b/debian/phonon.config
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+#INCLUDE debian/phonon-backend-null.dc-config.in#
+
+#DEBHELPER#
diff --git a/debian/phonon.postinst b/debian/phonon.postinst
index b5c0bdd..0ae7a18 100644
--- a/debian/phonon.postinst
+++ b/debian/phonon.postinst
@@ -2,6 +2,6 @@
 
 set -e
 
-#INCLUDE debian/phonon-backend-null.dc-postinst.in#
+. /usr/share/debconf/confmodule
 
 #DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 618b5cc..7a514f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,7 @@ include /usr/share/pkg-kde-tools/qt-kde-team/1/library-packages.mk
 $(patsubst %,binary-predeb/%,$(DEB_ALL_PACKAGES)) :: binary-predeb/% :
 	@for f in debian/$(cdbs_curpkg)/DEBIAN/post* \
 	          debian/$(cdbs_curpkg)/DEBIAN/pre* \
+	          debian/$(cdbs_curpkg)/DEBIAN/config \
 	          debian/$(cdbs_curpkg)/DEBIAN/templates; do \
 	    if [ -f "$$f" ]; then \
 	        cmd="awk -f debian/expand_vars.awk -v recommended_backend='$(DEB_RECOMMENDED_PHONON_BACKEND)' -- $$f > $$f.tmp && cat $$f.tmp >| $$f && rm -f $$f.tmp"; \

-- 
Phonon Multimedia Framework packaging



More information about the pkg-kde-commits mailing list