[ubuntu-dev] Bug#645958: ubuntu-dev-tools: patch available

[Laurent Declercq]

Package: ubuntu-dev-tools
Version: 0.101
Severity: normal

Well, I'm using svn and git. I've never worked with bzr yet. I prefer provide a
patch for that thing and will see for further contribution. My patch is ok,
hopefully.

Thank for interest.



-- System Information:
Debian Release: 6.0.3
  APT prefers stable
  APT policy: (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages ubuntu-dev-tools depends on:
ii  binutils             2.20.1-16           The GNU assembler, linker and bina
ii  dctrl-tools          2.14.5              Command-line tools to process Debi
ii  devscripts           2.10.69+squeeze1    scripts to make the life of a Debi
ii  diffstat             1.53-1              produces graph of changes introduc
ii  dpkg-dev             1.15.8.11           Debian package development tools
ii  lsb-release          3.2-23.2squeeze1    Linux Standard Base version report
ii  python               2.6.6-3+squeeze6    interactive high-level object-orie
ii  python-apt           0.7.100.1+squeeze1  Python interface to libapt-pkg
ii  python-debian        0.1.18              Python modules to work with Debian
ii  python-launchpadlib  1.6.2-1             Launchpad web services client libr
ii  python-lazr.restfulc 0.9.21-1            client for lazr.restful-based web 
ii  python-support       1.0.10              automated rebuilding support for P
ii  sudo                 1.7.4p4-2.squeeze.2 Provide limited super user privile

Versions of packages ubuntu-dev-tools recommends:
ii  bzr                2.1.2-1               easy to use distributed version co
ii  ca-certificates    20090814+nmu3squeeze1 Common CA certificates
ii  cowdancer          0.62+nmu2             Copy-on-write directory tree utili
ii  debootstrap        1.0.26+squeeze1       Bootstrap a basic Debian system
ii  genisoimage        9:1.1.11-1            Creates ISO-9660 CD-ROM filesystem
ii  libapt-pkg-perl    0.1.24+b1             Perl interface to libapt-pkg
ii  libwww-perl        5.836-1               Perl HTTP/WWW client/server librar
ii  pbuilder           0.199+nmu1            personal package builder for Debia
ii  perl-modules       5.10.1-17squeeze2     Core Perl modules
ii  python-magic       5.04-5                File type determination library us
ii  python-soappy      0.12.0-4              SOAP Support for Python
ii  reportbug          4.12.6                reports bugs in the Debian distrib
ii  sbuild             0.60.0-2squeeze1      Tool for building Debian binary pa

Versions of packages ubuntu-dev-tools suggests:
pn  qemu-kvm-extras-static        <none>     (no description available)

-- no debconf information
-------------- next part --------------
--- /usr/bin/mk-sbuild	2011-10-20 01:41:08.157701636 +0200
+++ ./mk-sbuild	2011-10-20 06:42:22.433224679 +0200
@@ -426,10 +426,12 @@
 
 # Update the package sources
 TEMP_SOURCES=`mktemp -t sources-XXXXXX`
-if [ -z "$TEMPLATE_SOURCES" ]; then
-    TEMPLATE_SOURCES=~/.mk-sbuild.sources
-fi
-if [ -r "$TEMPLATE_SOURCES" ]; then
+TEMPLATE_SOURCES=~/.mk-sbuild.sources
+DISTRO_TEMPLATE_SOURCES="${TEMPLATE_SOURCES}.${DISTRO}"
+
+if [ -r "${DISTRO_TEMPLATE_SOURCES}" ]; then
+    cat "${DISTRO_TEMPLATE_SOURCES}" > "$TEMP_SOURCES"
+elif [ -r "${TEMPLATE_SOURCES}" ]; then
     cat "$TEMPLATE_SOURCES" > "$TEMP_SOURCES"
 else
     cat > "$TEMP_SOURCES" <<EOM