r8167 - /scripts/qa/packagecheck

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

Author: gregoa-guest
Date: Tue Oct  9 20:02:56 2007
New Revision: 8167

URL: http://svn.debian.org/wsvn/?sc=1&rev=8167
Log:
remove old  XS-Vcs-(Svn|Browser) fields

Modified:
    scripts/qa/packagecheck

Modified: scripts/qa/packagecheck
URL: http://svn.debian.org/wsvn/scripts/qa/packagecheck?rev=8167&op=diff
==============================================================================
--- scripts/qa/packagecheck (original)
+++ scripts/qa/packagecheck Tue Oct  9 20:02:56 2007
@@ -7,6 +7,8 @@
 #
 # 1) Checks for and adds missing Vcs-(Svn|Browser) fields 
 # 2) Checks for Homepage: field
+# 3) Removes pseudo-field Homepage (description)
+# 4) Removes XS-Vcs-(Svn|Browser) fields
 # in all debian/control files in trunk/
 #
 # To be run a directory above trunk/
@@ -38,7 +40,7 @@
   MSGRM=
   
   # 1) check for and add missing Vcs-Svn field
-	if ! grep Vcs-Svn $TRUNK/$p/debian/control > /dev/null; then
+	if ! grep ^Vcs-Svn $TRUNK/$p/debian/control > /dev/null; then
 		echo "$p: adding missing Vcs-Svn field"
 		perl -pi -e "s;(Standards-Version:.+);\$1\nVcs-Svn: svn://svn.debian.org/pkg-perl/trunk/$p/;" $TRUNK/$p/debian/control
 		MSGADD="Vcs-Svn field (source stanza)"
@@ -46,9 +48,9 @@
 	fi
 
   # 2) check for and add missing Vcs-Browser field
-	if ! grep Vcs-Browser $TRUNK/$p/debian/control > /dev/null; then
+	if ! grep ^Vcs-Browser $TRUNK/$p/debian/control > /dev/null; then
 		echo "$p: adding missing Vcs-Browser field"
-		perl -pi -e "s;(Vcs-Svn:.+);\$1\nVcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/$p/;" $TRUNK/$p/debian/control
+		perl -pi -e "s;(^Vcs-Svn:.+);\$1\nVcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/$p/;" $TRUNK/$p/debian/control
 		MSGADD="${MSGADD:+$MSGADD; }Vcs-Browser field (source stanza)"
 		CHANGED=1
 	fi
@@ -64,7 +66,15 @@
 		NEWHP=$OLDHP
 	fi
   
-  # 4) check for and add missing new Homepage to source stanza
+  # 4) remove old XS-Vcs-(Svn|Browser) fields
+	if grep ^XS-Vcs- $TRUNK/$p/debian/control > /dev/null; then
+		echo "$p: removing old XS-Vcs-* fields"
+		sed -i -e '/^XS-Vcs-/ d' $TRUNK/$p/debian/control
+		MSGRM="${MSGRM:+$MSGRM; }XS-Vcs-Svn fields"
+		CHANGED=1
+	fi
+
+  # 5) check for and add missing new Homepage to source stanza
 	if ! egrep "^Homepage: " $TRUNK/$p/debian/control > /dev/null; then
 		echo "$p: trying to add missing Homepage field to source stanza"
 		
@@ -97,7 +107,7 @@
 		fi
 	fi
 
-	# 5) changelog
+	# 6) changelog
 	if [ -n "$MSGADD" -o -n "$MSGRM" ] ; then
 		MSG="debian/control:"
 		[ -n "$MSGADD" ] && MSG="$MSG Added: $MSGADD."