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

[Frank Küster]

Author: frank
Date: 2005-10-19 09:29:51 +0000 (Wed, 19 Oct 2005)
New Revision: 281

Modified:
   tetex-base/trunk/debian/changelog
   tetex-base/trunk/debian/rules.d/install.mk
   tetex-base/trunk/debian/rules.in
Log:
  * Remove unneeded file /usr/share/doc/texmf/Makefile from tetex-doc
    which caused a conflict with old tetex-base (closes: #334659) [frank]
  * Install changelog.Debian.experimental (closes: #334655) [frank]


Modified: tetex-base/trunk/debian/changelog
===================================================================
--- tetex-base/trunk/debian/changelog	2005-10-18 20:49:40 UTC (rev 280)
+++ tetex-base/trunk/debian/changelog	2005-10-19 09:29:51 UTC (rev 281)
@@ -1,3 +1,11 @@
+tetex-base (3.0-10) unstable; urgency=low
+
+  * Remove unneeded file /usr/share/doc/texmf/Makefile from tetex-doc
+    which caused a conflict with old tetex-base (closes: #334659) [frank]
+  * Install changelog.Debian.experimental (closes: #334655) [frank]
+
+ -- Frank Küster <frank at debian.org>  Wed, 19 Oct 2005 11:28:44 +0200
+
 tetex-base (3.0-9) unstable; urgency=low
 
   * Upload new upstream release to unstable.  The changelog of the

Modified: tetex-base/trunk/debian/rules.d/install.mk
===================================================================
--- tetex-base/trunk/debian/rules.d/install.mk	2005-10-18 20:49:40 UTC (rev 280)
+++ tetex-base/trunk/debian/rules.d/install.mk	2005-10-19 09:29:51 UTC (rev 281)
@@ -43,13 +43,6 @@
 $(stampdir)/install-base-stamp: $(stampdir)/install-remove-stamp
 ### Install tetex-base.
 
-## remove unneeded files
-
-# Remove the source subdirectory, if it exists.
-#	rm -rf $(txmfdir)/source
-# Remove texconfig directory (is provided by tetex-bin)
-#	rm -rf $(txmfdir)/texconfig
-
 ## set up configuration files, make a lot of links, and 
 ## copy the md5sum files for ucf
 	debian/setup-conflinks -base
@@ -62,6 +55,8 @@
 
 # Move the documentation directory from the texmf tree to /usr/share/doc in tetex-doc
 	mv debian/$(package)/usr/share/texmf/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.
 	(cd debian/$(package)/usr/share/texmf/; ln -s ../doc/texmf doc)
 # Create a link within the package doc directory to the documentation.

Modified: tetex-base/trunk/debian/rules.in
===================================================================
--- tetex-base/trunk/debian/rules.in	2005-10-18 20:49:40 UTC (rev 280)
+++ tetex-base/trunk/debian/rules.in	2005-10-19 09:29:51 UTC (rev 281)
@@ -192,6 +192,7 @@
 	ln -s ../texmf debian/$(docpack)/usr/share/doc/$(docpack)/
 
 	dh_installchangelogs ChangeLog -p tetex-base
+	cp debian/changelog.Debian.experimental debian/$(package)/usr/share/doc/$(package)/
 	dh_compress -Xhelpfile
 	dh_installinfo