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

[Ross Burton]

Hi,

I'm using bzr-builddeb 2.0.1 from experimental, and merge mode isn't
doing what I expect.

I have an openconnect bzr repository, with an unstable/ branch which
contains the debian/.  There is a openconnect_0.99.orig.tar.gz, but when
I build using bzr bd --merge I get this layout:

ross at blackadder ~/Local/mess/03/openconnect/build-area
$ find
.
./openconnect_0.99.orig.tar.gz
./openconnect-0.99
./openconnect-0.99/debian
./openconnect-0.99/debian/rules
./openconnect-0.99/debian/changelog
./openconnect-0.99/debian/copyright
./openconnect-0.99/debian/compat
./openconnect-0.99/debian/watch
./openconnect-0.99/debian/control
./openconnect-0.99/pax_global_header
./openconnect-0.99/openconnect-0.99
./openconnect-0.99/openconnect-0.99/auth-dlg-settings.h
./openconnect-0.99/openconnect-0.99/ssl_ui.c
./openconnect-0.99/openconnect-0.99/dtls.c
./openconnect-0.99/openconnect-0.99/TODO
./openconnect-0.99/openconnect-0.99/ssl.c
./openconnect-0.99/openconnect-0.99/http.c
./openconnect-0.99/openconnect-0.99/version.sh
./openconnect-0.99/openconnect-0.99/README.SecurID
./openconnect-0.99/openconnect-0.99/tun.c
./openconnect-0.99/openconnect-0.99/cstp.c
./openconnect-0.99/openconnect-0.99/securid.c
./openconnect-0.99/openconnect-0.99/ssl_ui_gtk.c
./openconnect-0.99/openconnect-0.99/mainloop.c
./openconnect-0.99/openconnect-0.99/main.c
./openconnect-0.99/openconnect-0.99/openconnect.h
./openconnect-0.99/openconnect-0.99/Makefile
./openconnect-0.99/openconnect-0.99/nm-auth-dialog.c
./openconnect-0.99/openconnect-0.99/openconnect.8
./openconnect-0.99/openconnect-0.99/xml.c
./openconnect-0.99/openconnect-0.99/.gitignore
./openconnect-0.99/openconnect-0.99/COPYING.LGPL
./openconnect_0.99-1.dsc
./openconnect_0.99-1.diff.gz

This is wrong, there should be no openconnect-0.99 directory inside
openconnect-0.99.

Ross
-- 
Ross Burton                                 mail: ross at burtonini.com
                                          jabber: ross at burtonini.com
                                           www: http://burtonini.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : http://lists.alioth.debian.org/pipermail/pkg-bazaar-maint/attachments/20090121/cd9d4f58/attachment.pgp