Your message dated Mon, 27 Apr 2015 12:50:05 +0000 with message-id <[email protected]> and subject line Bug#780679: fixed in git-buildpackage 0.6.25 has caused the Debian Bug report #780679, regarding git-buildpackage: support %(hversion)s, converting . to - 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.) -- 780679: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=780679 Debian Bug Tracking System Contact [email protected] with problems
--- Begin Message ---Package: git-buildpackage Version: 0.6.22 Tags: patch Hi git-buildpackage people-- enigmail upstream uses tags named enigmail-1-8 for 1.8. Other upstreams have used similar conventions, likely as holdovers from CVS (e.g. gnupg 1.4.2 was tagged with V1-4-2). I'm proposing adding %(hversion)s as the "hyphenated version", which replaces . with -, to facilitate working with such upstreams. --dkg>From f23d8350fd7de496e1aeafea7b50363c8b72ed26 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor <[email protected]> Date: Tue, 17 Mar 2015 14:55:06 -0400 Subject: [PATCH] add %(hversion)s to version_to_tag to support some upstreams enigmail upstream uses tags named enigmail-1-8 for 1.8. Other upstreams have used similar conventions, likely as holdovers from CVS (e.g. gnupg 1.4.2 was tagged with V1-4-2). This patch helps packagers work with these upstreams. --- gbp/deb/git.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gbp/deb/git.py b/gbp/deb/git.py index 2a848d4..7746e86 100644 --- a/gbp/deb/git.py +++ b/gbp/deb/git.py @@ -102,10 +102,20 @@ class DebianGitRepository(GitRepository): def version_to_tag(format, version): """Generate a tag from a given format and a version + %(version)s provides a clean version that works as a git tag. + + %(hversion)s provides the same thing, but with '.' replaced + with '-'. hversion is useful for upstreams with tagging + policies that prohibit . characters. + >>> DebianGitRepository.version_to_tag("debian/%(version)s", "0:0~0") 'debian/0%0_0' + >>> DebianGitRepository.version_to_tag("libfoo-%(hversion)s", "1.8.1") + 'libfoo-1-8-1' + """ - return format_msg(format, dict(version=DebianGitRepository._sanitize_version(version))) + return format_msg(format, dict(version=DebianGitRepository._sanitize_version(version), + hversion=DebianGitRepository._sanitize_version(version).replace('.','-'))) @staticmethod def _sanitize_version(version): -- 2.1.4
--- End Message ---
--- Begin Message ---Source: git-buildpackage Source-Version: 0.6.25 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: SHA256 Format: 1.8 Date: Mon, 27 Apr 2015 09:05:16 +0200 Source: git-buildpackage Binary: git-buildpackage git-buildpackage-rpm Architecture: source all Version: 0.6.25 Distribution: unstable Urgency: medium 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 git-buildpackage-rpm - Suite to help with RPM packages in Git repositories Closes: 780602 780679 783013 Changes: git-buildpackage (0.6.25) unstable; urgency=medium . [ Markus Lehtonen ] * [f10d67f] UpstreamSource.guess_version: recognise debian native tarballs * [3ef3304] tests: add tests for UpstreamSource.guess_version() * [60ad28f] rpm tests: use eq_ and ok_ from nose tools. Provides better error messages as is more consistent as eq_ was already used in some test cases. * [f089021] tristate: implement __nonzero__() method. Returns False if tristate is 'off', otherwise True ('on' or 'auto'). * [e07aaba] config: support for older six * [e4f767f] GitRepository/has_submodules: add treeish argument. For defining a Git treeish which to look into, instead of the current working copy. * [5a74d4e] tests: add unit tests for gbp.rpm.SrcRpmFile * [1e347cc] rpm tests: disable one anomalous pylint error * [bd72c30] rpm tests: unbreak spec parsing test for openSUSE 13.2. Some SUSE-specific RPM tags are not supported anymore. . [ Guido Günther ] * Upload to unstable * Some Python3 compat including using six. * [74008c7] Turn off coverage output by default. It's much simpler to spot the cause of test failures this way. * [19d9280] Update docs on component tests and mailing list * [0b98c48,49f0e44,7ebf843] gbplogtester: robustness so we can finally silence the test suite. * [b1b7761] config test: fix missing prefix. We want to test no prefix, 'gbp-' and 'git-'. * [335dfdb] command_wrapper: Make error reporting more flexible. We allow to substitute stderr, stdout and error_reason in run_error now. These changes the API for derived classses slightly so fix them up as well. * [89574a0] Don't let pristine-tar spew on stderr. Capture its output and only dump it on failure. This makes "gbp import-orig" and test runs less verbose. * [430be38] testutils: Fix __all__. The values weren't correctly seperated * [36b90e9] SrcRpmFile: Add stderr to error messages so we can better debug failures like http://honk.sigxcpu.org:8001/job/git-buildpackage/230/changes * [53fbee6] Depend on cpio needed by gbp import-srpm . [ Daniel Kahn Gillmor ] * [83c5cc5] Allow to set upstream-vcs-tag via gbp.conf. Also pass it through version_to_tag so upstream-vcs-tag = libgpg-error-%(version)s properly expands the version replacement. (Closes: #780602) * [cb03293] Add %(hversion)s to version_to_tag to support some upstreams enigmail upstream uses tags named enigmail-1-8 for 1.8. Other upstreams have used similar conventions, likely as holdovers from CVS (e.g. gnupg 1.4.2 was tagged with V1-4-2). This patch helps packagers work with these upstreams. (Closes: #780679) . [ Martin Erik Werner ] * [4a53c0f] docs: Fix diirectory->directory typo in gbp.conf manpage (Closes: #783013) . [ Daniel Gollub ] * [aa8548d,e0f8b5b] gbp-dch: Guess upstream-tag based on merge-base to not accidentally pick up tags from the Debian branch. (Closes: #gh:7) Checksums-Sha1: 63ee6d401a385ebff0d47ce109d63133e17dbd46 2033 git-buildpackage_0.6.25.dsc e1d797dea9fe1bb1262002dfeba81458fe166d98 217752 git-buildpackage_0.6.25.tar.xz b98b492cd96a74bd68cd2348811377d64c5610fc 313070 git-buildpackage_0.6.25_all.deb 026b0386592d0d036de81836295a3d65cae7b256 68286 git-buildpackage-rpm_0.6.25_all.deb Checksums-Sha256: 6e4a53c53f10c42c995be2e95c386a0f1b00d787dd279375e3ea55af8bff3f68 2033 git-buildpackage_0.6.25.dsc 491c5b53c1df726f43ef46f58e890c68e087aa85ad81c079290bfea757e97cb3 217752 git-buildpackage_0.6.25.tar.xz ef4eed0e35789aebda2a3a8edc7e001810de2f8c1bf38f7ee0426e6116fb78a3 313070 git-buildpackage_0.6.25_all.deb d4718d9031239cb7f17625a30a57e92915268ead7b4196b3f69a6735312a651c 68286 git-buildpackage-rpm_0.6.25_all.deb Files: dd6ba54254863c67a6243bbf83e28281 2033 vcs optional git-buildpackage_0.6.25.dsc 24ea41e0c369d89459b86ab9fbfba915 217752 vcs optional git-buildpackage_0.6.25.tar.xz 6279b19233241a2d0a24b7877a1bd5cc 313070 vcs optional git-buildpackage_0.6.25_all.deb 14c05b60f8c04c4959c63883bc2791ec 68286 vcs optional git-buildpackage-rpm_0.6.25_all.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIVAwUBVT4n1Ae4t7DqmBILAQjW+BAAzMgdTt2lhAvhYpz1sArD5H+aoHzQqkLO WUbadRwn2GaCCXf/MRHgF2Bx02UdYoqCrgnuW8loztpwMxAPqJq7enAbX8QUreGt NyzJjjiCJXrNiA4pDX1/SP5Nx5i7Xp73uXBWehRhcPUeJ7xHYwVYhBSWXQ6g+qIt AB40ptGAzOutqcujKNJRKoiPDygqGyx3MmS2lT+lE8BDcAaqGvK/Z7ISaBijt92k JM+ApTyx2HBvoQv7M/cuSEs7Xk3YLKhtbsM+DzalXUvOoeGZUboUquAkgcHIQt/u kkQh+chtWgyHcCrvvbMism4vyPtW00wTXP4yLhdMDsZKInvDp86IFwGxkdh0i38l S+iFTuX8DF4ZdtHKux9fMAB1MUS8oz6TKGuUnPa3QvO3UUHI9J0vyUWRQGyzi7sx B8lGDzmsUHNktmCnuxRSCjOzUdd2JQgyJnYDP0K7RObPLdfS2CiGkZlZW5M+FOzf LyVfak2duccYm63msaixVtx39LwiXoh8VgmFV08JRu1a278h8R2uPlLfB+8bCUvc zJJZIwoQ1XNPvGVxV15nzeZVfTsZbOpF+yRnOZ8UXCU1xDVHQpqvXHU2/3yNhTJd mzX6Mb9+dMT6DVdrHnuDiJ1aLuQiQt+6+xPwEdyDnZg5nKdtenu6jtXd4fcoKk97 NrD3KpXQ/k0= =4ixN -----END PGP SIGNATURE-----
--- End Message ---
