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

[Norbert Preining]

Author: preining-guest
Date: 2006-02-06 09:16:53 +0000 (Mon, 06 Feb 2006)
New Revision: 495

Modified:
   tex-common/trunk/debian/changelog
   tex-common/trunk/debian/rules
   tex-common/trunk/scripts/dh_installtex
   tex-common/trunk/scripts/postrm-tex
Log:
add dh_installtex to the package


Modified: tex-common/trunk/debian/changelog
===================================================================
--- tex-common/trunk/debian/changelog	2006-02-03 19:31:08 UTC (rev 494)
+++ tex-common/trunk/debian/changelog	2006-02-06 09:16:53 UTC (rev 495)
@@ -1,3 +1,9 @@
+tex-common (0.15.1) UNRELEASED; urgency=low
+
+  * Add dh_installtex for public perusal. [preining]
+
+ -- Norbert Preining <preining at logic.at>  Mon,  6 Feb 2006 10:14:01 +0100
+
 tex-common (0.15) unstable; urgency=high
 
   * Urgency high, because this version adds important checks that should

Modified: tex-common/trunk/debian/rules
===================================================================
--- tex-common/trunk/debian/rules	2006-02-03 19:31:08 UTC (rev 494)
+++ tex-common/trunk/debian/rules	2006-02-06 09:16:53 UTC (rev 495)
@@ -5,8 +5,7 @@
 
 INSTDIR=$(CURDIR)/debian/tex-common
 
-bin_scripts=dh_installtexfonts
-#bin_scripts=dh_installtexfonts dh_installtex
+bin_scripts=dh_installtexfonts dh_installtex
 sbin_scripts=update-texmf update-fontlang
 
 sbin_installfiles=$(foreach script,$(sbin_scripts), scripts/$(script))
@@ -42,7 +41,7 @@
 	# Add here commands to compile the package.
 	cd doc; $(MAKE)
 	cd scripts; pod2man dh_installtexfonts > dh_installtexfonts.1
-	#cd scripts; pod2man dh_installtex > dh_installtex.1
+	cd scripts; pod2man dh_installtex > dh_installtex.1
 
 	touch build-stamp
 
@@ -80,10 +79,10 @@
 
 	# debhelper stuff
 	# 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/postrm-texfonts
 	grep -v '^[ \t]*#' scripts/postinst-texfonts > $(INSTDIR)/usr/share/debhelper/autoscripts/postinst-texfonts
+	grep -v '^[ \t]*#' scripts/postrm-tex > $(INSTDIR)/usr/share/debhelper/autoscripts/postrm-tex
+	grep -v '^[ \t]*#' scripts/postinst-tex > $(INSTDIR)/usr/share/debhelper/autoscripts/postinst-tex
 
 	# ship /var/cache/fonts with proper permissions
 	mkdir --mode=1777 $(INSTDIR)/var/cache/fonts/pk

Modified: tex-common/trunk/scripts/dh_installtex
===================================================================
--- tex-common/trunk/scripts/dh_installtex	2006-02-03 19:31:08 UTC (rev 494)
+++ tex-common/trunk/scripts/dh_installtex	2006-02-06 09:16:53 UTC (rev 495)
@@ -58,7 +58,7 @@
 
         dh_installtex map=Map,foo.map language=greek,grphyph4.tex,polygreek
 
-would install a file /etc/texmf/updmap.d/10package.cfg containing the lines
+would install a file /etc/texmf/updmap.d/10package.cfg containing the line
 
         Map foo.map
 
@@ -209,8 +209,15 @@
 
 #
 # collect data
-# for maps this is the list of map files depending on the doconfig value
-# for formats the list of formats to be generated
+# This function is used to extract certain information from the respective
+# config files. Up to now we have to do the following:
+# for config file for maps
+# 	if we select to generate all dvips config files
+# 	(with map:config_for_active_maps or map:config_for_all_maps)
+# 	we collect the map files
+# for config file for formats
+# 	we extract the formats which have to be generated with
+# 	fmtutil-sys --byfmt
 sub collect_data {
 	my ($type,$dataref,$entry) = @_;
 	my $m;
@@ -224,9 +231,7 @@
 
 sub extract_format {
 	my ($line) = @_;
-	print "DEBUG extract format line=...$line...\n";
 	if ($line =~ m/^[^\w#]*(\w+)*/) {
-		print "DEBUG extracted: ...$1...\n";
 		return $1;
 	}
 }
@@ -245,9 +250,8 @@
 }
 
 #
-# build a line to be written to the config file
-# we get the argument as specified on the cmd line and have to reform
-# it properly for the respective flavor
+# build_line
+# used to create a correct config file entry from a cmd-line specification
 sub build_line {
 	my ($type,$line) = @_;
 	if ($type eq "map") {

Modified: tex-common/trunk/scripts/postrm-tex
===================================================================
--- tex-common/trunk/scripts/postrm-tex	2006-02-03 19:31:08 UTC (rev 494)
+++ tex-common/trunk/scripts/postrm-tex	2006-02-06 09:16:53 UTC (rev 495)
@@ -35,7 +35,7 @@
     return 0
 }
 
-build_format_if_format_exists ()
+build_hyphen_format_if_format_exists ()
 {
     v=`kpsewhich -var-value TEXMFSYSVAR`
     c=`kpsewhich -var-value TEXMFSYSCONFIG`
@@ -43,13 +43,9 @@
     TEXMFCONFIG="$c"
     export TEXMFVAR TEXMFCONFIG
     fmtcnffile=`kpsewhich --format='web2c files' fmtutil.cnf`
-    X=`cat $fmtcnffile | grep "^$2[[:space:]]" || true`
+    X=`cat $fmtcnffile | grep "^[[:space:]]*$1[[:space:]]" || true`
     if [ ! "X$X" = "X" ] ; then
-        if [ "X$1" = "X--byhyphen" ] ; then
-            build_format --byhyphen $3
-        else
-            build_format $1 $2
-        fi
+        build_format --byhyphen $2
     fi
 }
 
@@ -91,7 +87,7 @@
 		fi
 		if [ $i = language ] ; then
 			if which fmtutil-sys >/dev/null ; then
-				build_format_if_format_exists --byhyphen latex `kpsewhich language.dat`
+				build_hyphen_format_if_format_exists latex `kpsewhich language.dat`
 			fi
 		fi
 	done