[Blends-commit] [SCM] blends-dev branch, master, updated. d2137d6ff69b53705f338d5de7510f0534e4065d

[Andreas Tille]

The following commit has been merged in the master branch:
commit fd05a763bdfb145d93b8ce27b13c7c2bd69e6459
Author: Andreas Tille <tille at debian.org>
Date:   Wed Mar 26 08:28:06 2014 +0100

    Do not remove postinst scripts which are not autogenerated

diff --git a/debian/changelog b/debian/changelog
index f5d2074..47ccaef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,16 @@
-blends (0.6.99) UNRELEASED; urgency=low
+blends (0.6.91) UNRELEASED; urgency=low
 
   [ Emmanouil Kiagias ]
   * Documentation converted to XML
 
   [ Andreas Tille ]
   * debian/control: Adapt Build-Depends to XML version of docs
+  * debtools/rules: Do not remove postinst scripts which are not
+    autogenerated
+  * Standards-Version: 3.9.5
+  * Unversioned dependency from debconf
 
- -- Andreas Tille <tille at debian.org>  Sun, 24 Nov 2013 09:11:44 +0100
+ -- Andreas Tille <tille at debian.org>  Wed, 26 Mar 2014 08:07:45 +0100
 
 blends (0.6.16.4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index bd11f4e..a07cc5d 100644
--- a/debian/control
+++ b/debian/control
@@ -12,13 +12,13 @@ Build-Depends: debhelper (>= 9)
 Build-Depends-Indep: xmlto,
                      dblatex,
                      w3m
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-Browser: http://git.debian.org/?p=blends/blends.git
 Vcs-Git: git://git.debian.org/git/blends/blends.git
 
 Package: blends-dev
 Architecture: all
-Depends: debconf (>= 0.5) | debconf-2.0,
+Depends: debconf,
          make | build-essential,
          apt,
          debhelper (>= 9),
diff --git a/devtools/rules b/devtools/rules
index 4bf7aff..309d629 100755
--- a/devtools/rules
+++ b/devtools/rules
@@ -55,8 +55,11 @@ override_dh_clean:
 	rm -rf tmp
 	# Remove backup files from source tarball
 	rm -f tasks/*~
-	# Remove auto generated post{inst,rm} scripts
-	rm -f debian/$(PREFIX)-*.postinst debian/$(PREFIX)-*.prerm debian/$(PREFIX)-*.postrm debian/$(PREFIX)-*.preinst
+	# Remove auto generated post{inst,rm} scripts; but only if an according *.stub file exists
+	for task in `ls tasks | grep -v '^[a-z]*:$$*' | grep -v '^$$'` ; do \
+	    rm -f debian/$(PREFIX)-$${task}.postinst debian/$(PREFIX)-$${task}.prerm ; \
+	done
+	# rm -f debian/$(PREFIX)-*.postinst debian/$(PREFIX)-*.prerm debian/$(PREFIX)-*.postrm debian/$(PREFIX)-*.preinst
 	# remove auto generated files for config package
 	rm -f debian/$(PREFIX)-config.templates debian/$(PREFIX)-config.config \
 	      debian/$(PREFIX)-config.install   debian/$(PREFIX)-config.links  \

-- 
Git repository for blends code