Your message dated Thu, 30 May 2013 16:18:14 +0000 with message-id <[email protected]> and subject line Bug#708636: fixed in git-buildpackage 0.6.0~git20130530 has caused the Debian Bug report #708636, regarding export_source called with source.changelog parameter when only source is expected to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact [email protected] immediately.) -- 708636: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=708636 Debian Bug Tracking System Contact [email protected] with problems
--- Begin Message ---Package: git-buildpackage Version: 0.6.0~git20130506 Severity: normal Tags: patch In gbp/scripts/buildpackage.py the export_dir function is called with a wrong parameter. Because of this the combination of export-dir and overlay=True options (aka svn-buildpackage mergeWithUpstream emulation) does not work anymore. This error was introduced in commit d510f2a0. The following patch fixes the problem: ---- diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py index d59a76d..282795a 100755 --- a/gbp/scripts/buildpackage.py +++ b/gbp/scripts/buildpackage.py @@ -521,7 +521,7 @@ def main(argv): # Export to another build dir if requested: if options.export_dir: tmp_dir = os.path.join(output_dir, "%s-tmp" % source.sourcepkg) - export_source(repo, tree, source.changelog, options, tmp_dir, output_dir) + export_source(repo, tree, source, options, tmp_dir, output_dir) # Run postexport hook if options.postexport: ---- Gaudenz -- System Information: Debian Release: jessie/sid APT prefers testing APT policy: (800, 'testing'), (700, 'unstable'), (50, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.8-trunk-amd64 (SMP w/2 CPU cores) Locale: LANG=de_CH.UTF-8, LC_CTYPE=de_CH.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages git-buildpackage depends on: ii devscripts 2.12.6 ii git 1:1.7.10.4-2 ii man-db 2.6.3-3 ii python 2.7.3-5 ii python-dateutil 1.5+dfsg-0.1 Versions of packages git-buildpackage recommends: ii cowbuilder 0.70 ii pristine-tar 1.28 Versions of packages git-buildpackage suggests: ii python-notify 0.1.1-3 ii unzip 6.0-9 -- no debconf information
--- End Message ---
--- Begin Message ---Source: git-buildpackage Source-Version: 0.6.0~git20130530 We believe that the bug you reported is fixed in the latest version of git-buildpackage, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to [email protected], and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Guido Günther <[email protected]> (supplier of updated git-buildpackage package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing [email protected]) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Format: 1.8 Date: Thu, 30 May 2013 15:24:05 +0200 Source: git-buildpackage Binary: git-buildpackage Architecture: source all Version: 0.6.0~git20130530 Distribution: unstable Urgency: low Maintainer: Guido Günther <[email protected]> Changed-By: Guido Günther <[email protected]> Description: git-buildpackage - Suite to help with Debian packages in Git repositories Closes: 708636 Changes: git-buildpackage (0.6.0~git20130530) unstable; urgency=low . [ Guido Günther ] * [f4acd7a] GitRepository: Use LC_ALL=C when checking features. This fixes the doctest and also makes sure we use an up to date manpage. Thanks to Daniel Dehennin for the report. * [9c5bd03] Add Jenkins Scratchbuilder example. It's a simple script that can be used to build Debian packages via gbp and Jenkins. . [ Gaudenz Steinlin ] * [47f2dea] git-buildpackage: Unbreak overlay mode (Closes: #708636) Checksums-Sha1: 891ee32360cccf5b87ceb9948123ad403a8921e0 1301 git-buildpackage_0.6.0~git20130530.dsc bd5992c293a92829588dc1e1f34bb0fbd320830b 301248 git-buildpackage_0.6.0~git20130530.tar.gz e229b21e831a9cd5c4f214b34ffe8f4f827e693c 352542 git-buildpackage_0.6.0~git20130530_all.deb Checksums-Sha256: 79b1fee12ed9d3518cd224f7afeb9076b9cbfed5113c2d15e8ce8fd12787faaf 1301 git-buildpackage_0.6.0~git20130530.dsc 005f0d339c3f313909cb2c900c04586bcb7422335c0cd20d48dde973d510f1d7 301248 git-buildpackage_0.6.0~git20130530.tar.gz e0ca7aa871a542b0b640ec23541d555695d16243b8aedae7e37ce3c081436197 352542 git-buildpackage_0.6.0~git20130530_all.deb Files: 2a7c81ba8a508f9b431118bde8d926db 1301 vcs optional git-buildpackage_0.6.0~git20130530.dsc ee60f38dc80f82b8a3de94c86e8494a3 301248 vcs optional git-buildpackage_0.6.0~git20130530.tar.gz bee6014c2da2fcc89defc03c515690d4 352542 vcs optional git-buildpackage_0.6.0~git20130530_all.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iD8DBQFRp3Ryn88szT8+ZCYRAiTMAJ4mfV33Lj0b98xa3AYaTQ8VEz00XwCbBYIf +RyPSjSNFsG3jTEx16iK6r4= =6YZs -----END PGP SIGNATURE-----
--- End Message ---
