import-dsc doesn't work for merged build

[James Westby]

Imported from Debian bug 497156:

Package: bzr-builddeb
Version: 0.95
Severity: normal

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

import-dsc doesn't seem to be able to deal with importing dsc's into
merged-build branches. It imports the full source code, rather than
just debian/.

(Hit when importing 1.5-1.1 into the bzr debian packaging branch)

- -- System Information:
Debian Release: lenny/sid
  APT prefers gutsy
  APT policy: (500, 'gutsy'), (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.26-1-686 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages bzr-builddeb depends on:
ii bzr 1.6.1~rc1-1 easy to use distributed version co
ii bzrtools 1.6.0-1 Collection of tools for bzr
ii devscripts 2.10.35 scripts to make the life of a Debi
ii dpkg-dev 1.14.21 Debian package development tools
ii fakeroot 1.9.6 Gives a fake root environment
ii patchutils 0.2.31-4 Utilities to work with patches
ii python 2.5.2-2 An interactive high-level object-o
ii python-apt 0.7.7.1 Python interface to libapt-pkg
ii python-central 0.6.8 register and build utility for Pyt
ii python-debian 0.1.11 Python modules to work with Debian

bzr-builddeb recommends no packages.

Versions of packages bzr-builddeb suggests:
ii bzr-svn 0.4.11-1 Bazaar plugin providing Subversion

- -- no debconf information

[James Westby (james-w)]

I've at least made it refuse to act if you try and do this for now.

Thanks,

James