[subversion-commit] SVN tetex commit + diffs: r141 - tetex-bin/trunk/debian

[Frank Küster]

Author: frank
Date: 2005-08-17 11:36:33 +0000 (Wed, 17 Aug 2005)
New Revision: 141

Modified:
   tetex-bin/trunk/debian/changelog
   tetex-bin/trunk/debian/rules
   tetex-bin/trunk/debian/rules.in
Log:
- check for .svn directories instead of CVS
- don't fail if stampdir doesn't exist
- final version number for 3.0-6

Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog	2005-08-17 10:32:11 UTC (rev 140)
+++ tetex-bin/trunk/debian/changelog	2005-08-17 11:36:33 UTC (rev 141)
@@ -1,4 +1,4 @@
-tetex-bin (3.0-5.1) UNRELEASED; urgency=low
+tetex-bin (3.0-6) experimental; urgency=low
 
   * Now Build-Depends on tex-common for dfs-patch.mk.  Common.variables
     and common.functions.in are used only from a tex-common source tree,

Modified: tetex-bin/trunk/debian/rules
===================================================================
--- tetex-bin/trunk/debian/rules	2005-08-17 10:32:11 UTC (rev 140)
+++ tetex-bin/trunk/debian/rules	2005-08-17 11:36:33 UTC (rev 141)
@@ -133,7 +133,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	rmdir $(stampdir)
+	-rmdir $(stampdir)
 
 	# Add here commands to clean up after the build process.
 	# Make sure all of our expected symlinks are in place
@@ -157,7 +157,7 @@
 configure-stamp: $(stampdir) patch-stamp
 # comment out the following line if you want to check the configure target
 # in a CVS working copy
-#	$(check-cvs)
+#	$(check-svn)
 	dh_testdir
 	# Make sure all of our expected symlinks are in place
 	sh debian/restore-symlinks
@@ -193,7 +193,7 @@
 build-stamp: configure-stamp 
 # comment out the following line if you want to check the build target
 # in a CVS working copy
-	$(check-cvs)
+	$(check-svn)
 	dh_testdir
 
 	# Obsolete and now fixed pl.l by patch-tmp (for broken flex)
@@ -236,7 +236,7 @@
 
 # Build architecture-dependent files here.
 binary-arch: build install
-	$(check-cvs)
+	$(check-svn)
 	dh_testdir
 	dh_testroot
 	dh_installdebconf	
@@ -265,9 +265,9 @@
 	test -f debian/rules
 endef
 
-define check-cvs
-	if test -d debian/CVS; then \
-		echo "please clean CVS directories"; \
+define check-svn
+	if test -d debian/.svn; then \
+		echo "please clean subversion directories"; \
 		exit 1; \
 	fi
 endef

Modified: tetex-bin/trunk/debian/rules.in
===================================================================
--- tetex-bin/trunk/debian/rules.in	2005-08-17 10:32:11 UTC (rev 140)
+++ tetex-bin/trunk/debian/rules.in	2005-08-17 11:36:33 UTC (rev 141)
@@ -138,7 +138,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	rmdir $(stampdir)
+	-rmdir $(stampdir)
 
 	# Add here commands to clean up after the build process.
 	# Make sure all of our expected symlinks are in place
@@ -162,7 +162,7 @@
 configure-stamp: $(stampdir) patch-stamp
 # comment out the following line if you want to check the configure target
 # in a CVS working copy
-#	$(check-cvs)
+#	$(check-svn)
 	dh_testdir
 	# Make sure all of our expected symlinks are in place
 	sh debian/restore-symlinks
@@ -198,7 +198,7 @@
 build-stamp: configure-stamp 
 # comment out the following line if you want to check the build target
 # in a CVS working copy
-	$(check-cvs)
+	$(check-svn)
 	dh_testdir
 
 	# Obsolete and now fixed pl.l by patch-tmp (for broken flex)
@@ -241,7 +241,7 @@
 
 # Build architecture-dependent files here.
 binary-arch: build install
-	$(check-cvs)
+	$(check-svn)
 	dh_testdir
 	dh_testroot
 	dh_installdebconf	
@@ -270,9 +270,9 @@
 	test -f debian/rules
 endef
 
-define check-cvs
-	if test -d debian/CVS; then \
-		echo "please clean CVS directories"; \
+define check-svn
+	if test -d debian/.svn; then \
+		echo "please clean subversion directories"; \
 		exit 1; \
 	fi
 endef