[Pkg-bazaar-maint] Bug#463349: bzr-builddeb: PATCH: merge build failing when upstream has subdirs

[Mark A. Hershberger]

Package: bzr-builddeb
Version: 0.90ubuntu1
Severity: normal

This looks similar to #440069, but since that one is closed, (and now
I have a patch), here we go.

When an upstream tarball contains a subdirectory, any merge-build will
fail.  This is because shutil.move works in a non-intuitive way.  (See
http://mail.python.org/pipermail/python-list/2003-December/240968.html)

The following patch fixes this.

=== modified file 'builder.py'
--- builder.py	2008-01-30 23:59:16 +0000
+++ builder.py	2008-01-30 23:59:28 +0000
@@ -286,7 +286,8 @@
       files = glob.glob(tempdir+'/*')
       os.makedirs(source_dir)
       for file in files:
-        shutil.move(file, source_dir)
+        dest = os.path.join(source_dir, os.path.basename(file))
+        shutil.move(file, dest)
       shutil.rmtree(tempdir)
       if not upstream:
         shutil.copy(tarball, build_dir)

-- System Information:
Debian Release: lenny/sid
  APT prefers gutsy-updates
  APT policy: (500, 'gutsy-updates'), (500, 'gutsy-security'), (500, 'gutsy-backports'), (500, 'gutsy')
Architecture: i386 (i686)

Kernel: Linux 2.6.22-14-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages bzr-builddeb depends on:
ii  bzr                 1.0-2~bazaar1~gutsy1 easy to use distributed version co
ii  bzrtools            1.0.0-1bazaar1       Collection of tools for bzr
ii  devscripts          2.10.7ubuntu5        Scripts to make the life of a Debi
ii  dpkg-dev            1.14.5ubuntu16       package building tools for Debian
ii  fakeroot            1.7.1ubuntu1         Gives a fake root environment
ii  patchutils          0.2.31-4             Utilities to work with patches
ii  python              2.5.1-1ubuntu2       An interactive high-level object-o
ii  python-central      0.5.15ubuntu2        register and build utility for Pyt
ii  python-debian       0.1.5                python modules to work with Debian

bzr-builddeb recommends no packages.

-- no debconf information