[Debian-tex-commits] SVN tex-common commit + diffs: r3480 - in tex-common/branches/sid: debian scripts

[Norbert Preining]

Author: preining
Date: 2008-07-27 18:00:20 +0000 (Sun, 27 Jul 2008)
New Revision: 3480

Modified:
   tex-common/branches/sid/debian/changelog
   tex-common/branches/sid/scripts/dh_installtex
Log:
fix the dh_installtex vs debhelper >= v6 bug


Modified: tex-common/branches/sid/debian/changelog
===================================================================
--- tex-common/branches/sid/debian/changelog	2008-07-23 10:16:49 UTC (rev 3479)
+++ tex-common/branches/sid/debian/changelog	2008-07-27 18:00:20 UTC (rev 3480)
@@ -1,4 +1,4 @@
-tex-common (1.11.1~1) unstable; urgency=normal
+tex-common (1.11.1~1) unstable; urgency=medium
 
   * bump version of tex-common packages built with dh_installtex to 1.11
     otherwise the conflict with tetex-base is not included properly. This really
@@ -16,8 +16,10 @@
   * fix wrong file link in Debian-TeX-Policy.sgml (Closes: #481038) 
   * Again install the README file for tpm2licenses in
     /usr/share/tex-common/ [fk]
+  * Fix dh_installtex compatibility with debhelper version >= 6
+    (Closes: #492604) (this is RC, so urgency=medium) [np]
 
- -- Norbert Preining <preining at debian.org>  Mon, 02 Jun 2008 16:36:59 +0200
+ -- Norbert Preining <preining at debian.org>  Sun, 27 Jul 2008 19:59:49 +0200
 
 tex-common (1.11) unstable; urgency=medium
 

Modified: tex-common/branches/sid/scripts/dh_installtex
===================================================================
--- tex-common/branches/sid/scripts/dh_installtex	2008-07-23 10:16:49 UTC (rev 3479)
+++ tex-common/branches/sid/scripts/dh_installtex	2008-07-27 18:00:20 UTC (rev 3480)
@@ -635,11 +635,24 @@
 		# we should NOT check whether files are actually installed
 		# because we have to update the ls-R db for disappearing files, too.
 		autoscript($package, "postinst", "postinst-texlsr", "s|#TEXMFTREES#|@foo|");
-		autoscript($package, "postrm",   "postrm-texlsr", "s|#TEXMFTREES#|@foo|");
 		if ($dothefullstuff) {
 			autoscript($package, "postinst", "postinst-tex", "s|#FORMATSFILES#|@fmtconffiles|; s|#WHATTODO#|@whattodo|");
+		}
+
+		# postrm stuff
+		# we have to take care for the debhelper compat level. With
+		# debhelper >= 6 the different parts are reverse ordered.
+		if (compat(5)) {
+			# for compat level <= 5 do the texlsr stuff now
+			autoscript($package, "postrm",   "postrm-texlsr", "s|#TEXMFTREES#|@foo|");
+		}
+		if ($dothefullstuff) {
 			autoscript($package, "postrm",   "postrm-tex", "s|#FORMATS#|@postrmfmtdata|; s|#WHATTODO#|@whattodo|");
 		}
+		if (!compat(5)) {
+			# for compat level >> 5 do it now
+			autoscript($package, "postrm",   "postrm-texlsr", "s|#TEXMFTREES#|@foo|");
+		}
 	}
 
 	addsubstvar($package, "misc:Depends", "tex-common", ">= 1.11");