X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=c1c8b6453206e1ec135907f0970716f8077c1bcf;hb=38d77cdb611b6a8d0a719ce50e9fc57562c0d085;hp=916177c3cd0ed895c727abfe9dc585c6950dfe3e;hpb=3d241c37fc1139f8942299323d72fc2e493f036c;p=dgit.git

diff --git a/dgit b/dgit
index 916177c3..c1c8b645 100755
--- a/dgit
+++ b/dgit
@@ -1761,6 +1761,10 @@ sub check_not_dirty () {
     } else {
 	failedcmd @cmd;
     }
+
+    if (stat_exists "debian/source/local-options") {
+	fail "git tree contains debian/source/local-options";
+    }
 }
 
 sub commit_admin ($) {
@@ -2627,7 +2631,7 @@ sub quiltify ($$) {
 	my $abbrev = sub {
 	    my $x = $_[0]{Commit};
 	    $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
-	    return $;
+	    return $x;
 	};
 	my $reportnot = sub {
 	    my ($notp) = @_;
@@ -2743,7 +2747,7 @@ sub build_maybe_quilt_fixup () {
     # can work.  We do this as follows:
     #     1. Collect all relevant .orig from parent directory
     #     2. Generate a debian.tar.gz out of
-    #         debian/{patches,rules,source/format}
+    #         debian/{patches,rules,source/format,source/options}
     #     3. Generate a fake .dsc containing just these fields:
     #          Format Source Version Files
     #     4. Extract the fake .dsc
@@ -2804,8 +2808,9 @@ END
     }
 
     my @files=qw(debian/source/format debian/rules);
-    if (stat_exists '../../../debian/patches') {
-        push @files, 'debian/patches';
+    foreach my $maybe (qw(debian/patches debian/source/options)) {
+        next unless stat_exists "../../../$maybe";
+        push @files, $maybe;
     }
 
     my $debtar= srcfn $fakeversion,'.debian.tar.gz';