[SCM] Git repository for devscripts branch, master, updated. v2.11.7-66-ga1d2539

[James McCoy]

The following commit has been merged in the master branch:
commit a1d25391431a7a8a53312f1e5b6e0c9c3ce628e2
Author: James McCoy <jamessan at debian.org>
Date:   Sat Jun 16 12:20:10 2012 -0400

    mk-build-deps: Do not install Recommends by default.
    
    Closes: #575245
    Signed-off-by: James McCoy <jamessan at debian.org>

diff --git a/conf.default.in b/conf.default.in
index 0dbb75c..f96793a 100644
--- a/conf.default.in
+++ b/conf.default.in
@@ -480,7 +480,7 @@
 #### mk-build-deps
 #
 # Which tool to use for installing build depends?
-# MKBUILDDEPS_TOOL=/usr/bin/apt-get
+# MKBUILDDEPS_TOOL="/usr/bin/apt-get --no-install-recommends"
 #
 # Remove package files after install?
 # MKBUILDDEPS_REMOVE_AFTER_INSTALL=yes
diff --git a/debian/NEWS b/debian/NEWS
index a2bf585..c22bcc5 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,10 @@
+devscripts (2.11.9) UNRELEASED; urgency=low
+
+  The default for mk-build-deps --tool option/MKBUILDDEPS_TOOL configuration
+  changed from "apt-get" to "apt-get --no-install-recommends".
+
+ -- James McCoy <jamessan at debian.org>  Sat, 16 Jun 2012 11:57:21 -0400
+
 devscripts (2.11.7) unstable; urgency=low
 
   The heuristic used to determine what action to perform when no options are
diff --git a/debian/changelog b/debian/changelog
index 34f105a..31b7937 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,10 @@ devscripts (2.11.9) UNRELEASED; urgency=low
   [ James McCoy ]
   * debchange: Add more documentation about the effects of changelog
     heuristic.  (Closes: #673974)
-  * mk-build-deps: Provide a more descriptive README.Debian for generated
-    packages.  Thanks to chrysn for the patch.  (Closes: #675337)
+  * mk-build-deps:
+    + Provide a more descriptive README.Debian for generated packages.  Thanks
+      to chrysn for the patch.  (Closes: #675337)
+    + Do not install Recommends by default.  (Closes: #575245)
 
  -- David Prévot <taffit at debian.org>  Thu, 31 May 2012 12:12:02 -0400
 
diff --git a/scripts/mk-build-deps.pl b/scripts/mk-build-deps.pl
index 8140cc4..c236200 100755
--- a/scripts/mk-build-deps.pl
+++ b/scripts/mk-build-deps.pl
@@ -52,7 +52,7 @@ Install the generated packages and its build-dependencies.
 =item B<-t>, B<--tool>
 
 When installing the generated package use the specified tool.
-(default: apt-get)
+(default: apt-get --no-install-recommends)
 
 =item B<-r>, B<--remove>
 
@@ -125,7 +125,7 @@ my @deb_files;
 
 my @config_files = ('/etc/devscripts.conf', '~/.devscripts');
 my %config_vars = (
-		    'MKBUILDDEPS_TOOL' => '/usr/bin/apt-get',
+		    'MKBUILDDEPS_TOOL' => '/usr/bin/apt-get --no-install-recommends',
 		    'MKBUILDDEPS_REMOVE_AFTER_INSTALL' => 'no',
 		    'MKBUILDDEPS_ROOTCMD' => '',
 		    );
@@ -320,18 +320,14 @@ if ($opt_install) {
 	push @deb_files, $file;
     }
 
-    if($root_cmd) {
-        system shellwords($root_cmd), 'dpkg', '--unpack', @deb_files;
-        die("dpkg call failed\n") if ( ($?>>8) != 0 );
-        system shellwords($root_cmd), shellwords($install_tool), '-f', 'install';
-        die("install call failed\n") if ( ($?>>8) != 0 );
-    }
-    else {
-        system 'dpkg', '--unpack', @deb_files;
-        die("dpkg call failed\n") if ( ($?>>8) != 0 );
-        system shellwords($install_tool), '-f', 'install';
-        die("install call failed\n") if ( ($?>>8) != 0 );
+    my @root;
+    if ($root_cmd) {
+	push(@root, shellwords($root_cmd));
     }
+    system @root, 'dpkg', '--unpack', @deb_files;
+    die("dpkg call failed\n") if ( ($?>>8) != 0 );
+    system @root, shellwords($install_tool), '-f', 'install';
+    die("install call failed\n") if ( ($?>>8) != 0 );
 
     if ($opt_remove) {
 	foreach my $file (@deb_files) {

-- 
Git repository for devscripts