[subversion-commit] SVN tetex-base commit + diffs: r1255 - in tetex-base/trunk/debian: . rules.d

[Frank Küster]

Author: frank
Date: 2006-04-28 21:09:56 +0000 (Fri, 28 Apr 2006)
New Revision: 1255

Modified:
   tetex-base/trunk/debian/changelog
   tetex-base/trunk/debian/control
   tetex-base/trunk/debian/rules.d/install.mk
   tetex-base/trunk/debian/tetex-doc.dirs
Log:
[UNTESTED]

Move the documentation from /usr/share/doc/texmf/ to
/usr/share/doc/tetex-doc and let the symlink point to the new
location, in accordance with new policy, and to allow parallel
installation of some texlive packages.
Install dhelp file with tetex-doc, not tetex-base


Modified: tetex-base/trunk/debian/changelog
===================================================================
--- tetex-base/trunk/debian/changelog	2006-04-28 20:00:10 UTC (rev 1254)
+++ tetex-base/trunk/debian/changelog	2006-04-28 21:09:56 UTC (rev 1255)
@@ -17,8 +17,13 @@
     orig.tar.gz is not yet repackaged. [frank]
   * Remove versioned Pre-Depends on dpkg - the versions requested were
     much older than woody's version. [frank]
+  * Move the documentation from /usr/share/doc/texmf/ to
+    /usr/share/doc/tetex-doc and let the symlink point to the new
+    location, in accordance with new policy, and to allow parallel
+    installation of some texlive packages.
+  * Install dhelp file with tetex-doc, not tetex-base
 
- -- Frank Küster <frank at debian.org>  Thu, 27 Apr 2006 18:57:51 +0200
+ -- Frank Küster <frank at debian.org>  Fri, 28 Apr 2006 22:25:33 +0200
 
 tetex-base (3.0-17) unstable; urgency=low
 

Modified: tetex-base/trunk/debian/control
===================================================================
--- tetex-base/trunk/debian/control	2006-04-28 20:00:10 UTC (rev 1254)
+++ tetex-base/trunk/debian/control	2006-04-28 21:09:56 UTC (rev 1255)
@@ -39,7 +39,7 @@
 Package: tetex-doc
 Section: doc
 Architecture: all
-Replaces: latex2e-doc, tetex-base (<< 3.0), tetex-nonfree
+Replaces: latex2e-doc, tetex-base (<= 3.0-17), tetex-nonfree
 Conflicts: latex2e-doc, tetex-extra (<< 2.0)
 Recommends: tetex-bin (>> 2.0) | dvi2tty, xpdf | pdf-viewer, gv | postscript-viewer, mozilla-browser | www-browser
 Suggests: libapache2-mod-php4 | libapache2-mod-php5

Modified: tetex-base/trunk/debian/rules.d/install.mk
===================================================================
--- tetex-base/trunk/debian/rules.d/install.mk	2006-04-28 20:00:10 UTC (rev 1254)
+++ tetex-base/trunk/debian/rules.d/install.mk	2006-04-28 21:09:56 UTC (rev 1255)
@@ -54,16 +54,16 @@
 ## documentation and licensing stuff
 
 # Move the documentation directory from the texmf tree to /usr/share/doc in tetex-doc
-	mv debian/$(package)/usr/share/texmf-tetex/doc debian/$(docpack)/usr/share/doc/texmf
+	mv debian/$(package)/usr/share/texmf-tetex/doc debian/$(docpack)/usr/share/doc/$(docpack)
 # Remove unneeded files in tetex-doc
-	rm debian/$(docpack)/usr/share/doc/texmf/Makefile
+	rm debian/$(docpack)/usr/share/doc/$(docpack)/Makefile
 # Create a link within the texmf tree to the documentation.
-	(cd debian/$(package)/usr/share/texmf-tetex/; ln -s ../doc/texmf doc)
+	ln -s ../doc/$(docpack) debian/$(docpack)/usr/share/texmf-tetex/doc
 # Create a link within the package doc directory to the documentation.
-	(cd debian/$(package)/usr/share/doc/tetex-base/; ln -s ../texmf texmf)
+	ln -s ../$(docpack) debian/$(package)/usr/share/doc/$(package)/texmf
 
 # Copy the dhelp definition file to the package documentation directory.
-	cp debian/dhelp debian/$(package)/usr/share/doc/tetex-base/.dhelp
+	cp debian/dhelp debian/$(docpack)/usr/share/doc/$(docpack)/.dhelp
 
 # Copy the LPPL file to /usr/share/doc/tetex-base.
 	cp -p doc/latex/base/lppl*.txt debian/$(package)/usr/share/doc/tetex-base
