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

[Frank Küster]

Author: frank
Date: 2005-12-05 15:14:13 +0000 (Mon, 05 Dec 2005)
New Revision: 372

Removed:
   tex-common/trunk/dsfp/
Modified:
   tex-common/trunk/debian/changelog
   tex-common/trunk/debian/control
   tex-common/trunk/debian/dirs
   tex-common/trunk/debian/rules
Log:
* tex-common now provides the symlink /usr/share/texmf/doc -->
  ../doc/texmf, because tetex-doc now puts its files into TEXMFDIST
  [frank]. 
* Do no longer install teTeX's common.* files and dsf-patch.mk, they are
  no longer used.


Modified: tex-common/trunk/debian/changelog
===================================================================
--- tex-common/trunk/debian/changelog	2005-12-05 12:18:28 UTC (rev 371)
+++ tex-common/trunk/debian/changelog	2005-12-05 15:14:13 UTC (rev 372)
@@ -1,10 +1,15 @@
 tex-common (0.12.1) UNRELEASED; urgency=low
 
+  * tex-common now provides the symlink /usr/share/texmf/doc -->
+    ../doc/texmf, because tetex-doc now puts its files into TEXMFDIST
+    [frank]. 
+  * Do no longer install teTeX's common.* files and dsf-patch.mk, they are
+    no longer used.
   * Translations: 
     - Update Czech debconf translation, thanks to Miroslav Kure
       <kurem at upcase.inf.upol.cz> (closes: #341941) [frank]
 
- -- Frank Küster <frank at debian.org>  Mon,  5 Dec 2005 12:29:36 +0100
+ -- Frank Küster <frank at debian.org>  Mon,  5 Dec 2005 16:13:38 +0100
 
 tex-common (0.12) unstable; urgency=low
 

Modified: tex-common/trunk/debian/control
===================================================================
--- tex-common/trunk/debian/control	2005-12-05 12:18:28 UTC (rev 371)
+++ tex-common/trunk/debian/control	2005-12-05 15:14:13 UTC (rev 372)
@@ -11,7 +11,7 @@
 Architecture: all
 Depends: ucf, ${misc:Depends}
 Suggests: debhelper (>= 4.0)
-Replaces: tetex-base (<= 3.0-7)
+Replaces: tetex-base (<= 3.0-10)
 Conflicts: tetex-bin (<= 3.0-4), tetex-base (<= 3.0-3)
 Description: Common infrastructure for using and building TeX in Debian
  This package contains a number of scripts and common configuration

Modified: tex-common/trunk/debian/dirs
===================================================================
--- tex-common/trunk/debian/dirs	2005-12-05 12:18:28 UTC (rev 371)
+++ tex-common/trunk/debian/dirs	2005-12-05 15:14:13 UTC (rev 372)
@@ -1,9 +1,8 @@
 usr/sbin
 usr/bin
 usr/share/debhelper/autoscripts
-usr/share/tex-common/teTeX-build
 usr/share/texmf/web2c
-usr/share/dsfp
+usr/share/doc/texmf
 etc/texmf/fmt.d
 etc/texmf/language.d
 etc/texmf/texmf.d

Modified: tex-common/trunk/debian/rules
===================================================================
--- tex-common/trunk/debian/rules	2005-12-05 12:18:28 UTC (rev 371)
+++ tex-common/trunk/debian/rules	2005-12-05 15:14:13 UTC (rev 372)
@@ -14,9 +14,6 @@
 bin_installfiles=$(foreach script,$(bin_scripts), scripts/$(script))
 bin_manpages=$(foreach script,$(bin_scripts), scripts/$(script).1) scripts/update-updmap.1
 
-# for the teTeX packages
-teTeX_buildfiles=debian/common.variables debian/common.functions.in
-
 # create maintainer scripts etc.
 EPERL_FILES := debian/common.functions debian/postinst debian/postrm debian/config
 eperl_sourcefiles=debian/variables debian/COPYRIGHT.scripts debian/postinst.functions \
@@ -66,7 +63,6 @@
 
 	# Add here commands to install the package into debian/tex-common.
 	cd doc; $(MAKE) install DESTDIR=$(INSTDIR)/usr/share/doc/tex-common
-	cp dsfp/* $(INSTDIR)/usr/share/dsfp/
 	cp conf/fmt.d/00tex.cnf $(INSTDIR)/etc/texmf/fmt.d/
 	cp conf/language.d/00tex.cnf $(INSTDIR)/etc/texmf/language.d/
 	# ucf files
@@ -98,7 +94,8 @@
 	rm -f debian/$package/usr/share/texmf/ls-R
 	ln -s /var/lib/texmf/ls-R-TEXMFMAIN $(INSTDIR)/usr/share/texmf/ls-R
 
-	cp $(teTeX_buildfiles) $(INSTDIR)/usr/share/tex-common/teTeX-build/
+	# Create a symlink in TEXMFMAIN for docs
+	ln -s ../doc/texmf $(INSTDIR)/usr/share/texmf/doc
 
 
 # Build architecture-independent files here.