[Debian-tex-commits] SVN tetex-base commit + diffs: r1844 - in tetex-base/trunk/debian: . rules.d

[Frank Küster]

Author: frank
Date: 2006-10-17 07:18:06 +0000 (Tue, 17 Oct 2006)
New Revision: 1844

Modified:
   tetex-base/trunk/debian/control
   tetex-base/trunk/debian/remove-nonfreedocs
   tetex-base/trunk/debian/rules.d/install.mk
Log:
- [control] use non-deprecated version relation
- [remove-nonfreedocs] don't delete free-by-GR docs
- [install.mk] correct source locations, don't try to create existing
  directories


Modified: tetex-base/trunk/debian/control
===================================================================
--- tetex-base/trunk/debian/control	2006-10-16 20:20:44 UTC (rev 1843)
+++ tetex-base/trunk/debian/control	2006-10-17 07:18:06 UTC (rev 1844)
@@ -41,7 +41,7 @@
 Package: tetex-doc
 Section: doc
 Architecture: all
-Replaces: latex2e-doc, tetex-base (<= 3.0-17), tetex-nonfree, tetex-doc-nonfree (< 1.0-2)
+Replaces: latex2e-doc, tetex-base (<= 3.0-17), tetex-nonfree, tetex-doc-nonfree (<< 1.0-2)
 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/remove-nonfreedocs
===================================================================
--- tetex-base/trunk/debian/remove-nonfreedocs	2006-10-16 20:20:44 UTC (rev 1843)
+++ tetex-base/trunk/debian/remove-nonfreedocs	2006-10-17 07:18:06 UTC (rev 1844)
@@ -17,14 +17,10 @@
 "
 
 NONFREE_DOCS="
-doc/latex/general/l2tabu.pdf
 "
 
 NONFREE_DOCS_GFDL="
-doc/latex/general/l2tabuen.pdf
-doc/pdftex/manual/pdftex-a.pdf
 doc/fontinst/fontinstallationguide.pdf
-doc/latex/general/l2kurz.pdf
 "
 
 ALL_NONFREE_DOCS="$NONFREE_DOCS $NONFREE_DOCS_GFDL $CC_LICENSED_NOSOURCE $CC_LICENSED"

Modified: tetex-base/trunk/debian/rules.d/install.mk
===================================================================
--- tetex-base/trunk/debian/rules.d/install.mk	2006-10-16 20:20:44 UTC (rev 1843)
+++ tetex-base/trunk/debian/rules.d/install.mk	2006-10-17 07:18:06 UTC (rev 1844)
@@ -42,13 +42,11 @@
 	# see bug #380643
 	mkdir  $(txmfdir)/bibtex/bib/revtex4/
 	mv  $(txmfdir)/doc/latex/revtex4/sample/apssamp.bib $(txmfdir)/bibtex/bib/revtex4/
-	mv $(txmfdir)/doc/latex/amscls/jr.bib.gz $(txmfdir)/bibtex/bib/ams/
-	gunzip $(txmfdir)/bibtex/bib/ams/jr.bib.gz
+	mv $(txmfdir)/doc/latex/amscls/jr.bib $(txmfdir)/bibtex/bib/ams/
 	mkdir $(txmfdir)/bibtex/bib/bibtopic/
-	mv $(txmfdir)/latex/bibtopic/books.bib $(txmfdir)/bibtex/bib/bibtopic/
-	mv $(txmfdir)/latex/bibtopic/articles.bib $(txmfdir)/bibtex/bib/bibtopic/
-	mkdir $(txmfdir)/bibtex/bib/base
-	mv $(txmfdir)/bibtex/btxdoc.bib $(txmfdir)/bibtex/bib/base
+	mv $(txmfdir)/doc/latex/bibtopic/books.bib $(txmfdir)/bibtex/bib/bibtopic/
+	mv $(txmfdir)/doc/latex/bibtopic/articles.bib $(txmfdir)/bibtex/bib/bibtopic/
+	mv $(txmfdir)/doc/bibtex/base/btxdoc.bib $(txmfdir)/bibtex/bib/base
 
 
 install-base: $(stampdir)/install-base-stamp