Change our .dsc field name to `Dgit'. Relevant to #720201.

diff --git a/debian/changelog b/debian/changelog
index ac436431532fcf1e8288aef02461734c2f9230f4..910c34dc84937902c16049c135e353c34e1d4ea6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ dgit (0.9) unstable; urgency=low
   * More comprehensive workaround for `3.0 (quilt)'.
   * In push, double-check the .changes against the changelog.
   * Better error when source package contains .git.  Closes: #720555.
+  * Change our .dsc field name to `Dgit'.  Relevant to #720201.
 
  --
 

diff --git a/dgit b/dgit
index 645528f63c6f7f22dfc59a103fbb0e0452b9dd4d..3e7bffca2e0caf0ca0e73f2c5b4f5a5cba5c97c5 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -68,7 +68,7 @@ our $debug = 0;
 open DEBUG, ">/dev/null" or die $!;
 
 our $remotename = 'dgit';
-our $ourdscfield = 'Vcs-Dgit-Master';
+our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
 our $branchprefix = 'dgit';
 our $csuite;
 
@@ -644,7 +644,10 @@ sub fetch_from_archive () {
     # ensures that lrref() is what is actually in the archive,
     #  one way or another
     get_archive_dsc() or return 0;
-    $dsc_hash = $dsc->{$ourdscfield};
+    foreach my $field (@ourdscfield) {
+       $dsc_hash = $dsc->{$ourdscfield};
+       last if defined $dsc_hash;
+    }
     if (defined $dsc_hash) {
        $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
        $dsc_hash = $&;
@@ -832,7 +835,7 @@ sub dopush () {
 #    runcmd @git, qw(fetch -p ), "$alioth_git/$package.git",
 #        map { lref($_).":".rref($_) }
 #        (uploadbranch());
-    $dsc->{$ourdscfield} = rev_parse('HEAD');
+    $dsc->{$ourdscfield[0]} = rev_parse('HEAD');
     $dsc->save("../$dscfn.tmp") or die $!;
     if (!$changesfile) {
        my $multi = "../${package}_${cversion}_multi.changes";