Bug#653472: /usr/bin/git-import-dsc: git-import-dsc: does not remove debian/ from upstream for source 3.0 (quilt) packages

Package: git-buildpackage
Version: 0.5.32
Severity: normal
File: /usr/bin/git-import-dsc

Hi,

git-import-dsc does not remove debian/ from upstream for source 3.0
(quilt) packages. I imported parcellite_1.0.2~rc3-1.dsc (from unstable)
and then parcellite_1.0.2~rc5-1.dsc (from mentors.d.n). After this
additional files appeared in debian/ that are not in the .debian.tar.gz,
but in the .orig.tar.gz:

# diff sources from git-import-dsc and dpkg-source -x
$ source-diff parcellite /tmp/parcellite-1.0.2\~rc5 | diffstat -p3
debian/README.source | 9
debian/cron.d.ex | 4
debian/files | 1
debian/init.d.lsb.ex | 296
debian/menu.ex | 2
debian/parcellite.debhelper.log | 45
debian/parcellite.default.ex | 10
debian/parcellite.doc-base.EX | 20
debian/parcellite.substvars | 2
debian/parcellite/DEBIAN/conffiles | 1
debian/parcellite/DEBIAN/control | 19
debian/parcellite/DEBIAN/md5sums | 60
debian/parcellite/etc/xdg/autostart/parcellite-startup.desktop | 43
debian/parcellite/usr/bin/parcellite |binary
debian/parcellite/usr/share/applications/parcellite.desktop | 42
debian/parcellite/usr/share/doc/parcellite/NEWS.gz |binary
debian/parcellite/usr/share/doc/parcellite/README | 39
debian/parcellite/usr/share/doc/parcellite/TODO | 3
debian/parcellite/usr/share/doc/parcellite/changelog.Debian.gz |binary
debian/parcellite/usr/share/doc/parcellite/changelog.gz |binary
debian/parcellite/usr/share/doc/parcellite/copyright | 39
debian/parcellite/usr/share/locale/ca/LC_MESSAGES/parcellite.mo |binary
debian/parcellite/usr/share/locale/cs/LC_MESSAGES/parcellite.mo |binary
debian/parcellite/usr/share/locale/da/LC_MESSAGES/parcellite.mo |binary
debian/parcellite/usr/share/locale/de/LC_MESSAGES/parcellite.mo |binary
debian/parcellite/usr/share/locale/es/LC_MESSAGES/parcellite.mo |binary
debian/parcellite/usr/share/locale/fr/LC_MESSAGES/parcellite.mo |binary
debian/parcellite/usr/share/locale/hu/LC_MESSAGES/parcellite.mo |binary
debian/parcellite/usr/share/locale/it/LC_MESSAGES/parcellite.mo |binary
debian/parcellite/usr/share/locale/ja/LC_MESSAGES/parcellite.mo |binary
debian/parcellite/usr/share/locale/nb/LC_MESSAGES/parcellite.mo |binary
debian/parcellite/usr/share/locale/pl/LC_MESSAGES/parcellite.mo |binary
debian/parcellite/usr/share/locale/pl_PL/LC_MESSAGES/parcellite.mo |binary
debian/parcellite/usr/share/locale/pt_BR/LC_MESSAGES/parcellite.mo |binary
debian/parcellite/usr/share/locale/ro/LC_MESSAGES/parcellite.mo |binary
debian/parcellite/usr/share/locale/ru/LC_MESSAGES/parcellite.mo |binary
debian/parcellite/usr/share/locale/sv/LC_MESSAGES/parcellite.mo |binary
debian/parcellite/usr/share/locale/tr/LC_MESSAGES/parcellite.mo |binary
debian/parcellite/usr/share/locale/zh_CN/LC_MESSAGES/parcellite.mo |binary
debian/parcellite/usr/share/man/man1/parcellite.1.gz |binary
debian/parcellite/usr/share/pixmaps/parcellite.png |binary
debian/parcellite/usr/share/pixmaps/parcellite.svg | 3453 -
debian/parcellite/usr/share/pixmaps/parcellite.xpm | 998 --
debian/postinst.ex | 39
debian/postrm.ex | 37
debian/preinst.ex | 35
debian/prerm.ex | 38
debian/watch.ex | 23
48 files changed, 5258 deletions(-)

These files should be removed.

Regards,
Ansgar

Debian Release: wheezy/sid
APT prefers testing
APT policy: (900, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

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

Versions of packages git-buildpackage depends on:
ii devscripts 2.11.2
ii git [git-core] 1:1.7.7.3-1
ii python 2.7.2-9
ii python-dateutil 1.5-1
ii python2.6 2.6.7-4
ii python2.7 2.7.2-8

Versions of packages git-buildpackage recommends:
ii cowbuilder <none>
ii pristine-tar 1.15

Versions of packages git-buildpackage suggests:
ii python-notify 0.1.1-3
ii unzip 6.0-5




To UNSUBSCRIBE, email to debian-bugs-dist-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org