From bf80f80d5ee38317cff7624dd9b53633e82fccda Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 24 Aug 2013 18:15:46 +0100
Subject: [PATCH] Change our .dsc field name to `Dgit'.  Relevant to #720201.

---
 debian/changelog | 1 +
 dgit             | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ac436431..910c34dc 100644
--- 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 645528f6..3e7bffca 100755
--- 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";
-- 
2.30.2