[subversion-commit] SVN tetex commit + diffs: r321 - in tex-common/trunk: debian scripts

[Norbert Preining]

Author: preining-guest
Date: 2005-11-05 18:04:17 +0000 (Sat, 05 Nov 2005)
New Revision: 321

Modified:
   tex-common/trunk/debian/changelog
   tex-common/trunk/debian/rules
   tex-common/trunk/scripts/dh_installtexfonts
Log:
  * fix installation of debhelper snipper postrm-texfonts. [preining]
  * actually allow multiple invocations of dh_installtexfonts and
    stop with error if a cfg file is installed several times. [preining]


Modified: tex-common/trunk/debian/changelog
===================================================================
--- tex-common/trunk/debian/changelog	2005-11-04 13:48:29 UTC (rev 320)
+++ tex-common/trunk/debian/changelog	2005-11-05 18:04:17 UTC (rev 321)
@@ -14,6 +14,9 @@
     [frank] 
   * Add the md5sum of a version with a newer comment to the list of known
     md5sums for 00updmap.cfg (closes: #336713) [frank]
+  * fix installation of debhelper snipper postrm-texfonts. [preining]
+  * actually allow multiple invocations of dh_installtexfonts and
+    stop with error if a cfg file is installed several times. [preining]
 
  -- Frank Küster <frank at debian.org>  Fri,  4 Nov 2005 14:47:48 +0100
 

Modified: tex-common/trunk/debian/rules
===================================================================
--- tex-common/trunk/debian/rules	2005-11-04 13:48:29 UTC (rev 320)
+++ tex-common/trunk/debian/rules	2005-11-05 18:04:17 UTC (rev 321)
@@ -84,7 +84,7 @@
 	# dh_installtexfonts(.1) is already installed via the bin_scripts
 	#cp scripts/postrm-texfonts $(INSTDIR)/usr/share/debhelper/autoscripts
 	#cp scripts/postinst-texfonts $(INSTDIR)/usr/share/debhelper/autoscripts
-	grep -v '^[ \t]*#' scripts/postrm-texfonts > $(INSTDIR)/usr/share/debhelper/autoscripts/postinst-texfonts
+	grep -v '^[ \t]*#' scripts/postrm-texfonts > $(INSTDIR)/usr/share/debhelper/autoscripts/postrm-texfonts
 	grep -v '^[ \t]*#' scripts/postinst-texfonts > $(INSTDIR)/usr/share/debhelper/autoscripts/postinst-texfonts
 
 	# ship /var/cache/fonts with proper permissions

Modified: tex-common/trunk/scripts/dh_installtexfonts
===================================================================
--- tex-common/trunk/scripts/dh_installtexfonts	2005-11-04 13:48:29 UTC (rev 320)
+++ tex-common/trunk/scripts/dh_installtexfonts	2005-11-05 18:04:17 UTC (rev 321)
@@ -184,6 +184,8 @@
 	foreach my $fn (@cmdlinecfgs) {
 		my $bn=basename($fn);
 		my $pr=$cmdcfgshash{$fn};
+		-r "$tmp/etc/texmf/updmap.d/$pr$bn" &&
+			error("The config file $tmp/etc/texmf/updmap.d/$pr$bn already exists! Cannot recreate it, please call dh_clean -k!");
 		open(CFGFILE, ">$tmp/etc/texmf/updmap.d/$pr$bn") ||
 			error("Cannot open $tmp/etc/texmf/updmap.d/$pr$bn for writing!");
 		if (!magic_comment_present($fn)) {
@@ -202,6 +204,8 @@
 	# merge in the cmd line arguments
 	#
 	if ($file || ($#cmdlinemaps >= 0)) {
+		-r "$tmp/etc/texmf/updmap.d/$priority$package.cfg" &&
+			error("The config file $tmp/etc/texmf/updmap.d/$priority$package.cfg already exists! Cannot recreate it, please call dh_clean -k!");
 		open(CFGFILE, ">$tmp/etc/texmf/updmap.d/$priority$package.cfg") || 
 			error("Cannot open $tmp/etc/texmf/updmap.d/$priority$package.cfg for writing!");
 		if (($file && !magic_comment_present($file)) ||
@@ -222,8 +226,8 @@
         if ( ! -d "$tmp/var/lib/tex-common/fontmap-cfg/") {
             doit("install","-d","$tmp/var/lib/tex-common/fontmap-cfg/");
         }
-	open(LISTFILE, ">$tmp/var/lib/tex-common/fontmap-cfg/$package.list")||
-		error("Cannot open $tmp/var/lib/tex-common/fmtutil-cnf/$package.list for writing!");
+	open(LISTFILE, ">>$tmp/var/lib/tex-common/fontmap-cfg/$package.list")||
+		error("Cannot open $tmp/var/lib/tex-common/fmtutil-cnf/$package.list for writing/appending!");
 	foreach (@listlines) {
 		print LISTFILE "$_\n";
 	}