deprecate 3.0 (quilt)

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 7f68b098cb23a1f85d79cc2a8a46b450439305cb..9573adf2f304b7fa7eac5290b618f013d46b0987 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -555,11 +555,11 @@ sub check_not_dirty () {
     runcmd @git, qw(diff --quiet);
 }
 
-sub commit_quilty_patch () {
+sub commit_quilty_patch ($) {
+    my ($vsn) = @_;
     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,7 +584,8 @@ sub dopush () {
     $dsc = parsecontrol("../$dscfn");
     print DEBUG "format $dsc->{Format}\n";
     if ($dsc->{Format} eq '3.0 (quilt)') {
-       commit_quilty_patch();
+       print "Format \`$dsc->{Format}', urgh\n";
+       commit_quilty_patch($dsc->{Version});
     }
     check_not_dirty();
     prep_ud();
@@ -734,6 +735,11 @@ sub cmd_build {
        @ARGV;
 }
 
+sub cmd_quilt_fixup {
+    my $clogp = parsechangelog();
+    commit_quilty_patch($clogp->{Version});
+}
+
 sub parseopts () {
     my $om;
     while (@ARGV) {
@@ -783,5 +789,5 @@ parseopts();
 print STDERR "DRY RUN ONLY\n" if $dryrun;
 die unless @ARGV;
 my $cmd = shift @ARGV;
-
+$cmd =~ y/-/_/;
 { no strict qw(refs); &{"cmd_$cmd"}(); }