[subversion-commit] SVN tetex-base commit + diffs: r1233 - in tetex-base/branches/new-splitting/debian: . rules.d

[Frank Küster]

Author: frank
Date: 2006-04-21 12:47:36 +0000 (Fri, 21 Apr 2006)
New Revision: 1233

Modified:
   tetex-base/branches/new-splitting/debian/changelog
   tetex-base/branches/new-splitting/debian/dontinstall.install
   tetex-base/branches/new-splitting/debian/rules
   tetex-base/branches/new-splitting/debian/rules.d/install.mk
   tetex-base/branches/new-splitting/debian/rules.in
Log:
- fixes needed to correctly build and clean
- comment dontinstall.install
- changelog entry

Modified: tetex-base/branches/new-splitting/debian/changelog
===================================================================
--- tetex-base/branches/new-splitting/debian/changelog	2006-04-21 08:22:54 UTC (rev 1232)
+++ tetex-base/branches/new-splitting/debian/changelog	2006-04-21 12:47:36 UTC (rev 1233)
@@ -6,8 +6,10 @@
   * Fix eperl open commands in maintainer scripts to work with -k [jdg]
   * Made preinst a /bin/sh script [jdg]
   * SPLITTING-NEW BRANCH: Merge changes from 3.0-17.1, revision 1142
+  * SPLITTING-NEW BRANCH: Use dh_install to split the package, and for
+    removing unneeded files from the TEXMF tree
 
- -- Frank Küster <frank at debian.org>  Tue, 11 Apr 2006 15:20:39 +0200
+ -- Frank Küster <frank at debian.org>  Fri, 21 Apr 2006 14:43:43 +0200
 
 tetex-base (3.0-17) unstable; urgency=low
 

Modified: tetex-base/branches/new-splitting/debian/dontinstall.install
===================================================================
--- tetex-base/branches/new-splitting/debian/dontinstall.install	2006-04-21 08:22:54 UTC (rev 1232)
+++ tetex-base/branches/new-splitting/debian/dontinstall.install	2006-04-21 12:47:36 UTC (rev 1233)
@@ -1,3 +1,7 @@
+## These files/dirs are in separate packages in debian and hence should
+## not be installed with teTeX
+#
+# Latin Modern fonts
 usr/share/texmf-tetex/tex/latex/lm/
 usr/share/texmf-tetex/doc/fonts/lm/
 usr/share/texmf-tetex/fonts/afm/public/lm/
@@ -5,12 +9,16 @@
 usr/share/texmf-tetex/fonts/map/dvips/lm/
 usr/share/texmf-tetex/fonts/tfm/public/lm/
 usr/share/texmf-tetex/fonts/type1/public/lm/ 
+# preview-latex styles
 usr/share/texmf-tetex/doc/latex/preview/
 usr/share/texmf-tetex/tex/latex/preview
+# beamer and pgf
+usr/share/texmf-tetex/tex/latex/beamer
+usr/share/texmf-tetex/doc/latex/beamer
 usr/share/texmf-tetex/tex/latex/pgf
 usr/share/texmf-tetex/doc/latex/pgf
+# xcolor
 usr/share/texmf-tetex/tex/latex/xcolor
 usr/share/texmf-tetex/doc/latex/xcolor
+# texinfo
 usr/share/texmf-tetex/tex/texinfo
-usr/share/texmf-tetex/tex/latex/beamer
-usr/share/texmf-tetex/doc/latex/beamer

Modified: tetex-base/branches/new-splitting/debian/rules
===================================================================
--- tetex-base/branches/new-splitting/debian/rules	2006-04-21 08:22:54 UTC (rev 1232)
+++ tetex-base/branches/new-splitting/debian/rules	2006-04-21 12:47:36 UTC (rev 1233)
@@ -170,8 +170,9 @@
 # (needed only after an upstream change)
 #	debian/remove-bad-license-files
 
-# Run dh_clean to clean up the source tree, and remove stamps and filelists
-	dh_clean -Xconfig.old ./$(stampdir)/*-stamp ./$(stampdir)/files* ./debian/*.links ./debian/*.files
+# Run dh_clean to clean up the source tree, and remove stamps
+	dh_clean -Xconfig.old ./$(stampdir)/*-stamp
+	rm -r ./debian/dontinstall
 
 # clean eperl files
 	rm -f $(EPERL_FILES)

Modified: tetex-base/branches/new-splitting/debian/rules.d/install.mk
===================================================================
--- tetex-base/branches/new-splitting/debian/rules.d/install.mk	2006-04-21 08:22:54 UTC (rev 1232)
+++ tetex-base/branches/new-splitting/debian/rules.d/install.mk	2006-04-21 12:47:36 UTC (rev 1233)
@@ -43,7 +43,7 @@
 ## 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/$(docpack)/usr/share/texmf-tetex/doc debian/$(docpack)/usr/share/doc/texmf
 # Remove unneeded files in tetex-doc
 	rm debian/$(docpack)/usr/share/doc/texmf/Makefile
 # Create a link within the texmf tree to the documentation.

Modified: tetex-base/branches/new-splitting/debian/rules.in
===================================================================
--- tetex-base/branches/new-splitting/debian/rules.in	2006-04-21 08:22:54 UTC (rev 1232)
+++ tetex-base/branches/new-splitting/debian/rules.in	2006-04-21 12:47:36 UTC (rev 1233)
@@ -175,8 +175,9 @@
 # (needed only after an upstream change)
 #	debian/remove-bad-license-files
 
-# Run dh_clean to clean up the source tree, and remove stamps and filelists
-	dh_clean -Xconfig.old ./$(stampdir)/ ./debian/dontinstall
+# Run dh_clean to clean up the source tree, and remove stamps
+	dh_clean -Xconfig.old ./$(stampdir)/*-stamp
+	rm -r ./debian/dontinstall
 
 # clean eperl files
 	rm -f $(EPERL_FILES)