The following commit has been merged in the master branch:
commit d16f21c90f5d6c358441be0ac0e11d8202dc94ed
Author: Christoph Berg <[email protected]>
Date: Fri Dec 31 19:39:33 2010 +0100
Add DEBCHECKOUT_SOURCE config variable
diff --git a/conf.default.in b/conf.default.in
index 1bc74ce..de8644c 100644
--- a/conf.default.in
+++ b/conf.default.in
@@ -210,9 +210,14 @@
#
# List of space-separated pairs REGEXP/REPLACEMENT_TEXT to define
# custom rules to enable authenticated mode.
-# See debcheckout(1) for a more precise description of syntax and
-# semantics of this setting.
# DEBCHECKOUT_AUTH_URLS=''
+#
+# For debian-dir-only repositories, also retrieve the source
+# package, unpack it, and move the missing files over.
+# DEBCHECKOUT_SOURCE=auto
+#
+# See debcheckout(1) for a more precise description of syntax and
+# semantics of these settings.
##### debclean
#
@@ -610,3 +615,4 @@
##### wnpp-check
#
# No variables currently
+
diff --git a/debian/changelog b/debian/changelog
index 44123cc..dccbca4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
devscripts (2.10.70) UNRELEASED; urgency=low
+ [ James Vega ]
* debuild:
+ Properly quote shell variable when parsing options. (Closes: #556248)
+ Don't treat “-nc” as implying binary only build. (Closes: #607303)
@@ -11,6 +12,11 @@ devscripts (2.10.70) UNRELEASED; urgency=low
Thanks to Ben Finney for the patch. (Closes: #606060)
* debcheckout: Use the correct prototype for set_destdir. (Closes: #606053)
+ [ Christoph Berg ]
+ * debcheckout: For debian-dir-only repositories, also retrieve the source
+ package, unpack it, and move the missing files over. Add a new option
+ --source (DEBCHECKOUT_SOURCE) to control this behavior. (Closes: #535767)
+
-- James Vega <[email protected]> Thu, 02 Dec 2010 20:27:34 -0500
devscripts (2.10.69) unstable; urgency=low
diff --git a/debian/postinst b/debian/postinst
index 0227377..d5a682f 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -689,6 +689,19 @@ EOF
EOF
fi
+
+ if dpkg --compare-versions "$2" lt 2.10.70
+ then
+ cat >> /etc/devscripts.conf << EOF
+#### debcheckout option added in 2.10.70
+#
+# For debian-dir-only repositories, also retrieve the source
+# package, unpack it, and move the missing files over.
+# (never auto download-only always)
+# DEBCHECKOUT_SOURCE=auto
+
+EOF
+ fi
fi
fi
diff --git a/scripts/debcheckout.pl b/scripts/debcheckout.pl
index c454718..8b10a10 100755
--- a/scripts/debcheckout.pl
+++ b/scripts/debcheckout.pl
@@ -2,6 +2,7 @@
#
# debcheckout: checkout the development repository of a Debian package
# Copyright (C) 2007-2009 Stefano Zacchiroli <[email protected]>
+# Copyright (C) 2010 Christoph Berg <[email protected]>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -239,6 +240,7 @@ my @files = (); # files to checkout
my @config_files = ('/etc/devscripts.conf', '~/.devscripts');
my %config_vars = (
'DEBCHECKOUT_AUTH_URLS' => '',
+ 'DEBCHECKOUT_SOURCE' => 'auto',
);
my %config_default = %config_vars;
my $shell_cmd;
@@ -942,7 +944,7 @@ sub main() {
my $user = ""; # login name (authenticated mode only)
my $browse_url = ""; # online browsable repository URL
my $git_track = ""; # list of remote GIT branches to --track
- my $unpack_source = 'auto'; # retrieve and unpack orig.tar.gz
+ my $unpack_source = $config_vars{DEBCHECKOUT_SOURCE}; # retrieve and
unpack orig.tar.gz
GetOptions(
"auth|a" => \$auth,
"help|h" => sub { pod2usage({-exitval => 0, -verbose => 1}); },
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
