r8064 - /scripts/qa/packagecheck

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

Author: gregoa-guest
Date: Wed Oct  3 21:02:14 2007
New Revision: 8064

URL: http://svn.debian.org/wsvn/?sc=1&rev=8064
Log:
call dch only once/add only one changelog entry

Modified:
    scripts/qa/packagecheck

Modified: scripts/qa/packagecheck
URL: http://svn.debian.org/wsvn/scripts/qa/packagecheck?rev=8064&op=diff
==============================================================================
--- scripts/qa/packagecheck (original)
+++ scripts/qa/packagecheck Wed Oct  3 21:02:14 2007
@@ -2,6 +2,7 @@
 
 # Copyright 2007 gregor herrmann <gregor+debian at comodo.priv.at>
 # Copyright 2007 Damyan Ivanov <dmn at debian.org>
+# Copyright 2007 David Paleino <d.paleino at gmail.com>
 # Released under the terms of the GNU GPL version 2
 #
 # 1) Checks for and adds missing XS-Vcs-(Svn|Browser) fields 
@@ -14,10 +15,10 @@
 CHANGED=0
 TRUNK=${1:-trunk}
 
-echo "Running svn up ..."
+echo "Running svn up $TRUNK ..."
 svn up $TRUNK
 
-echo "Checking if `pwd` is clean ..."
+echo "Checking if $TRUNK is clean ..."
 UNCLEAN=$(svn st $TRUNK |egrep -v '^\?')
 if [ -n "$UNCLEAN" ]; then
     echo "$UNCLEAN"
@@ -32,12 +33,15 @@
   OLDHP=
   PERLNAME=
   NEWHP=
+  MSG=
+  MSGADD=
+  MSGRM=
   
   # 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 --release-heuristic=changelog --changelog $TRUNK/$p/debian/changelog "Add missing XS-Vcs-Svn field to debian/control."
+		MSGADD="XS-Vcs-Svn field (source stanza)"
 		CHANGED=1
 	fi
 
@@ -45,7 +49,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 --release-heuristic=changelog --changelog $TRUNK/$p/debian/changelog "Add missing XS-Vcs-Browser field to debian/control."
+		MSGADD="${MSGADD:+$MSGADD; }XS-Vcs-Browser field (source stanza)"
 		CHANGED=1
 	fi
 
@@ -55,7 +59,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 --release-heuristic=changelog --changelog $TRUNK/$p/debian/changelog "Remove Homepage: pseudo-field from Description in debian/control."
+		MSGRM="Homepage pseudo-field (Description)"
 		CHANGED=1
 		NEWHP=$OLDHP
 	fi
@@ -84,10 +88,19 @@
 
 		if [ -n "$NEWHP" ]; then
 			perl -pi -e "s;(Standards-Version:.+);\$1\nHomepage: $NEWHP;" $TRUNK/$p/debian/control
-			dch --release-heuristic=changelog --changelog $TRUNK/$p/debian/changelog "Add missing Homepage field to source stanza in debian/control."
+			MSGADD="${MSGADD:+$MSGADD; }Homepage field (source stanza)"
 			CHANGED=1
 		fi
 	fi
+
+	# 5) changelog
+	if [ -n "$MSGADD" -o -n "$MSGRM" ] ; then
+		MSG="debian/control:"
+		[ -n "$MSGADD" ] && MSG="$MSG Added: $MSGADD."
+		[ -n "$MSGRM" ] && MSG="$MSG Removed: $MSGRM."
+		dch --release-heuristic=changelog --changelog $TRUNK/$p/debian/changelog "$MSG"
+	fi
+
 done
 
 # work is done. svn diff? svn commit?