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

[Frank Küster]

Author: frank
Date: 2006-04-21 08:22:54 +0000 (Fri, 21 Apr 2006)
New Revision: 1232

Added:
   tetex-base/branches/new-splitting/debian/dontinstall.install
Modified:
   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:
use dh_install for removal of files, as discussed

Added: tetex-base/branches/new-splitting/debian/dontinstall.install
===================================================================
--- tetex-base/branches/new-splitting/debian/dontinstall.install	2006-04-21 07:51:15 UTC (rev 1231)
+++ tetex-base/branches/new-splitting/debian/dontinstall.install	2006-04-21 08:22:54 UTC (rev 1232)
@@ -0,0 +1,16 @@
+usr/share/texmf-tetex/tex/latex/lm/
+usr/share/texmf-tetex/doc/fonts/lm/
+usr/share/texmf-tetex/fonts/afm/public/lm/
+usr/share/texmf-tetex/fonts/enc/dvips/lm/
+usr/share/texmf-tetex/fonts/map/dvips/lm/
+usr/share/texmf-tetex/fonts/tfm/public/lm/
+usr/share/texmf-tetex/fonts/type1/public/lm/ 
+usr/share/texmf-tetex/doc/latex/preview/
+usr/share/texmf-tetex/tex/latex/preview
+usr/share/texmf-tetex/tex/latex/pgf
+usr/share/texmf-tetex/doc/latex/pgf
+usr/share/texmf-tetex/tex/latex/xcolor
+usr/share/texmf-tetex/doc/latex/xcolor
+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 07:51:15 UTC (rev 1231)
+++ tetex-base/branches/new-splitting/debian/rules	2006-04-21 08:22:54 UTC (rev 1232)
@@ -181,7 +181,7 @@
 ### Install the files for the packages.
 
 $(stampdir)/install-stamp: $(stampdir)/build-stamp $(stampdir)/setup-install-stamp
-$(stampdir)/install-stamp: filelists install-base install-extra install-nonfree
+$(stampdir)/install-stamp: install-main 
 	# these targets are in debian/rules.d/{filelists.mk,install.mk}
 	touch $(stampdir)/install-stamp
 

Modified: tetex-base/branches/new-splitting/debian/rules.d/install.mk
===================================================================
--- tetex-base/branches/new-splitting/debian/rules.d/install.mk	2006-04-21 07:51:15 UTC (rev 1231)
+++ tetex-base/branches/new-splitting/debian/rules.d/install.mk	2006-04-21 08:22:54 UTC (rev 1232)
@@ -1,13 +1,4 @@
 md5sums-extra = config.ams config.amz config.cm config.cmz
-lmdirs = tex/latex/lm/ doc/fonts/lm/ fonts/afm/public/lm/ \
-  fonts/enc/dvips/lm/ fonts/map/dvips/lm/ fonts/tfm/public/lm/ \
-  fonts/type1/public/lm/ 
-preview-latex-dirs = doc/latex/preview/ tex/latex/preview
-pgf-dirs = tex/latex/pgf doc/latex/pgf
-xcolor-dirs = tex/latex/xcolor doc/latex/xcolor
-texinfo-dirs = 	tex/texinfo
-beamer-dirs = tex/latex/beamer doc/latex/beamer
-remove-dirs = $(lmdirs) $(preview-latex-dirs) $(pgf-dirs) $(xcolor-dirs) $(texinfo-dirs) $(beamer-dirs)
 
 
 setup-install: $(stampdir)/setup-install-stamp
@@ -26,24 +17,19 @@
 # Copy the whole texmf tree to the install directory.
 	mkdir -p $(tmptxmfdir)
 	cp -a `ls -1 | egrep -v 'debian|stampdir'` $(tmptxmfdir)
-	dh_install --sourcedir=debian/tmp
+	dh_install --sourcedir=debian/tmp --list-missing \
+	   --package=$(package) --package=$(extra) --package=$(docpack) \
+	   --package=dontinstall 
+#	rm -r debian/dontinstall/
 	touch $@
 
-install-remove: $(stampdir)/install-remove-stamp
+install-main: $(stampdir)/install-main-stamp
 
-$(stampdir)/install-remove-stamp: $(stampdir)/copy-texmf-stamp
-	# remove files that are in other packages:
-	# lmodern, preview-latex, pgf, xcolor, texinfo
-	for dir in $(remove-dirs); do rm -rf $(txmfdir)/$$dir; done
+$(stampdir)/install-main-stamp: $(stampdir)/build-stamp $(stampdir)/setup-install-stamp
+$(stampdir)/install-main-stamp: $(stampdir)/copy-texmf-stamp
+$(stampdir)/install-main-stamp: $(stampdir)/install-base-stamp $(stampdir)/install-extra-stamp
 
-	touch $@
-
-
-install-base: $(stampdir)/install-base-stamp
-
-$(stampdir)/install-base-stamp: $(stampdir)/build-stamp $(stampdir)/setup-install-stamp
-$(stampdir)/install-base-stamp: $(stampdir)/filelists-stamp  $(stampdir)/copy-texmf-stamp
-$(stampdir)/install-base-stamp: $(stampdir)/install-remove-stamp
+$(stampdir)/install-base-stamp:
 ### Install tetex-base.
 
 ## set up configuration files, make a lot of links, and 
@@ -71,12 +57,6 @@
 # Copy the LPPL file to /usr/share/doc/tetex-base.
 	cp -p doc/latex/base/lppl*.txt debian/$(package)/usr/share/doc/tetex-base
 
-# Do something about making the mkhtml script usable.
-## We should move this binary to tetex-bin, really, but at least into
-## an appropriate directory.  In the meantime, we'll leave it where it
-## is.
-#	chmod +x $(txmfdir)/doc/mkhtml
-
 # setup map state directory
 	cp debian/README.texmaps debian/$(package)/usr/share/$(package)/
 
@@ -88,14 +68,9 @@
 ## Done installing tetex-base!
 	touch $@
 
-install-nonfree:
-# nothing to be done, no tetex-nonfree
-
 install-extra: $(stampdir)/install-extra-stamp
 
-$(stampdir)/install-extra-stamp: $(stampdir)/install-base-stamp
-### Install tetex-extra and tetex-doc
-	dh_movefiles --sourcedir=debian/$(package)
+$(stampdir)/install-extra-stamp: $(stampdir)/copy-texmf-stamp
 # remove empty dirs from tetex-base - some might become symlinks in tetex-extra!
 	$(remove-emptybasedirs)
 # install font config file

Modified: tetex-base/branches/new-splitting/debian/rules.in
===================================================================
--- tetex-base/branches/new-splitting/debian/rules.in	2006-04-21 07:51:15 UTC (rev 1231)
+++ tetex-base/branches/new-splitting/debian/rules.in	2006-04-21 08:22:54 UTC (rev 1232)
@@ -176,7 +176,7 @@
 #	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
+	dh_clean -Xconfig.old ./$(stampdir)/ ./debian/dontinstall
 
 # clean eperl files
 	rm -f $(EPERL_FILES)
@@ -186,7 +186,7 @@
 ### Install the files for the packages.
 
 $(stampdir)/install-stamp: $(stampdir)/build-stamp $(stampdir)/setup-install-stamp
-$(stampdir)/install-stamp: filelists install-base install-extra install-nonfree
+$(stampdir)/install-stamp: install-main 
 	# these targets are in debian/rules.d/{filelists.mk,install.mk}
 	touch $(stampdir)/install-stamp