[subversion-commit] SVN tetex commit + diffs: r130 - tetex-base/trunk/debian

[Frank Küster]

Author: frank
Date: 2005-08-16 11:52:31 +0000 (Tue, 16 Aug 2005)
New Revision: 130

Modified:
   tetex-base/trunk/debian/rules
   tetex-base/trunk/debian/rules.in
Log:
really use dsf-patchfunc (and don't run remove-bad-license files without need)

Modified: tetex-base/trunk/debian/rules
===================================================================
--- tetex-base/trunk/debian/rules	2005-08-16 11:51:52 UTC (rev 129)
+++ tetex-base/trunk/debian/rules	2005-08-16 11:52:31 UTC (rev 130)
@@ -114,22 +114,19 @@
 $(stampdir)/eperl-stamp: $(EPERL_FILES) 
 	touch $@
 
-$(stampdir)/build-stamp:
+$(stampdir)/build-stamp: patch-stamp
 	$(check-cvs)
 	dh_testdir
 	-mkdir $(stampdir)
-# modification for Debian. No need for reverse-patching - clean should be called usually
-	patch -p0 -Ni debian/patches/patch-deb
-	patch -p0 -Ni debian/patches/patch-texdocphp
-	patch -p0 -Ni debian/patches/patch-doc
 # Make sure that our build scripts are executable.
-	chmod +x debian/remove-bad-license-files
+# (only needed after upstream changes)
+#	chmod +x debian/remove-bad-license-files
 
 	touch $(stampdir)/build-stamp
 
 
 ### Clean up the source tree.
-clean: 
+clean: clean-patches
 	dh_testdir
 	dh_testroot
 	$(update_commonstuff)
@@ -139,12 +136,9 @@
 # Make sure that our build scripts are executable.
 	chmod +x debian/remove-bad-license-files
 
-	patch -p0 -RNi debian/patches/patch-deb || true
-	patch -p0 -RNi debian/patches/patch-texdocphp || true
-	patch -p0 -RNi debian/patches/patch-doc || true
-
 # Remove files that we can't distribute if they're still in the tree
-	debian/remove-bad-license-files
+# (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

Modified: tetex-base/trunk/debian/rules.in
===================================================================
--- tetex-base/trunk/debian/rules.in	2005-08-16 11:51:52 UTC (rev 129)
+++ tetex-base/trunk/debian/rules.in	2005-08-16 11:52:31 UTC (rev 130)
@@ -119,22 +119,19 @@
 $(stampdir)/eperl-stamp: $(EPERL_FILES) 
 	touch $@
 
-$(stampdir)/build-stamp:
+$(stampdir)/build-stamp: patch-stamp
 	$(check-cvs)
 	dh_testdir
 	-mkdir $(stampdir)
-# modification for Debian. No need for reverse-patching - clean should be called usually
-	patch -p0 -Ni debian/patches/patch-deb
-	patch -p0 -Ni debian/patches/patch-texdocphp
-	patch -p0 -Ni debian/patches/patch-doc
 # Make sure that our build scripts are executable.
-	chmod +x debian/remove-bad-license-files
+# (only needed after upstream changes)
+#	chmod +x debian/remove-bad-license-files
 
 	touch $(stampdir)/build-stamp
 
 
 ### Clean up the source tree.
-clean: 
+clean: clean-patches
 	dh_testdir
 	dh_testroot
 	$(update_commonstuff)
@@ -144,12 +141,9 @@
 # Make sure that our build scripts are executable.
 	chmod +x debian/remove-bad-license-files
 
-	patch -p0 -RNi debian/patches/patch-deb || true
-	patch -p0 -RNi debian/patches/patch-texdocphp || true
-	patch -p0 -RNi debian/patches/patch-doc || true
-
 # Remove files that we can't distribute if they're still in the tree
-	debian/remove-bad-license-files
+# (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