[Debian-tex-commits] SVN tex-common commit + diffs: r3492 - in tex-common/trunk: debian scripts

[Norbert Preining]

Author: preining
Date: 2008-08-02 11:04:09 +0000 (Sat, 02 Aug 2008)
New Revision: 3492

Modified:
   tex-common/trunk/debian/changelog
   tex-common/trunk/scripts/dh_installtex
Log:
tex-common trunk: dh_installtex: Fix dh_installtex compatibility with
debhelper version >= 6 (Closes: #492604)


Modified: tex-common/trunk/debian/changelog
===================================================================
--- tex-common/trunk/debian/changelog	2008-07-31 17:47:05 UTC (rev 3491)
+++ tex-common/trunk/debian/changelog	2008-08-02 11:04:09 UTC (rev 3492)
@@ -4,8 +4,10 @@
   * use the local keyword in policy compliant way [np]
   * replace emacs with share/texmf in postinst.in [np]
   * add updated version of sv.po (Closes: #491426) [hilmar-guest]
+  * Fix dh_installtex compatibility with debhelper version >= 6
+    (Closes: #492604) [np]
 
- -- Norbert Preining <preining at debian.org>  Mon, 28 Jul 2008 00:57:27 +0200
+ -- Norbert Preining <preining at debian.org>  Sat, 02 Aug 2008 13:02:08 +0200
 
 tex-common (1.12) experimental; urgency=low
 

Modified: tex-common/trunk/scripts/dh_installtex
===================================================================
--- tex-common/trunk/scripts/dh_installtex	2008-07-31 17:47:05 UTC (rev 3491)
+++ tex-common/trunk/scripts/dh_installtex	2008-08-02 11:04:09 UTC (rev 3492)
@@ -650,7 +650,6 @@
 		# 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) {
 			# updmap-sys is now done with triggers, so we should 
 			# filter out the "map" from the @whattodo list
@@ -667,8 +666,23 @@
 			}
 			@whattodo = @newwhat;
 			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) {
+			# map entries have already been filtered out
 			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|");
+		}
 	}
 
 	# for trigger support