fix quilt fixup

diff --git a/dgit b/dgit
index 7f68b098cb23a1f85d79cc2a8a46b450439305cb..487c1be7aa1ffb663636fe3678820c95d5434392 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -559,7 +559,7 @@ sub commit_quilty_patch () {
     my $output = cmdoutput @git, qw(status --porcelain);
     my $vsn = $dsc->{Version};
     my %fixups = map {$_=>1}
-        (".pc/debian-changes-$vsn/","debian/patches/debian-changes-2.8-5");
+        (".pc/debian-changes-$vsn/","debian/patches/debian-changes-$vsn");
     my @files;
     foreach my $l (split /\n/, $output) {
        next unless $l =~ s/^\?\? //;
@@ -584,6 +584,7 @@ sub dopush () {
     $dsc = parsecontrol("../$dscfn");
     print DEBUG "format $dsc->{Format}\n";
     if ($dsc->{Format} eq '3.0 (quilt)') {
+       print "Format \`$dsc->{Format}', urgh\n";
        commit_quilty_patch();
     }
     check_not_dirty();

diff --git a/dgit.1 b/dgit.1
index 37601e765b54446594a18ffe6c758f4fd8bf724d..8d4d201a4b700acbe2af87fb2c3e154947254d80 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -52,7 +52,10 @@ Tagging and signing should be left to dgit push.
 does an `upload', pushing the current HEAD to the archive (as a source
 package) and to dgit-repos (as git commits).  This also involves
 making a signed git tag, and signing the files to be uploaded to the
-archive.
+archive.  (For a format `3.0 (quilt)' source package, dgit push
+may also have to make a commit on your current branch to contain
+quilt metadata.  It will do this automatically.)
+.BR "debian/rules clean" .
 .SH WORKFLOW - SIMPLE
 It is always possible with dgit to clone or fetch a package, make
 changes in git (using git-commit) on the suite branch