Add support of Dm-Upload-Allowed field

* scripts/Dpkg/Fields.pm, scripts/dpkg-source.pl: Add support of
Dm-Upload-Allowed field. It automatically ends up in the dsc.

diff --git a/ChangeLog b/ChangeLog
index f281082c3c0573f0a647e259be3941b70c7db20c..ba126bd4a85614c5d808601f598e0a28ee9dafc0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-12  Raphael hertzog  <hertzog@debian.org>
+
+       * scripts/Dpkg/Fields.pm, scripts/dpkg-source.pl: Add support of
+       Dm-Upload-Allowed field. It automatically ends up in the dsc.
+
 2008-01-12  Raphael hertzog  <hertzog@debian.org>
 
        * scripts/Dpkg/Fields.pm: Define variables containing

diff --git a/debian/changelog b/debian/changelog
index cd63690b02052192ba1b5665ef19cf335954a295..bbdd5519f13d4e1a6e5dbff6998ad6fe2325fd8a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ dpkg (1.14.16) UNRELEASED; urgency=low
   * Also force version in ${binary:Version} if dpkg-gencontrol -v<version>
     is used. That way we're consistent with the definition of that variable
     in deb-substvars(5). Closes: #433477
+  * Add support of Dm-Upload-Allowed field. Closes: #453400
 
   [ Updated manpages translations ]
   * Fix typo in French. Closes: #460021

diff --git a/scripts/Dpkg/Fields.pm b/scripts/Dpkg/Fields.pm
index 06500b490f352a9ebf2d38277fd8298f4b8b6cbd..809ca664c934853e1ff38ea88f011c313dbba425 100644 (file)
--- a/scripts/Dpkg/Fields.pm
+++ b/scripts/Dpkg/Fields.pm
@@ -16,7 +16,7 @@ our %EXPORT_TAGS = ('list' => [qw(%control_src_fields %control_pkg_fields
 # Some variables (list of fields)
 our %control_src_fields;
 our %control_pkg_fields;
-$control_src_fields{$_} = 1 foreach (qw(Bugs
+$control_src_fields{$_} = 1 foreach (qw(Bugs Dm-Upload-Allowed
     Homepage Origin Maintainer Priority Section Source Standards-Version
     Uploaders Vcs-Browser Vcs-Arch Vcs-Bzr Vcs-Cvs Vcs-Darcs Vcs-Git Vcs-Hg
     Vcs-Mtn Vcs-Svn));

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 46056e7b2dc42f2ab242999a9707ea64ab68b534..6a712d9b69d616688001088f022960e0e7232654 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -117,9 +117,9 @@ use Cwd;
 textdomain("dpkg-dev");
 
 my @dsc_fields = (qw(Format Source Binary Architecture Version Origin
-                     Maintainer Uploaders Homepage Standards-Version
-                     Vcs-Browser Vcs-Arch Vcs-Bzr Vcs-Cvs Vcs-Darcs
-                     Vcs-Git Vcs-Hg Vcs-Mtn Vcs-Svn),
+                    Maintainer Uploaders Dm-Upload-Allowed Homepage
+                    Standards-Version Vcs-Browser Vcs-Arch Vcs-Bzr
+                    Vcs-Cvs Vcs-Darcs Vcs-Git Vcs-Hg Vcs-Mtn Vcs-Svn),
                   @src_dep_fields);
 
 
@@ -309,6 +309,7 @@ if ($opmode eq 'build') {
        if (m/^Source$/i) {
            set_source_package($v);
        } elsif (m/^(Standards-Version|Origin|Maintainer|Homepage)$/i ||
+                m/^Dm-Upload-Allowed$/i ||
                 m/^Vcs-(Browser|Arch|Bzr|Cvs|Darcs|Git|Hg|Mtn|Svn)$/i) {
            $fields->{$_} = $v;
        } elsif (m/^Uploaders$/i) {