r37645 - /scripts/qa/packagecheck

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Sat Jun 6 00:32:11 UTC 2009


Author: gregoa
Date: Sat Jun  6 00:32:07 2009
New Revision: 37645

URL: http://svn.debian.org/wsvn/?sc=1&rev=37645
Log:
use the same regex for watch files when changing and creating them, and the same as in dh-make-perl

Modified:
    scripts/qa/packagecheck

Modified: scripts/qa/packagecheck
URL: http://svn.debian.org/wsvn/scripts/qa/packagecheck?rev=37645&op=diff
==============================================================================
--- scripts/qa/packagecheck (original)
+++ scripts/qa/packagecheck Sat Jun  6 00:32:07 2009
@@ -209,7 +209,7 @@
 	# watchfile
 	if [ -e $DIR/debian/watch ] && ! grep search\.cpan\.org/dist/ $DIR/debian/watch >/dev/null; then
 		echo "$PKG: trying to change URL in debian/watch"
-		if perl -i -e "my \$changed=1; while(<>){ \$changed=0 if s{(?:^|\s+)(?:ht|f)tp://.*cpan.+/\s*(\S+)-(?:\S+)(\s.+)?$}{http://search.cpan.org/dist/\$1/   .*/\$1-v?(\\\\d[\\\\d.]+)\\\\.(?:tar(?:\\\\.gz|\\\\.bz2)?|tgz|zip)\$2}i; print;} exit \$changed" $DIR/debian/watch ; then
+		if perl -i -e "my \$changed=1; while(<>){ \$changed=0 if s{(?:^|\s+)(?:ht|f)tp://.*cpan.+/\s*(\S+)-(?:\S+)(\s.+)?$}{http://search.cpan.org/dist/\$1/   .*/\$1-v?(\\\\d[\\\\d.-]+)\\\\.(?:tar(?:\\\\.gz|\\\\.bz2)?|tgz|zip)\$2}i; print;} exit \$changed" $DIR/debian/watch ; then
 			perl -pi -e "s;^version=2;version=3;" $DIR/debian/watch
 			MSG_WATCH="debian/watch: use dist-based URL."
 			CHANGED=1
@@ -217,7 +217,7 @@
 	elif [ ! -e $DIR/debian/watch ] && [ -n "$CREATE_WATCH" ]; then
 		echo "$PKG: creating debian/watch"
 		if dist_name=`detect_dist $DIR`; then
-			version_re='v?(\d[\d_.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)'
+			version_re='v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)'
 			echo "version=3" > $DIR/debian/watch
 			echo "http://search.cpan.org/dist/$dist_name/  .+/$dist_name-$version_re\$" >> $DIR/debian/watch
 			svn add $DIR/debian/watch




More information about the Pkg-perl-cvs-commits mailing list