format 3.0 too

diff --git a/dgit b/dgit
index edc3c2276294c9e86b36a50c11924dcc840aff6e..db65aaac454a447c17365712eaa44089fccd652a 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -39,6 +39,8 @@ our $aliothpath = '/git/dgit-repos';
 our $alioth_git = "git+ssh://$aliothname/$aliothpath";
 our $alioth_sshtestbodge = [$aliothname,$aliothpath];
 
 our $alioth_git = "git+ssh://$aliothname/$aliothpath";
 our $alioth_sshtestbodge = [$aliothname,$aliothpath];
 

+our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
+

 our (@git) = qw(git);
 our (@dget) = qw(dget);
 our (@dput) = qw(dput);
 our (@git) = qw(git);
 our (@dget) = qw(dget);
 our (@dput) = qw(dput);


@@ -177,7 +179,7 @@ sub get_archive_dsc () {
     $dsc->parse($dscfh, 'dsc') or die "parsing of $dscurl failed\n";
     print DEBUG Dumper($dsc);
     my $fmt = $dsc->{Format};
     $dsc->parse($dscfh, 'dsc') or die "parsing of $dscurl failed\n";
     print DEBUG Dumper($dsc);
     my $fmt = $dsc->{Format};

-    die "unsupported format $fmt, sorry\n" unless $fmt eq '1.0';
+    die "unsupported format $fmt, sorry\n" unless $format_ok{$fmt};

 }
 
 sub check_for_git () {
 }
 
 sub check_for_git () {


@@ -233,7 +235,7 @@ sub dsc_files () {
 
 sub is_orig_file ($) {
     local ($_) = @_;
 
 sub is_orig_file ($) {
     local ($_) = @_;

-    m/\.orig\.tar\.\w+$/;
+    m/\.orig(?:-\w+)?\.tar\.\w+$/;

 }
 
 sub generate_commit_from_dsc () {
 }
 
 sub generate_commit_from_dsc () {

diff --git a/dgit.1 b/dgit.1
index 6394a16f888c042ef934472178bd84bc0df62541..d2e2e3991ed2a458feef7c1be3b88957171c6351 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -118,8 +118,6 @@ Specifies the .changes file which is to be uploaded.  By default
 dgit push looks for single .changes file in the parent directory whose
 filename suggests they it is for the right package and version.
 .SH BUGS
 dgit push looks for single .changes file in the parent directory whose
 filename suggests they it is for the right package and version.
 .SH BUGS

-dgit currently only works with Format 1.0 packages.
-

 dgit is not nearly configurable enough.  The locations for dgit-repos
 (on alioth) and for the Debian archive are currently hardcoded.
 There is not yet any support for suites which are in different
 dgit is not nearly configurable enough.  The locations for dgit-repos
 (on alioth) and for the Debian archive are currently hardcoded.
 There is not yet any support for suites which are in different