lintian: r12 - in trunk: debian testset

[jeroen@wolffelaar.nl]

Author: jeroen
Date: 2004-02-08 21:27:22 +0100 (Sun, 08 Feb 2004)
New Revision: 12

Modified:
   trunk/debian/
   trunk/debian/rules
   trunk/testset/runtests
Log:
Make lintian buildsystem cope correctly with .svn directories to ensure clean
packages



Property changes on: trunk/debian
___________________________________________________________________
Name: svn:ignore
   - tmp
files

   + tmp
files
tests


Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2004-02-08 20:14:09 UTC (rev 11)
+++ trunk/debian/rules	2004-02-08 20:27:22 UTC (rev 12)
@@ -42,12 +42,14 @@
 	install -d $(usl) $(usl)/checks $(usl)/collection $(usl)/info
 	install -d $(usl)/lib $(usl)/unpack $(usl)/overrides
 	for d in checks collection lib unpack; do \
-	  find $$d -type f ! -path '*/CVS/*' | xargs -iFILE cp -p FILE $(usl)/$$d/; \
+	  find $$d -type f ! -path '*/CVS/*' ! -path '*/.svn/*' \
+	  	| xargs -iFILE cp -p FILE $(usl)/$$d/; \
 	done
 # documentation
 	@echo .... install documentation ....
 	install -d $(usdl)
-	find doc -maxdepth 1 -type f ! -path '*/CVS/*' ! -name lintianrc.example | xargs -iFILE cp -p FILE $(usdl)/
+	find doc -maxdepth 1 -type f ! -path '*/CVS/*' ! -path '*/.svn/*' \
+		! -name lintianrc.example | xargs -iFILE cp -p FILE $(usdl)/
 	cp -a doc/lintian.html $(usdl)/
 	gzip -9 $(usdl)/lintian.sgml
 	gzip -9 $(usdl)/lintian.txt

Modified: trunk/testset/runtests
===================================================================
--- trunk/testset/runtests	2004-02-08 20:14:09 UTC (rev 11)
+++ trunk/testset/runtests	2004-02-08 20:27:22 UTC (rev 12)
@@ -139,7 +139,7 @@
 closedir(TESTDIR);
 
 for (@tests) {
-    next if $_ eq '.' or $_ eq '..' or $_ eq 'CVS';
+    next if $_ eq '.' or $_ eq '..' or $_ eq 'CVS' or $_ eq '.svn';
     next unless -d "$testset/$_";
 
     my $pkgdir = $_;
@@ -165,7 +165,7 @@
       symlink "../../$testset/$_", "$rundir/$_";
     }
     closedir D;
-    runsystem("find $rundir -name CVS -print0 | xargs -0r rm -R");
+    runsystem("find $rundir -name CVS -o -name .svn -print0 | xargs -0r rm -R");
 
     print "Running dpkg-buildpackage $dpkg_buildpackage_options in $rundir/$pkgdir...\n" if $verbose;
     runsystem("cd $rundir/$pkgdir && dpkg-buildpackage $dpkg_buildpackage_options >../build.$pkg 2>&1");