Package: devscripts
Version: 2.11.4
Tags: patch
File: /usr/bin/mk-build-deps

Here's a patch to mk-build-deps that incorporates Loïc Minier's improvement
(though I still find aptitude asking to remove my new package) and also
makes it actually use MKBUILDDEPS_ROOTCMD from the .devscripts file (I
didn't write any documentation, though).

--- /usr/local/src/debian/devscripts-2.11.4/scripts/mk-build-deps.pl	2011-12-22 21:39:47.000000000 +0000
+++ /usr/bin/mk-build-deps	2012-02-23 08:17:12.000000000 +0000
@@ -149,6 +149,7 @@
         or $config_vars{'MKBUILDDEPS_ROOTCMD'}=$config_default{'MKBUILDDEPS_ROOTCMD'};
 
 $install_tool = $config_vars{'MKBUILDDEPS_TOOL'};
+$root_cmd = $config_vars{'MKBUILDDEPS_ROOTCMD'};
 
 if ($config_vars{'MKBUILDDEPS_REMOVE_AFTER_INSTALL'} =~ /yes/) {
         $opt_remove=1;
@@ -283,13 +284,13 @@
     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';
+        system shellwords($root_cmd), shellwords($install_tool), '-f', 'install', map("$_-build-deps", @packages);
         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';
+        system shellwords($install_tool), '-f', 'install', map("$_-build-deps", @packages);
         die("install call failed\n") if ( ($?>>8) != 0 );
     }
 

-- Package-specific info:
--- /etc/devscripts.conf ---

--- ~/.devscripts ---
MKBUILDDEPS_TOOL="aptitude --schedule-only"
MKBUILDDEPS_REMOVE_AFTER_INSTALL='yes'
MKBUILDDEPS_ROOTCMD='sudo'
-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (900, 'testing'), (900, 'stable'), (400, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.1.1-balti (SMP w/4 CPU cores; PREEMPT)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages devscripts depends on:
ii  dpkg-dev   1.16.1.2
ii  libc6      2.13-26
ii  perl       5.14.2-7
ii  python     2.7.2-10
ii  python2.6  2.6.7-4
ii  python2.7  2.7.2-8

Versions of packages devscripts recommends:
ii  at                        3.1.13-1
ii  curl                      7.24.0-1
ii  dctrl-tools               2.20.1
ii  debian-keyring            2011.12.01
ii  dput | dupload            <none>
ii  equivs                    2.0.9
ii  fakeroot                  1.18.2-1
ii  gnupg                     1.4.11-3
ii  libcrypt-ssleay-perl      0.58-1
ii  libjson-perl              <none>
ii  libparse-debcontrol-perl  2.005-3
ii  libsoap-lite-perl         <none>
ii  liburi-perl               1.59-1
ii  libwww-perl               6.03-1
ii  lintian                   2.5.4
ii  man-db                    2.6.0.2-3
ii  patch                     2.6.1-3
ii  patchutils                0.3.2-1.1
ii  python-debian             0.1.21
ii  python-magic              <none>
ii  sensible-utils            0.0.6
ii  strace                    4.5.20-2.3
ii  unzip                     6.0-5
ii  wdiff                     0.6.5-1
ii  wget                      1.13.4-2
ii  xz-utils                  5.1.1alpha+20110809-3

Versions of packages devscripts suggests:
ii  build-essential              11.5
ii  cvs-buildpackage             <none>
ii  devscripts-el                35.2
ii  gnuplot                      <none>
ii  libauthen-sasl-perl          <none>
ii  libfile-desktopentry-perl    <none>
ii  libnet-smtp-ssl-perl         <none>
ii  libterm-size-perl            <none>
ii  libtimedate-perl             1.2000-1
ii  libyaml-syck-perl            1.19-1+b1
ii  mailutils [mailx]            1:2.2+dfsg1-4+b1
ii  mutt                         <none>
ii  openssh-client [ssh-client]  1:5.9p1-2
ii  svn-buildpackage             <none>
ii  w3m                          0.5.3-5

-- no debconf information

Reply via email to