[xml/sgml-pkgs] Bug#576445: NMU interdiff (was: Re: [patch]: sgml-base: Fails to purge)

[Michael Banck]

Hi,

attached is the NMU interdiff; I had to also move debhelper from
Build-Depends-Indep to Build-Depends to fix a lintian error.
-------------- next part --------------
diff -Nru sgml-base-1.26/debian/changelog sgml-base-1.26+nmu1/debian/changelog
--- sgml-base-1.26/debian/changelog	2004-08-14 17:04:15.000000000 +0200
+++ sgml-base-1.26+nmu1/debian/changelog	2010-07-18 14:39:38.000000000 +0200
@@ -1,3 +1,14 @@
+sgml-base (1.26+nmu1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Applied patch from Hideki Yamane adding a check whether directories exist
+    before removing them on purge 
+    (closes: Bug#576445)
+  * Moved debhelper from Build-Depends-Indep to Build-Depends as it is used in
+    the clean target, as per Policy section 7.7.
+
+ -- Michael Banck <mbanck at debian.org>  Sat, 17 Jul 2010 16:27:02 +0200
+
 sgml-base (1.26) unstable; urgency=low
 
   * Removed creation of the transitional catalog in a installation
diff -Nru sgml-base-1.26/debian/control sgml-base-1.26+nmu1/debian/control
--- sgml-base-1.26/debian/control	2004-06-07 05:18:28.000000000 +0200
+++ sgml-base-1.26+nmu1/debian/control	2010-07-18 14:37:50.000000000 +0200
@@ -4,7 +4,7 @@
 Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
 Uploaders: Ardo van Rangelrooij <ardo at debian.org>
 Standards-Version: 3.6.1
-Build-Depends-Indep: debhelper (>= 4.1)
+Build-Depends: debhelper (>= 4.1)
 
 Package: sgml-base
 Section: text
diff -Nru sgml-base-1.26/debian/sgml-base.postrm sgml-base-1.26+nmu1/debian/sgml-base.postrm
--- sgml-base-1.26/debian/sgml-base.postrm	2004-08-14 17:04:15.000000000 +0200
+++ sgml-base-1.26+nmu1/debian/sgml-base.postrm	2010-07-17 16:15:59.000000000 +0200
@@ -15,16 +15,12 @@
     rm -f /etc/sgml/catalog /etc/sgml/catalog.old
 
     ## ------------------------------------------------------------------
-    ## remove /etc/sgml
-    cd /etc
-    rmdir --ignore-fail-on-non-empty sgml
-    cd - >/dev/null
-
-    ## ------------------------------------------------------------------
-    ## remove /var/lib/sgml-base
-    cd /var/lib
-    rmdir --ignore-fail-on-non-empty sgml-base
-    cd - >/dev/null
+    ## remove /etc/sgml and /var/lib/sgml-base
+    for dir in /etc/sgml /var/lib/sgml-base; do
+      if [ -d $dir ]; then
+         rmdir --ignore-fail-on-non-empty $dir
+      fi
+    done
 
 fi