From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 24 Aug 2013 15:15:23 +0000 (+0100)
Subject: new cleaning arrangements
X-Git-Tag: debian/0.9~12
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=98cc9f5ee0e1a448c10dbee264fa8ada8d023e54;p=dgit.git

new cleaning arrangements
---

diff --git a/dgit b/dgit
index 37b235b3..b6e79e36 100755
--- a/dgit
+++ b/dgit
@@ -37,7 +37,7 @@ our $dryrun = 0;
 our $changesfile;
 our $new_package = 0;
 our $existing_package = 'dpkg';
-our $clean = 'dpkg-source';
+our $cleanmode = 'dpkg-source';
 
 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
 
@@ -1008,7 +1008,7 @@ sub build_source {
 	chdir $pwd or die $!;
 	runcmd_ordryrun qw(sh -ec),
 	    'exec >$1; shift; exec "$@"','x',
-	    $sourcechanges,
+	    "../$sourcechanges",
 	    @dpkggenchanges, qw(-S), changesopts();
     }
 }
@@ -1101,6 +1101,12 @@ sub parseopts () {
 		    $changesfile = $1;
 		} elsif (s/^-k(.*)//s) {
 		    $keyid=$1;
+		} elsif (s/^-wn//s) {
+		    $cleanmode = 'none';
+		} elsif (s/^-wg//s) {
+		    $cleanmode = 'git';
+		} elsif (s/^-wd//s) {
+		    $cleanmode = 'dpkg-source';
 		} else {
 		    badusage "unknown short option \`$_'";
 		}