Support Vcs-* fields in control file source package stanza

The supported fields are Vcs-Browser, Vcs-Arch, Vcs-Bzr, Vcs-Cvs,
Vcs-Darcs, Vcs-Git, Vcs-Hg, Vcs-Mtn and Vcs-Svn.

diff --git a/ChangeLog b/ChangeLog
index 5e3bf9fc17d6b5e6a00f9e23eab8f9f110ddab89..fee3394b8bca94ac69ee11931ec456d7bc1133b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-08-31  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-genchanges.pl: Ignore Vcs-Browser, Vcs-Arch, Vcs-Bzr,
+       Vcs-Cvs, Vcs-Darcs, Vcs-Git, Vcs-Hg, Vcs-Mtn and Vcs-Svn fields
+       from control file source stanza.
+       * scripts/dpkg-gencontrol.pl: Likewise.
+       * scripts/dpkg-source.pl: Parse them instead.
+       (@dsc_fields): Add them here.
+
 2007-08-31  Guillem Jover  <guillem@debian.org>
 
        * scripts/dpkg-genchanges.pl: Do not leave unknown fields unwarned

diff --git a/debian/changelog b/debian/changelog
index 956dcb767f9c61f77d42a171a1e2de058aa5eb91..a644acd3879c434729f0bb7f672fc71dd928914c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,9 @@ dpkg (1.14.6) UNRELEASED; urgency=low
     stanzas in dpkg-genchanges.
   * Explicitely ignore all known fields from the control file source package
     stanza in dpkg-genchanges, instead of leaving unknown fields unwarned.
+  * Implement support for Vcs-Browser, Vcs-Arch, Vcs-Bzr, Vcs-Cvs, Vcs-Darcs,
+    Vcs-Git, Vcs-Hg, Vcs-Mtn and Vcs-Svn fields in control file source
+    package stanza.
 
   [ Updated scripts translations ]
   * French (Frédéric Bothamy, Christian Perrier).

diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 616ee8d1210ed9a6fb070b6fe260b73da810fa4a..907af80ab76d04aa7763b7cdd0bd43c0b6e9b2ad 100755 (executable)
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -210,7 +210,8 @@ for $_ (keys %fi) {
        elsif (s/^X[BS]*C[BS]*-//i) { $f{$_}= $v; }
        elsif (m/^X[BS]+-/i ||
               m/^Build-(Depends|Conflicts)(-Indep)?$/i ||
-              m/^(Standards-Version|Uploaders|Homepage|Origin|Bugs)$/i) {
+              m/^(Standards-Version|Uploaders|Homepage|Origin|Bugs)$/i ||
+              m/^Vcs-(Browser|Arch|Bzr|Cvs|Darcs|Git|Hg|Mtn|Svn)$/i) {
        }
        else { &unknown(_g('general section of control info file')); }
     } elsif (s/^C(\d+) //) {

diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 868d640196f7954cf959accf58f4e598808cd9c4..8ff8aee27910da429aaeac5c4438a2cf012d3339 100755 (executable)
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -152,7 +152,11 @@ for $_ (keys %fi) {
            setsourcepackage($v);
        }
         elsif (s/^X[CS]*B[CS]*-//i) { $f{$_}= $v; }
-       elsif (m/^X[CS]+-|^(Standards-Version|Uploaders)$|^Build-(Depends|Conflicts)(-Indep)?$/i) { }
+       elsif (m/^X[CS]+-/i ||
+              m/^Build-(Depends|Conflicts)(-Indep)?$/i ||
+              m/^(Standards-Version|Uploaders)$/i ||
+              m/^Vcs-(Browser|Arch|Bzr|Cvs|Darcs|Git|Hg|Mtn|Svn)$/i) {
+       }
        elsif (m/^Section$|^Priority$/) { $spdefault{$_}= $v; }
         else { $_ = "C $_"; &unknown(_g('general section of control info file')); }
     } elsif (s/^C$myindex //) {

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index e2229fa78fe01fabb113a449bc1683fc8de19980..c0544d6db96589346b953d9286d4a996deea449c 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -76,7 +76,9 @@ our @src_dep_fields;
 textdomain("dpkg-dev");
 
 my @dsc_fields = (qw(Format Source Binary Architecture Version Origin
-                     Maintainer Uploaders Homepage Standards-Version),
+                     Maintainer Uploaders Homepage Standards-Version
+                     Vcs-Browser Vcs-Arch Vcs-Bzr Vcs-Cvs Vcs-Darcs
+                     Vcs-Git Vcs-Hg Vcs-Mtn Vcs-Svn),
                   @src_dep_fields);
 
 
@@ -239,7 +241,8 @@ if ($opmode eq 'build') {
         if (s/^C //) {
            if (m/^Source$/i) {
                setsourcepackage($v);
-           } elsif (m/^(Standards-Version|Origin|Maintainer|Homepage)$/i) {
+           } elsif (m/^(Standards-Version|Origin|Maintainer|Homepage)$/i ||
+                    m/^Vcs-(Browser|Arch|Bzr|Cvs|Darcs|Git|Hg|Mtn|Svn)$/i) {
                $f{$_}= $v;
            }
            elsif (m/^Uploaders$/i) { ($f{$_}= $v) =~ s/[\r\n]//g; }