diff options
| -rwxr-xr-x | git-buildpackage | 3 | ||||
| -rwxr-xr-x | git-import-dsc | 9 | ||||
| -rwxr-xr-x | git-import-orig | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/git-buildpackage b/git-buildpackage index ae2a9e2f..550d36b0 100755 --- a/git-buildpackage +++ b/git-buildpackage @@ -121,7 +121,8 @@ def main(argv): raise GbpError, "Can't parse version from changelog" else: print "Tagging", version - GitTag(options.sign_tag, options.keyid)(build_tag(options.debian_tag, version)) + GitTag(options.sign_tag, options.keyid)(build_tag(options.debian_tag, version), + msg="Debian release %s" % version) if(options.posttag_hook): Command(options.posttag_hook, shell=True)() except CommandExecFailed: diff --git a/git-import-dsc b/git-import-dsc index 1ad57c50..1f8f9994 100755 --- a/git-import-dsc +++ b/git-import-dsc @@ -104,7 +104,8 @@ def import_initial(src, dirs, options, tagger): msg="Imported %s version %s" % (['upstream', 'Debian'][src.native], src.upstream_version)) format = [options.upstream_tag, options.debian_tag][src.native] - tagger(build_tag(format, src.upstream_version)) + tagger(build_tag(format, src.upstream_version), + msg="Upstream version %s" % src.upstream_version) if not src.native: gbpc.GitBranch()(options.upstream_branch) except gbpc.CommandExecFailed: @@ -119,9 +120,11 @@ def apply_debian_patch(src, dirs, options, tagger): try: gbpc.DpkgSourceExtract()(src.dscfile, dirs['dpkg-src']) os.chdir(dirs['git']) + version = "%s-%s" % (src.upstream_version, src.debian_version) gbpc.GitLoadDirs()(dir=dirs['dpkg-src'], - summary="Imported Debian patch %s" % src.debian_version) - tagger(build_tag(options.debian_tag, '%s-%s' % (src.upstream_version, src.debian_version))) + summary="Imported Debian patch %s" % version) + tagger(build_tag(options.debian_tag, version), + msg="Debian release %s" % version) except gbpc.CommandExecFailed: print >>sys.stderr,"Failed to import Debian package" return False diff --git a/git-import-orig b/git-import-orig index 49334c28..3650386b 100755 --- a/git-import-orig +++ b/git-import-orig @@ -139,7 +139,8 @@ create it otherwise use --upstream-branch to specify it. gitShowBranch() gbpc.GitLoadDirs(verbose=options.verbose)(dir=origdir, summary="Imported upstream version %s" % version) - gbpc.GitTag(options.sign_tags, options.keyid)(build_tag(options.upstream_tag, version)) + gbpc.GitTag(options.sign_tags, options.keyid)(build_tag(options.upstream_tag, version), + msg="Upstream version %s" % version) if options.merge: print "Merging to %s" % (options.debian,) |