please merge git-buildpackage 0.4.65 from Debian unstable (full patch included)

Rolf, I think the changelog should describe the delta rather than state that it's unchanged, so that it's not necessary to look for the older entries. Please also close this bug in the changelog (LP: #525116).

It looks like you intended to subscribe motu-release, I'm doing it now. I'm also unsubscribing u-u-s, please resubscribe again when the exception has been granted.

Looks good to me. Ack #1.

Ilya, thank you for your comment. The changelog points to the version and it should be easy enough to look that up in the Changelog itself. I understand why you want the delta explained. OTOH, I find the way I described things here have more information (when was the delta introduced and last described in full detail?) while being more concise at the same time. I'd prefer it to go in like I proposed here unless that is absolutely impossible.

Second, closing the ticket. I agree that would be nice. But you end up in a chicken-and-egg situation. I want to attach the patch when I report the issue and not go back and forth between LP and my patch environment (my build host is not my desktop, so it involves a few more steps). I don't have a good solution here.

Ack #2, confirming the FFe. Please go ahead with uploading.

Rolf, the delta between 0.4.65 and 0.4.65ubuntu1 contains some unexpected changes, namely, to gbp/deb.py, gbp/gbp_version.py and git-dch. Some of them were introduced in your patch. Was that intentional?

Unsubscribing SRU team, no SRU here.

ping, any news? Ilya, could you finish this merge? I'd like to get it in rather sooner than later, so that we still have some time to react in case of errors.

I'm taking it.

Sorry for the delay in responding. I'm already working on it. The patch is ready for upload in just a few minutes.

OK, Rolf, I also noticed that Debian added bash-completion to build dependencies, we should do the same.

Here is the updated debdiff (and against the debian unstable version which should is smaller and thus easier to inspect for errors)

I hope it's error-free this time.

Here is the updated debdiff (and against the debian unstable version which is smaller and thus should be easier to inspect for errors)

I hope it's error-free this time.

Thank you! Uploaded with two small changes:
- syntax for closing this bug is "LP: #525116" not "LP #525116"
- ran update-maintainer

This bug was fixed in the package git-buildpackage - 0.4.65ubuntu1

---------------
git-buildpackage (0.4.65ubuntu1) lucid; urgency=low

  * merge from Debian unstable. delta unchanged from 0.4.63ubuntu1. LP: #525116

git-buildpackage (0.4.65) unstable; urgency=low

  [ Guido Günther ]
  * [07d54ef] gbp-add-patch: Strip path from patchname and handle missing
    files gracefully.
  * [a7fe7c4] Add basic bash completion for git-buildpackage (Closes: #567313)
    - thanks to Siegfried-Angel Gevatter
  * [aec185f] Add gbp-{clone,pull,pq} to description
  * [24ac91c] bash-completion: Add git-dch, git-import-{orig,dsc} and tab
    completion for branch names.
  * [cbc0577] Add GitRepository.get_remotes() to easily query remote branches
  * [4654425] gbp-clone: Add --all to track all remote branches

  [ Matthijs Kooijman ]
  * [2874c23] Make the commit message for upstream imports configurable.
    This adds the import-msg commandline and configuration file option
    to change the commit message. (Closes: #474457)

  [ Jon Bernard ]
  * [ad9b7f5] Prevent git-add-patch from being gzip'd

git-buildpackage (0.4.64) unstable; urgency=low

  * [ab40623] Add gbp-add-patch to easily commit patches from debian/patches
  * [34c1c43] Allow to skip imports of same version Based on a patch by
    Christoph Göhre.
  * [ea6311e] DscFile: Parse name of debian.tar.gz
  * [237a547] Import version 3 source format (Closes: #552771)
 -- Rolf Leggewie <email address hidden> Sun, 21 Feb 2010 02:03:39 +0100