diff options
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | gbp/command_wrappers.py | 5 | ||||
| -rwxr-xr-x | git-import-dsc | 3 | ||||
| -rwxr-xr-x | git-import-orig | 3 |
4 files changed, 8 insertions, 5 deletions
diff --git a/debian/control b/debian/control index 3901d3e..96be092 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ XS-Vcs-Git: http://honk.sigxcpu.org/git/git-buildpackage.git/ Package: git-buildpackage Architecture: all Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, devscripts, - git-load-dirs (>= 1.0.35), git-core (>= 1:1.5.0.1-1) + git-load-dirs (>= 1.1.4), git-core (>= 1:1.5.0.1-1) Description: Suite to help with Debian packages in Git repositories This package contains the following tools: * git-import-dsc: import an existing Debian source package into a git diff --git a/gbp/command_wrappers.py b/gbp/command_wrappers.py index 58da290..b1fbfdf 100644 --- a/gbp/command_wrappers.py +++ b/gbp/command_wrappers.py @@ -99,10 +99,11 @@ class GitLoadDirs(Command): if verbose: self.args = [ '-v' ] - def __call__(self, dir, log=''): + def __call__(self, dir, summary, log=''): self.dir = dir self.run_error = "Couldn't import %s" % self.dir - args = [ [], ['-L', log] ] [len(log) > 0] + args = ['-s', summary] + args += [ [], ['-L', log] ] [len(log) > 0] Command.__call__(self, self.args + args + [dir]) diff --git a/git-import-dsc b/git-import-dsc index 8591c4b..1ad57c5 100755 --- a/git-import-dsc +++ b/git-import-dsc @@ -119,7 +119,8 @@ def apply_debian_patch(src, dirs, options, tagger): try: gbpc.DpkgSourceExtract()(src.dscfile, dirs['dpkg-src']) os.chdir(dirs['git']) - gbpc.GitLoadDirs()(dirs['dpkg-src'], 'Imported Debian patch') + 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))) except gbpc.CommandExecFailed: print >>sys.stderr,"Failed to import Debian package" diff --git a/git-import-orig b/git-import-orig index 8dc0fba..49334c2 100755 --- a/git-import-orig +++ b/git-import-orig @@ -137,7 +137,8 @@ create it otherwise use --upstream-branch to specify it. print "Importing %s to upstream branch..." % tgz gitCheckoutUpstream() gitShowBranch() - gbpc.GitLoadDirs(verbose=options.verbose)(origdir) + 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)) if options.merge: |