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

[Norbert Preining]

Author: preining
Date: 2006-11-03 09:18:32 +0100 (Fri, 03 Nov 2006)
New Revision: 1921

Modified:
   tex-common/trunk/debian/changelog
   tex-common/trunk/debian/rules
   tex-common/trunk/scripts/update-fontlang
   tex-common/trunk/scripts/update-fontlang.8
Log:
install all the update-* scripts into /usr/bin, but keep symlinks in 
/usr/sbin in case some script uses hard-coded paths - but this is
bad anyway, so we could drop the symlinks in /usr/sbin after etch ...


Modified: tex-common/trunk/debian/changelog
===================================================================
--- tex-common/trunk/debian/changelog	2006-11-01 12:36:22 UTC (rev 1920)
+++ tex-common/trunk/debian/changelog	2006-11-03 08:18:32 UTC (rev 1921)
@@ -3,13 +3,15 @@
   * Debconf translation updates: [frank]
     - French, thanks to Christian Perrier (closes: #395844)
     - Italian, thanks to Luca Monducci <luca.mo at tiscali.it> (closes:
-      #396101) 
+      #396101)
     - German, thanks to Helge Kreutzmann <debian at helgefjell.de> (closes:
-      #396036) 
+      #396036)
     - All others except the heavily outdated ca.po where unfuzzied by me,
       even in Japanese I can change "dpkg-dist" to "ucf-dist" [frank]
+  * install update-fontlang and the three links all into /usr/bin
+    and keep symlinks in /usr/sbin for old packages. (Closes: #396822)
 
- -- Frank Küster <frank at debian.org>  Mon, 30 Oct 2006 00:51:12 +0100
+ -- Norbert Preining <preining at debian.org>  Fri,  3 Nov 2006 09:02:36 +0100
 
 tex-common (0.37) unstable; urgency=low
 

Modified: tex-common/trunk/debian/rules
===================================================================
--- tex-common/trunk/debian/rules	2006-11-01 12:36:22 UTC (rev 1920)
+++ tex-common/trunk/debian/rules	2006-11-03 08:18:32 UTC (rev 1921)
@@ -5,8 +5,8 @@
 
 INSTDIR=$(CURDIR)/debian/tex-common
 
-bin_scripts=dh_installtex
-sbin_scripts=update-texmf update-fontlang
+bin_scripts=dh_installtex update-fontlang
+sbin_scripts=update-texmf
 nonbin_scripts=tpm2licenses Tpm.pm FileUtils.pm tetex-bin-upgrade 01tetex.cnf 01tetex.cnf.md5sum debianize-updmap
 
 sbin_installfiles=$(foreach script,$(sbin_scripts), scripts/$(script))
@@ -81,9 +81,13 @@
 	cp $(sbin_installfiles) $(INSTDIR)/usr/sbin/
 	cp $(bin_installfiles) $(INSTDIR)/usr/bin/
 	cp $(nonbin_installfiles) $(INSTDIR)/usr/share/tex-common/
-	ln -s update-fontlang $(INSTDIR)/usr/sbin/update-language
-	ln -s update-fontlang $(INSTDIR)/usr/sbin/update-fmtutil
-	ln -s ../sbin/update-fontlang $(INSTDIR)/usr/bin/update-updmap
+	# old location of files
+	ln -s ../bin/update-fontlang $(INSTDIR)/usr/sbin/update-language
+	ln -s ../bin/update-fontlang $(INSTDIR)/usr/sbin/update-fmtutil
+	# all update-* are useful for users, install them to /usr/bin
+	ln -s update-fontlang $(INSTDIR)/usr/bin/update-language
+	ln -s update-fontlang $(INSTDIR)/usr/bin/update-fmtutil
+	ln -s update-fontlang $(INSTDIR)/usr/bin/update-updmap
 
         # debhelper stuff
         # dh_installtex(.1) is already installed via the bin_scripts

Modified: tex-common/trunk/scripts/update-fontlang
===================================================================
--- tex-common/trunk/scripts/update-fontlang	2006-11-01 12:36:22 UTC (rev 1920)
+++ tex-common/trunk/scripts/update-fontlang	2006-11-03 08:18:32 UTC (rev 1921)
@@ -1,6 +1,7 @@
 #!/bin/sh -e
 #
-# update-fontlang --- Generate updmap.cfg and language.dat from a set of files
+# update-fontlang --- Generate updmap.cfg, language.dat, fmtutil.cnf
+#                     from a set of files
 # Copyright (C) 2002 Atsuhito Kohda
 # Copyright (C) 2004, 2005, 2006 Florent Rougon
 # Copyright (C) 2005, 2006 Norbert Preining

Modified: tex-common/trunk/scripts/update-fontlang.8
===================================================================
--- tex-common/trunk/scripts/update-fontlang.8	2006-11-01 12:36:22 UTC (rev 1920)
+++ tex-common/trunk/scripts/update-fontlang.8	2006-11-03 08:18:32 UTC (rev 1921)
@@ -29,6 +29,8 @@
 .BR update-fmtutil (1);
 further information can be found in the Debian TeX Policy, 
 .B /usr/share/doc/tex-common/Debian-TeX-Policy.txt.gz
+and the TeX on Debian documentation,
+.B /usr/share/doc/tex-common/TeX-on-Debian.txt.gz
 .PP
 .SH AUTHOR
 This manual page was written by Frank K\[:u]ster <frank at debian.org>,