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

Frank Küster frank at alioth.debian.org
Tue Nov 21 18:33:34 CET 2006


Author: frank
Date: 2006-11-21 18:33:33 +0100 (Tue, 21 Nov 2006)
New Revision: 1949

Modified:
   tex-common/trunk/debian/changelog
   tex-common/trunk/doc/Debian-TeX-Policy.sgml
   tex-common/trunk/scripts/dh_installtex
Log:
  * Change default priority for dh_installtex to 20, and document in the
    TeX Policy that 10 is reserved for Basic TeX packages.  This would
    have avoided bug #399447. [frank]


Modified: tex-common/trunk/debian/changelog
===================================================================
--- tex-common/trunk/debian/changelog	2006-11-10 09:09:54 UTC (rev 1948)
+++ tex-common/trunk/debian/changelog	2006-11-21 17:33:33 UTC (rev 1949)
@@ -3,8 +3,11 @@
   * changelog editing: fix wrong bugnumber in last upload [frank]
   * Add a more verbose explanation to the warning when updmap-sys failed
     (closes: #397717), and echo errors to stderr. [frank]
+  * Change default priority for dh_installtex to 20, and document in the
+    TeX Policy that 10 is reserved for Basic TeX packages.  This would
+    have avoided bug #399447. [frank]
 
- -- Frank Küster <frank at debian.org>  Thu,  9 Nov 2006 13:17:21 +0100
+ -- Frank Küster <frank at debian.org>  Tue, 21 Nov 2006 18:32:32 +0100
 
 tex-common (0.38) unstable; urgency=low
 

Modified: tex-common/trunk/doc/Debian-TeX-Policy.sgml
===================================================================
--- tex-common/trunk/doc/Debian-TeX-Policy.sgml	2006-11-10 09:09:54 UTC (rev 1948)
+++ tex-common/trunk/doc/Debian-TeX-Policy.sgml	2006-11-21 17:33:33 UTC (rev 1949)
@@ -544,8 +544,14 @@
               <item>
                 <p>
                 It should install one or more configuration files with names
-                following the pattern <tt>10<var>name</var>.cfg</tt> into
-                <file>/etc/texmf/updmap.d/</file>. Such files will be later
+                following the pattern <tt>20<var>name</var>.cfg</tt> into
+                <file>/etc/texmf/updmap.d/</file><footnote> Filenames
+		  starting with <tt>10</tt> are reserved for the basic
+		  TeX packages.  However, sorting order is actually
+		  only relevant for snippets
+		  for <file>texmf.cnf</file>, <file>fmtutil.cnf</file>
+		  and <file>language.dat</file>
+		</footnote>. Such files will be later
                 merged by <prgn>update-updmap</prgn> to form
                 <file>/var/lib/texmf/web2c/updmap.cfg</file>, the effective
                 configuration file for <prgn>updmap-sys</prgn>.
@@ -786,7 +792,9 @@
 	  way to implement the configuration scheme described below is to 
 	  use the <prgn>debhelper</prgn> program <prgn>dh_installtex</prgn>
 	  provided by <package>tex-common</package>. See 
-	  <manref name="dh_installtex" section="1"> for usage details.
+	  <manref name="dh_installtex" section="1"> for usage
+	  details.  Note that for <file>language.dat</file>, order is
+	  important: english should always be the first language.
 	  </p>
 	  <p>
 	  These packages 
@@ -871,7 +879,11 @@
 	  way to implement the configuration scheme described below is to
 	  use the <prgn>debhelper</prgn> program <prgn>dh_installtex</prgn>
 	  provided by <package>tex-common</package>. See
-	  <manref name="dh_installtex" section="1"> for usage details.
+	  <manref name="dh_installtex" section="1"> for usage
+	  details.  Note that for <file>fmtutil.cnf</file>, order is
+	  important:  Formats will be created for each line, and thus
+	  format files created from later lines will overwrite earlier
+	  ones. 
 	  </p>
 
 	  <p>

Modified: tex-common/trunk/scripts/dh_installtex
===================================================================
--- tex-common/trunk/scripts/dh_installtex	2006-11-10 09:09:54 UTC (rev 1948)
+++ tex-common/trunk/scripts/dh_installtex	2006-11-21 17:33:33 UTC (rev 1949)
@@ -74,23 +74,23 @@
 
         dh_installtex mapfile=foo.cfg formatfile=debian/bar.cnf=42
 
-would install foo.cfg as /etc/texmf/updmap.d/10foo.cfg, and debian/bar.cnf
+would install foo.cfg as /etc/texmf/updmap.d/20foo.cfg, and debian/bar.cnf
 as /etc/texmf/fmt.d/42bar.cnf.
 
 
 2) B<Directly on the cmd line:>
 You can specify maps, formats, and languages on the cmd line. The items
-are stored in the respective config file 10package
+are stored in the respective config file 20package
 
 Example:
 
         dh_installtex map=Map,foo.map language=greek,grphyph4.tex,polygreek
 
-would install a file /etc/texmf/updmap.d/10package.cfg containing the line
+would install a file /etc/texmf/updmap.d/20package.cfg containing the line
 
         Map foo.map
 
-and a file /etc/texmf/language.d/10package.cnf containing the lines
+and a file /etc/texmf/language.d/20package.cnf containing the lines
 
 	greek grphyph4.tex
 	=polygreek
@@ -110,17 +110,17 @@
         dh_installtex
 
 would install a present debian/package.maps file as
-/etc/texmf/updmap.d/10package.cfg.
+/etc/texmf/updmap.d/20package.cfg.
 
 
 =head2 Mixing the different variants
 
 The command line items (Variant 2) are merged into the debian/package.maps 
 (debian/package.languages, debian/package.formats)
-file and the merged file is installed as 10package.cfg/cnf. If you specify
+file and the merged file is installed as 20package.cfg/cnf. If you specify
 an additional package.cfg/cnf (Variant 1) without a different priority than
 the default one on the cmd line, this will raise an error since both files
-would be installed as 10package.cfg/cnf. You can only specify 
+would be installed as 20package.cfg/cnf. You can only specify 
 package.cfg/cnf without
 a different priority than the default one if no debian/package.maps nor
 any command line Map files are present.
@@ -145,7 +145,7 @@
 
 =item B<--priority=>I<n>
 
-Set the default priority to I<n> instead of 10.
+Set the default priority to I<n> instead of 20.
 
 =item B<--flavor=>I<flavor>
 
@@ -188,7 +188,7 @@
 #
 my $flavor;		
 my $mapdoconfig =  0;	# doconfig depending map/subflavor
-my $priority=10;	# priority with which files are installed
+my $priority=20;	# priority with which files are installed
 my $dothefullstuff = 0;
 my %cmdlineargs;
 my %cmdlinefiles;




More information about the Debian-tex-commits mailing list