@@ -101,9 +101,9 @@
 
 
 # cweb stuff
-	mkdir -p debian/$(docpack)/usr/share/doc/texmf/programs/cweb-examples
+	mkdir -p debian/$(docpack)/usr/share/doc/$(docpack)/programs/cweb-examples
 	cp debian/cweb-examples/* \
-	   debian/$(docpack)/usr/share/doc/texmf/programs/cweb-examples
+	   debian/$(docpack)/usr/share/doc/$(docpack)/programs/cweb-examples
 
 #	(cd debian/$(package); find . -type d -empty -prune -exec rm -rf {} \; && find . -type d -empty -prune -exec rm -rf {} \; && find . -type d -empty -prune -exec rm -rf {} \; || true)
 
@@ -115,18 +115,18 @@
 	done
 
 # unnecessary, useful only for the CVS repository.
-	rm -f debian/$(docpack)/usr/share/doc/texmf/metapost/base/.cvsignore
+	rm -f debian/$(docpack)/usr/share/doc/$(docpack)/metapost/base/.cvsignore
 
 # Move the helpindex.html file to /var/lib/texmf (where it can be
 # safely updated without violating the FHS), and link it back to
 # /usr/share/doc/texmf.
-	mv debian/$(docpack)/{usr/share/doc/texmf/helpindex.html,var/lib/texmf}
-	ln -s /var/lib/texmf/helpindex.html debian/$(docpack)/usr/share/doc/texmf/
+	mv debian/$(docpack)/{usr/share/doc/$(docpack)/helpindex.html,var/lib/texmf}
+	ln -s /var/lib/texmf/helpindex.html debian/$(docpack)/usr/share/doc/$(docpack)/
 
 # install additional documentation for the Sueterlin fonts - this 
 # was put on CTAN only after teTeX-3.0 was released
-	mkdir debian/$(docpack)/usr/share/doc/texmf/fonts/gothic
-	uudecode -o debian/$(docpack)/usr/share/doc/texmf/fonts/gothic/suet.pdf debian/patches/suet.pdf.uu
+	mkdir debian/$(docpack)/usr/share/doc/$(docpack)/fonts/gothic
+	uudecode -o debian/$(docpack)/usr/share/doc/$(docpack)/fonts/gothic/suet.pdf debian/patches/suet.pdf.uu
 # provide a file that allows to access documentation via http://localhost/doc/texmf/texdoc.php
 	cp debian/tetex-doc.apache2.sites-available debian/$(docpack)/etc/apache2/sites-available/tetex-doc
 	ln -s ../sites-available/tetex-doc debian/$(docpack)/etc/apache2/sites-enabled/050-tetex-doc
@@ -139,13 +139,13 @@
 
 install-tmp:
 # very temporary; marvosym.pfb was duplicated and should not be here.
-	rm debian/$(package)/usr/share/doc/texmf/fonts/marvosym/marvosym.pfb
+	rm debian/$(docpack)/usr/share/doc/$(docpack)/fonts/marvosym/marvosym.pfb
 
 define remove-emptybasedirs
 	find debian/$(package)/usr/share/texmf-tetex -type d -empty | xargs rmdir || true
 	find debian/$(package)/usr/share/texmf-tetex -type d -empty | xargs rmdir || true
 	find debian/$(package)/usr/share/texmf-tetex -type d -empty | xargs rmdir || true
-	find debian/$(package)/usr/share/doc/texmf -type d -empty | xargs rmdir || true
-	find debian/$(package)/usr/share/doc/texmf -type d -empty | xargs rmdir || true
-	find debian/$(package)/usr/share/doc/texmf -type d -empty | xargs rmdir || true
+	find debian/$(package)/usr/share/doc/$(docpack) -type d -empty | xargs rmdir || true
+	find debian/$(package)/usr/share/doc/$(docpack) -type d -empty | xargs rmdir || true
+	find debian/$(package)/usr/share/doc/$(docpack) -type d -empty | xargs rmdir || true
 endef

Modified: tetex-base/trunk/debian/tetex-doc.dirs
===================================================================
--- tetex-base/trunk/debian/tetex-doc.dirs	2006-04-28 20:00:10 UTC (rev 1254)
+++ tetex-base/trunk/debian/tetex-doc.dirs	2006-04-28 21:09:56 UTC (rev 1255)
@@ -1,6 +1,6 @@
 usr/share/doc
+usr/share/texmf-tetex
 var/lib/texmf
 usr/bin
-usr/share/man/man1
 etc/apache2/sites-available
 etc/apache2/sites-enabled