Package: git-buildpackage Version: 0.4.59 Severity: normal I did some tests with the new 3.0 (quilt) source format and git-buildpackage as it seems to be untested at the moment[1]. I think that it doesn't support that format. I came to this conclusion by changing a package which has patches which must be applied before the clean target is run. This is valid according to the dpkg-source manpage under "Format: 3.0 (quilt)" "Extracting".
"Note: dpkg-source expects the source tree to have all patches listed in the series file applied when you generate the source package" It fails with make[2]: Leaving directory `/home/rowo/mupen64plus/dummy_video' make -C glN64 clean make: Entering an unknown directory make: *** glN64: No such file or directory. Stop. make: Leaving an unknown directory make[1]: *** [clean-plugins] Error 2 make[1]: Leaving directory `/home/rowo/mupen64plus' dh_auto_clean: make returned exit code 2 make: *** [clean] Error 1 fakeroot debian/rules clean returned 2 Couldn't run 'fakeroot debian/rules clean' Sources were obtained with `debcheckout --git-track="*" mupen64plus` and patch was applied using `git am 0001-Test-Format-3.0-quilt.patch` [1] http://wiki.debian.org/Projects/DebSrc3.0 [2] http://git.debian.org/?p=collab-maint/mupen64plus.git -- Robert Wohlrab
From 4f69198196c14bc32278fb174420d46f9129c62d Mon Sep 17 00:00:00 2001 From: Robert Wohlrab <robert.wohl...@gmx.de> Date: Tue, 27 Oct 2009 22:14:52 +0100 Subject: [PATCH] Test Format 3.0 (quilt) --- debian/Makefile.glN64 | 2 -- debian/control | 2 +- debian/rules | 7 ++----- debian/source/format | 1 + 4 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 debian/Makefile.glN64 create mode 100644 debian/source/format diff --git a/debian/Makefile.glN64 b/debian/Makefile.glN64 deleted file mode 100644 index 1f3f033..0000000 --- a/debian/Makefile.glN64 +++ /dev/null @@ -1,2 +0,0 @@ -%: -.PHONY: clean diff --git a/debian/control b/debian/control index 89a51d3..3cd7324 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Homepage: http://code.google.com/p/mupen64plus/ Standards-Version: 3.8.3 Vcs-Browser: http://git.debian.org/?p=collab-maint/mupen64plus.git Vcs-Git: git://git.debian.org/git/collab-maint/mupen64plus.git -Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7), libsdl1.2-dev, +Build-Depends: debhelper (>= 7.0.50), libsdl1.2-dev, libsdl-ttf2.0-dev, libfreetype6-dev, libglib2.0-dev, libgtk2.0-dev, libsamplerate0-dev, libpng12-dev | libpng-dev, libbz2-dev, zlib1g-dev | libz-dev, libgl1-mesa-dev | libgl-dev, diff --git a/debian/rules b/debian/rules index 2c00aed..6cd1ea1 100755 --- a/debian/rules +++ b/debian/rules @@ -4,16 +4,13 @@ DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) %: - dh --with quilt $@ + dh $@ get-orig-source: uscan --verbose --force-download clean: - mkdir -p "$(CURDIR)/glN64" - cp "$(CURDIR)/debian/Makefile.glN64" "$(CURDIR)/glN64/Makefile" - dh --with quilt $@ - rm -rf "$(CURDIR)/glN64" + dh $@ rm -rf "$(CURDIR)/plugins" override_dh_auto_build: diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- 1.6.5
