[subversion-commit] SVN tetex commit + diffs: r225 - in tetex-base/branches/changelog-for-unstable/debian: . rules.d

[Frank Küster]

Author: frank
Date: 2005-10-14 14:23:06 +0000 (Fri, 14 Oct 2005)
New Revision: 225

Modified:
   tetex-base/branches/changelog-for-unstable/debian/postrm.in
   tetex-base/branches/changelog-for-unstable/debian/rules
   tetex-base/branches/changelog-for-unstable/debian/rules.d/install.mk
   tetex-base/branches/changelog-for-unstable/debian/rules.in
   tetex-base/branches/changelog-for-unstable/debian/tetex-base.dirs.in
Log:
merge trunk changes into branch changelog-for-unstable

Modified: tetex-base/branches/changelog-for-unstable/debian/postrm.in
===================================================================
--- tetex-base/branches/changelog-for-unstable/debian/postrm.in	2005-10-14 13:55:34 UTC (rev 224)
+++ tetex-base/branches/changelog-for-unstable/debian/postrm.in	2005-10-14 14:23:06 UTC (rev 225)
@@ -2,7 +2,7 @@
 #!/bin/sh -e
 # 
 # postrm maintainer script for the Debian tetex-base package.
-# $Id: postrm.in,v 1.1.2.5 2005/03/14 12:28:15 frank Exp $
+# $Id$
 <:=@COPYRIGHT:>//
 
 ## Define static variables
@@ -15,7 +15,7 @@
  pdftex_dl14.map pdftex_ndl14.map dvipdfm_dl14.map dvipdfm_ndl14.map ps2pk.map"
 generated_links="psfonts.map pdftex.map dvipdfm.map"
 #/var/lib/texmf has been removed from vardirlist - some files must be removed differently
-vardirlist="/var/spool/texmf /var/cache/fonts"
+vardirlist="/var/spool/texmf"
 old_texdoctk="<:=$OLD_TEXDOCTK:>"
 NOWLINKDIRS="<:=$NOWLINKDIRS:>"
 UNUSED_CONFFILES="<:=$UNUSED_CONFFILES_BASE:>"

Modified: tetex-base/branches/changelog-for-unstable/debian/rules
===================================================================
--- tetex-base/branches/changelog-for-unstable/debian/rules	2005-10-14 13:55:34 UTC (rev 224)
+++ tetex-base/branches/changelog-for-unstable/debian/rules	2005-10-14 14:23:06 UTC (rev 225)
@@ -161,7 +161,7 @@
 	dh_testroot
 # no debconf questions currently
 #	dh_installdebconf -p$(package)
-	dh_installdocs -i -N tetex-extra-fonts  
+	dh_installdocs -i -N tetex-extra-fonts   debian/changelog.Debian.experimental
 #	dh_installdocs -p tetex-extra-fonts debian/copyr.type1 debian/changelog -X copyright
 
 
@@ -184,7 +184,7 @@
 # Install scripts for postinst
 	install -D --mode=755 debian/setup-ucf debian/$(package)/usr/share/$(package)/setup-ucf
 
-	dh_fixperms -i --exclude=var/cache/fonts
+	dh_fixperms -i
 	dh_gencontrol -i
 	dh_installdeb -i
 	dh_md5sums -i
@@ -209,7 +209,7 @@
 
 debian/sarge-stamp: 
 	cp debian/changelog debian/sarge/changelog.sid
-	sed -e s/3.0-6.1/3.0-6.0.sarge1/ debian/sarge/changelog.sid \
+	sed -e s/3.0-X// debian/sarge/changelog.sid \
 	  > debian/changelog && rm debian/sid-stamp
 	# need to remake rules
 	touch debian/rules.in

Modified: tetex-base/branches/changelog-for-unstable/debian/rules.d/install.mk
===================================================================
--- tetex-base/branches/changelog-for-unstable/debian/rules.d/install.mk	2005-10-14 13:55:34 UTC (rev 224)
+++ tetex-base/branches/changelog-for-unstable/debian/rules.d/install.mk	2005-10-14 14:23:06 UTC (rev 225)
@@ -79,11 +79,6 @@
 ## is.
 #	chmod +x $(txmfdir)/doc/mkhtml
 
-# ship /var/cache/fonts in the tetex-base package, with proper permissions
-	mkdir --mode=1777 debian/$(package)/var/cache/fonts/pk
-	mkdir --mode=1777 debian/$(package)/var/cache/fonts/tfm
-	mkdir --mode=1777 debian/$(package)/var/cache/fonts/source
-
 # setup map state directory
 	cp debian/README.texmaps debian/$(package)/usr/share/$(package)/
 ## Done installing tetex-base!

Modified: tetex-base/branches/changelog-for-unstable/debian/rules.in
===================================================================
--- tetex-base/branches/changelog-for-unstable/debian/rules.in	2005-10-14 13:55:34 UTC (rev 224)
+++ tetex-base/branches/changelog-for-unstable/debian/rules.in	2005-10-14 14:23:06 UTC (rev 225)
@@ -189,7 +189,7 @@
 # Install scripts for postinst
 	install -D --mode=755 debian/setup-ucf debian/$(package)/usr/share/$(package)/setup-ucf
 
-	dh_fixperms -i --exclude=var/cache/fonts
+	dh_fixperms -i
 	dh_gencontrol -i
 	dh_installdeb -i
 	dh_md5sums -i

Modified: tetex-base/branches/changelog-for-unstable/debian/tetex-base.dirs.in
===================================================================
--- tetex-base/branches/changelog-for-unstable/debian/tetex-base.dirs.in	2005-10-14 13:55:34 UTC (rev 224)
+++ tetex-base/branches/changelog-for-unstable/debian/tetex-base.dirs.in	2005-10-14 14:23:06 UTC (rev 225)
@@ -12,4 +12,4 @@
 var/lib/texmf/web2c
 var/lib/tex-common/fontmap-cfg
 var/lib/tex-common/language-cnf
-var/cache/fonts
+