Control: tags 729303 + patch

Dear Maintainers,

With the attached patch applied, I followed exactly the same procedure
as explained in the initial bug report and had no more obsolete
conffile.

Note that this patch also contains a correction I done in #341613 (but
after it was set to resolved). As there's currently a disk issue on
alioth, I can't check the git to see if it's already there, so I
included it also (the thing is that all the rm_config that are in the
postrm should also be in a preinst and a postinst).

Thanks for your time.

Best regards,
Joseph
diff -u asciidoc-8.6.9/debian/changelog asciidoc-8.6.9/debian/changelog
--- asciidoc-8.6.9/debian/changelog
+++ asciidoc-8.6.9/debian/changelog
@@ -1,3 +1,10 @@
+asciidoc (8.6.9-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Cleaning up the obsolete conffile (Closes: #729303)
+
+ -- Joseph HERLANT <herla...@gmail.com>  Mon, 11 Nov 2013 17:10:35 +0100
+
 asciidoc (8.6.9-1) unstable; urgency=low
 
   * [cf6d717] Depend on dpkg-maintscript-helper for removing conffiles
diff -u asciidoc-8.6.9/debian/postrm asciidoc-8.6.9/debian/postrm
--- asciidoc-8.6.9/debian/postrm
+++ asciidoc-8.6.9/debian/postrm
@@ -73,2 +73,5 @@
        /etc/asciidoc/stylesheets/xhtml11.css 8.6.7-1~ -- "$@"
+  #Bug #
+  dpkg-maintscript-helper rm_conffile \
+       /etc/asciidoc/wordpress.conf 8.6.9-1~ -- "$@"
 fi
only in patch2:
unchanged:
--- asciidoc-8.6.9.orig/debian/postinst
+++ asciidoc-8.6.9/debian/postinst
@@ -0,0 +1,77 @@
+#!/bin/sh
+set -e
+#DEBHELPER#
+
+# This if statement avoids to add the "Pre-Depends: dpkg (>= 1.15.7.2)" in
+# the debian/control file
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
+  # Bug #3416613
+  dpkg-maintscript-helper rm_conffile \
+    /etc/asciidoc/css-embedded-stylesheet.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+    /etc/asciidoc/css-embedded.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+    /etc/asciidoc/css.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+    /etc/asciidoc/docbook-sgml.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+    /etc/asciidoc/html.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+    /etc/asciidoc/xhtml.conf 8.6.7-1~ -- "$@"
+  #Bug #610208
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/stylesheets/flask.css 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/stylesheets/asciidoc-manpage.css 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/stylesheets/volnitsky-manpage.css 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/stylesheets/flask-manpage.css 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/stylesheets/volnitsky.css 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/xhtml-deprecated.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/math.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/docbook-xsl/shaded-literallayout.patch 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/xhtml-deprecated-css.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/stylesheets/xhtml-deprecated-manpage.css 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/stylesheets/xhtml-deprecated.css 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/filters/code-filter-test-c++.txt 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/filters/code-filter-test.txt 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/filters/source-highlight-filter-test.txt 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/filters/code-filter.py 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/filters/code-filter.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/filters/source-highlight-filter.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/filters/music-filter.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/filters/music-filter-test.txt 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/filters/code-filter-readme.txt 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/filters/music2png.py 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/linuxdoc.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/t.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/docbook.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/stylesheets/xhtml11-manpage.css 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+       /etc/asciidoc/stylesheets/xhtml11.css 8.6.7-1~ -- "$@"
+  #Bug #
+  dpkg-maintscript-helper rm_conffile \
+       /etc/asciidoc/wordpress.conf 8.6.9-1~ -- "$@"
+fi
only in patch2:
unchanged:
--- asciidoc-8.6.9.orig/debian/preinst
+++ asciidoc-8.6.9/debian/preinst
@@ -0,0 +1,77 @@
+#!/bin/sh
+set -e
+#DEBHELPER#
+
+# This if statement avoids to add the "Pre-Depends: dpkg (>= 1.15.7.2)" in
+# the debian/control file
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
+  # Bug #3416613
+  dpkg-maintscript-helper rm_conffile \
+    /etc/asciidoc/css-embedded-stylesheet.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+    /etc/asciidoc/css-embedded.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+    /etc/asciidoc/css.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+    /etc/asciidoc/docbook-sgml.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+    /etc/asciidoc/html.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+    /etc/asciidoc/xhtml.conf 8.6.7-1~ -- "$@"
+  #Bug #610208
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/stylesheets/flask.css 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/stylesheets/asciidoc-manpage.css 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/stylesheets/volnitsky-manpage.css 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/stylesheets/flask-manpage.css 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/stylesheets/volnitsky.css 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/xhtml-deprecated.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/math.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/docbook-xsl/shaded-literallayout.patch 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/xhtml-deprecated-css.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/stylesheets/xhtml-deprecated-manpage.css 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/stylesheets/xhtml-deprecated.css 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/filters/code-filter-test-c++.txt 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/filters/code-filter-test.txt 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/filters/source-highlight-filter-test.txt 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/filters/code-filter.py 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/filters/code-filter.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/filters/source-highlight-filter.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/filters/music-filter.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/filters/music-filter-test.txt 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/filters/code-filter-readme.txt 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/filters/music2png.py 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/linuxdoc.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/t.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/docbook.conf 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+      /etc/asciidoc/stylesheets/xhtml11-manpage.css 8.6.7-1~ -- "$@"
+  dpkg-maintscript-helper rm_conffile \
+       /etc/asciidoc/stylesheets/xhtml11.css 8.6.7-1~ -- "$@"
+  #Bug #
+  dpkg-maintscript-helper rm_conffile \
+       /etc/asciidoc/wordpress.conf 8.6.9-1~ -- "$@"
+fi

Reply via email to