Package: git-buildpackage
Version: 0.6.22
Severity: wishlist
Tags: patch
When an upstream uses git, and has a solid, stable release policy that
includes both tags and tarballs, it should be possible to encode that
policy in debian/gbp.conf. That way, a simple git-import-orig should
apply the upstream-vcs-tag argument automatically.
I tried adding:
upstream-vcs-tag = libgpg-error-%(version)s
to debian/gbp.conf for libgpg-error in a repository that also pulls
from upstream, but it was not applied when i ran git-import-orig.
The attached patch appears to fix things for me.
--dkg
-- System Information:
Debian Release: 8.0
APT prefers testing
APT policy: (500, 'testing'), (200, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages git-buildpackage depends on:
ii devscripts 2.15.1
ii git 1:2.1.4-2.1
ii man-db 2.7.0.2-5
ii python 2.7.8-4
ii python-dateutil 2.2-2
ii python-pkg-resources 5.5.1-1
Versions of packages git-buildpackage recommends:
pn cowbuilder <none>
ii pristine-tar 1.33
Versions of packages git-buildpackage suggests:
pn python-notify <none>
ii unzip 6.0-16
-- debconf-show failed
--- /usr/lib/python2.7/dist-packages/gbp/scripts/import_orig.py 2014-10-17 12:11:44.000000000 -0400
+++ /usr/lib/python2.7/dist-packages/gbp/scripts/import_orig.py.dkg 2015-03-16 11:32:20.290197282 -0400
@@ -208,7 +208,7 @@
dest="debian_branch")
branch_group.add_config_file_option(option_name="upstream-branch",
dest="upstream_branch")
- branch_group.add_option("--upstream-vcs-tag", dest="vcs_tag",
+ branch_group.add_config_file_option(option_name="upstream-vcs-tag", dest="vcs_tag",
help="Upstream VCS tag add to the merge commit")
branch_group.add_boolean_config_file_option(option_name="merge", dest="merge")
@@ -331,7 +331,7 @@
msg = upstream_import_commit_msg(options, version)
if options.vcs_tag:
- parents = [repo.rev_parse("%s^{}" % options.vcs_tag)]
+ parents = [repo.rev_parse("%s^{}" % repo.version_to_tag(options.vcs_tag, version))]
else:
parents = None
