r7955 - /scripts/qa/packagecheck

[gregoa-guest at users.alioth.debian.org]

Author: gregoa-guest
Date: Wed Sep 26 15:00:25 2007
New Revision: 7955

URL: http://svn.debian.org/wsvn/?sc=1&rev=7955
Log:
DEBCHANGE_RELEASE_HEURISTIC works only in /etc/devscripts.conf and ~/.devscripts and not from ENV; use --release-heuristic instead

Modified:
    scripts/qa/packagecheck

Modified: scripts/qa/packagecheck
URL: http://svn.debian.org/wsvn/scripts/qa/packagecheck?rev=7955&op=diff
==============================================================================
--- scripts/qa/packagecheck (original)
+++ scripts/qa/packagecheck Wed Sep 26 15:00:25 2007
@@ -28,13 +28,12 @@
   OLDHP=
   PERLNAME=
   NEWHP=
-  DEBCHANGE_RELEASE_HEURISTIC=changelog
   
   # 1) check for and add missing XS-Vcs-Svn field
 	if ! grep XS-Vcs-Svn trunk/$p/debian/control > /dev/null; then
 		echo "$p: adding missing XS-Vcs-Svn field"
 		perl -pi -e "s;(Standards-Version:.+);\$1\nXS-Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/$p/;" trunk/$p/debian/control
-		dch --changelog trunk/$p/debian/changelog "Add missing XS-Vcs-Svn field to debian/control."
+		dch --release-heuristic=changelog --changelog trunk/$p/debian/changelog "Add missing XS-Vcs-Svn field to debian/control."
 		CHANGED=1
 	fi
 
@@ -42,7 +41,7 @@
 	if ! grep XS-Vcs-Browser trunk/$p/debian/control > /dev/null; then
 		echo "$p: adding missing XS-Vcs-Browser field"
 		perl -pi -e "s;(XS-Vcs-Svn:.+);\$1\nXS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/$p/;" trunk/$p/debian/control
-		dch --changelog trunk/$p/debian/changelog "Add missing XS-Vcs-Browser field to debian/control."
+		dch --release-heuristic=changelog --changelog trunk/$p/debian/changelog "Add missing XS-Vcs-Browser field to debian/control."
 		CHANGED=1
 	fi
 
@@ -52,7 +51,7 @@
 		echo "$p: removing Homepage: pseudo-field from Description"
 		perl -e "undef \$/; my \$buf=<STDIN>; \$buf =~ s/\n \.\n  Homepage: .*//; print \$buf" < trunk/$p/debian/control > trunk/$p/debian/control.new
 		mv trunk/$p/debian/control.new trunk/$p/debian/control
-		dch --changelog trunk/$p/debian/changelog "Remove Homepage: pseudo-field from Description in debian/control."
+		dch --release-heuristic=changelog --changelog trunk/$p/debian/changelog "Remove Homepage: pseudo-field from Description in debian/control."
 		CHANGED=1
 		NEWHP=$OLDHP
 	fi
@@ -81,7 +80,7 @@
 
 		if [ -n "$NEWHP" ]; then
 			perl -pi -e "s;(Standards-Version:.+);\$1\nHomepage: $NEWHP;" trunk/$p/debian/control
-			dch --changelog trunk/$p/debian/changelog "Add missing Homepage field to source stanza in debian/control."
+			dch --release-heuristic=changelog --changelog trunk/$p/debian/changelog "Add missing Homepage field to source stanza in debian/control."
 			CHANGED=1
 		fi
 	fi