From c3d1f05c1ee4a6113cf842f80389f0809cdd4949 Mon Sep 17 00:00:00 2001 From: Guido Guenther Date: Fri, 7 Dec 2007 19:28:45 +0100 Subject: git-ls-files: separate filenames by '\0', based on a patch from Uwe Kleine-König (Closes: #454470) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gbp/git_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gbp/git_utils.py b/gbp/git_utils.py index 2ad4235c..39ff89af 100644 --- a/gbp/git_utils.py +++ b/gbp/git_utils.py @@ -78,10 +78,10 @@ class GitRepository(object): def index_files(self): """List files in the index""" - out, ret = self.__git_getoutput('ls-files') + out, ret = self.__git_getoutput('ls-files', ['-z']) if ret: raise GitRepositoryError, "Error listing files %d" % ret - files = [ line.strip() for line in out ] + files = [ file for file in out[0].split('\0') if file ] return files -- cgit v1.2.3 From c6ad1ccdf752ea918d99fc2642a9d4424ca72be2 Mon Sep 17 00:00:00 2001 From: Guido Guenther Date: Fri, 7 Dec 2007 23:20:27 +0100 Subject: return non null on failure --- git-import-dsc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/git-import-dsc b/git-import-dsc index 51ce56a8..37de62d7 100755 --- a/git-import-dsc +++ b/git-import-dsc @@ -226,8 +226,9 @@ def main(argv): ret = 1 os.chdir(dirs['top']) - if not ret: - print 'Everything imported under %s' % src.pkg + if not ret: + print 'Everything imported under %s' % src.pkg + return ret if __name__ == '__main__': sys.exit(main(sys.argv)) -- cgit v1.2.3 From 116048b7b7c05f4a461a2da402ac73bf04ce589f Mon Sep 17 00:00:00 2001 From: Guido Guenther Date: Fri, 7 Dec 2007 23:20:35 +0100 Subject: document changes and release --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 536c996d..9da4922c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +git-buildpackage (0.4.10) unstable; urgency=low + + * git-ls-files: separate filenames by '\0', based on a patch from Uwe + Kleine-König (Closes: #454470) + * git-import-dsc: return non null on failure + + -- Guido Guenther Fri, 07 Dec 2007 23:19:39 +0100 + git-buildpackage (0.4.9) unstable; urgency=low * fix "gpb gets confused by color enabled on branches..." - thanks to -- cgit v1.2.3 From a104bb14126f3cdc04f66615304470ea3546eeb5 Mon Sep 17 00:00:00 2001 From: Guido Guenther Date: Sat, 15 Dec 2007 14:35:44 +0100 Subject: don't start a new changelog section if we found a snapshot header even when distribution != UNRELEASED --- git-dch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/git-dch b/git-dch index b98ce378..cb0e015b 100755 --- a/git-dch +++ b/git-dch @@ -187,6 +187,7 @@ def main(argv): ret = 0 changelog = 'debian/changelog' until = 'HEAD' + found_snapshot_header = False parser = GbpOptionParser(command=os.path.basename(argv[0]), prefix='', usage='%prog [options] paths') @@ -237,6 +238,7 @@ def main(argv): since = guess_snapshot_commit(cp) if since: print "Continuing from commit '%s'" % since + found_snapshot_header = True else: print "Couldn't get snapshot header, using version info" if not since: @@ -246,7 +248,7 @@ def main(argv): print "Only looking for changes on '%s'" % " ".join(args) changes = get_log(since, until, options.git_log, " ".join(args)) if changes: - if cp['Distribution'] != "UNRELEASED": + if cp['Distribution'] != "UNRELEASED" and not found_snapshot_header: add_changelog_section(distribution="UNRELEASED", msg="UNRELEASED") shortlog_to_dch(changes) fixup_trailer() -- cgit v1.2.3 From f831042f1651c21b1a0376a17a87c50870b2bd2b Mon Sep 17 00:00:00 2001 From: "Frank S. Thomas" Date: Sat, 15 Dec 2007 00:50:51 +0100 Subject: --export-dir and --export are actually --git-export-dir and --git-export --- docs/chapters/building.sgml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/chapters/building.sgml b/docs/chapters/building.sgml index 4fb85fb6..eb569b61 100644 --- a/docs/chapters/building.sgml +++ b/docs/chapters/building.sgml @@ -28,20 +28,20 @@ Using a separate build dir Tools like &svn-buildpackage; use a separate build-area. To achieve a similar behaviour - with &git-buildpackage; use the option: + with &git-buildpackage; use the option: -&git-buildpackage; =../build-area/ +&git-buildpackage; =../build-area/ This will export the current branch head to ../build-area/package-version, check out the corresponding upstream tree to build the .orig.tar.gz if necessary and build the package. If you don't want to export the current branch head you can use - to export any treeish object, here are some + to export any treeish object, here are some examples: -&git-buildpackage; =../build-area =debian/0.4.3 -&git-buildpackage; =../build-area =etch -&git-buildpackage; =../build-area =8caed309653d69b7ab440e3d35abc090eb4c6697 +&git-buildpackage; =../build-area =debian/0.4.3 +&git-buildpackage; =../build-area =etch +&git-buildpackage; =../build-area =8caed309653d69b7ab440e3d35abc090eb4c6697 If you want to default to build in a separate build area you can specify the directory to use in the gbp.conf. -- cgit v1.2.3 From 52ec6caf3674157505e4c01c21a6c9911c2a262f Mon Sep 17 00:00:00 2001 From: Guido Guenther Date: Sat, 15 Dec 2007 17:17:48 +0100 Subject: document changes and release --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9da4922c..35a93a75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +git-buildpackage (0.4.11) unstable; urgency=low + + * --export-dir and --export are actually --git-export-dir and --git- + export (Closes: #456384) - thanks to Frank S. Thomas for the patch. + * don't start a new changelog section if we found a snapshot header + even when distribution != UNRELEASED + + -- Guido Guenther Sat, 15 Dec 2007 17:16:34 +0100 + git-buildpackage (0.4.10) unstable; urgency=low * git-ls-files: separate filenames by '\0', based on a patch from Uwe -- cgit v1.2.3 From f9a4256ffce53bba3b3f7af91a3fcacf0a5a565a Mon Sep 17 00:00:00 2001 From: Guido Guenther Date: Sat, 15 Dec 2007 17:22:59 +0100 Subject: remove unused debian/dirs --- debian/dirs | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 debian/dirs diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index ca882bbb..00000000 --- a/debian/dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -usr/sbin -- cgit v1.2.3 From 27619d7a5483fe5d64433899201bd10d8fbf5cc4 Mon Sep 17 00:00:00 2001 From: Guido Guenther Date: Sat, 15 Dec 2007 17:23:24 +0100 Subject: bump standards version --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 26c45356..588bc2dc 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Guido Guenther Build-Depends: cdbs, debhelper (>= 5), python-dev, python-support (>= 0.3), pychecker, gtk-doc-tools, sgml2x, docbook-utils, jade -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 Vcs-Git: http://honk.sigxcpu.org/git/git-buildpackage.git/ Package: git-buildpackage -- cgit v1.2.3 From e8d961b05b0a3c9a5d3d3bf6f8eac201a35c159b Mon Sep 17 00:00:00 2001 From: Guido Guenther Date: Sat, 15 Dec 2007 17:24:39 +0100 Subject: add a homepage field --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 588bc2dc..e8682afe 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Build-Depends: cdbs, debhelper (>= 5), python-dev, python-support (>= 0.3), pychecker, gtk-doc-tools, sgml2x, docbook-utils, jade Standards-Version: 3.7.3 Vcs-Git: http://honk.sigxcpu.org/git/git-buildpackage.git/ +Homepage: http://sigxcpu.org/projects.html Package: git-buildpackage Architecture: all -- cgit v1.2.3 From ac5b01997a6346d05d88c9c1c64a9afdf9a58dbc Mon Sep 17 00:00:00 2001 From: "Frank S. Thomas" Date: Sun, 16 Dec 2007 13:50:44 +0100 Subject: Use export-dir instead of build-area in gbp.conf because git-buildpackage has no --git-build-area option. --- docs/chapters/building.sgml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/chapters/building.sgml b/docs/chapters/building.sgml index eb569b61..0bbc836d 100644 --- a/docs/chapters/building.sgml +++ b/docs/chapters/building.sgml @@ -49,9 +49,9 @@ [git-buildpackage] # use a build area relative to the git repository -build-area=../build-area +export-dir=../build-area # to use the same build area for all packages use an absolute path: -#build-area=/home/debian-packages/build-area +#export-dir=/home/debian-packages/build-area -- cgit v1.2.3 From 7e4569cd56a6fbd5d09bd62265aed6f5c9cfe334 Mon Sep 17 00:00:00 2001 From: Guido Guenther Date: Sun, 23 Dec 2007 20:29:07 +0100 Subject: add doc-base file (Closes: #457495) --- debian/doc-base | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 debian/doc-base diff --git a/debian/doc-base b/debian/doc-base new file mode 100644 index 00000000..51ba88fd --- /dev/null +++ b/debian/doc-base @@ -0,0 +1,11 @@ +Document: git-buildpackage +Title: Git-Buildpackage Manual +Author: Guido Guenther +Abstract: git-buildpackage is a suite to help with Debian packages in Git + repositories. This manual describes the utilities in this package, their + configuration and possible workflows. +Section: Apps/Programming + +Format: HTML +Index: /usr/share/doc/git-buildpackage/manual-html/index.html +Files: /usr/share/doc/git-buildpackage/manual-html/*.html -- cgit v1.2.3 From 2694e2ca1be723de9aeeffb6dc5761e249d6956d Mon Sep 17 00:00:00 2001 From: Guido Guenther Date: Sun, 23 Dec 2007 20:35:33 +0100 Subject: fix doc url (Closes: #456535) --- git-import-orig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-import-orig b/git-import-orig index 284bf0dc..f3344bec 100755 --- a/git-import-orig +++ b/git-import-orig @@ -140,8 +140,8 @@ def main(argv): if not repo.has_branch(options.upstream_branch) and not is_empty: print >>sys.stderr, """ Repository does not have branch '%s' for upstream sources. If there is none see -/usr/share/doc/git-buildpackage/manual-html/gbpc.import.convert.html on howto -create it otherwise use --upstream-branch to specify it. +file:///usr/share/doc/git-buildpackage/manual-html/gbp.import.html#GBP.IMPORT.CONVERT +on howto create it otherwise use --upstream-branch to specify it. """ % options.upstream_branch raise GbpError -- cgit v1.2.3 From ac5bd6fca436a4e1f078c4bc32e838f07a650920 Mon Sep 17 00:00:00 2001 From: Guido Guenther Date: Sun, 23 Dec 2007 20:39:50 +0100 Subject: document changes and release --- debian/changelog | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index 35a93a75..a66d2443 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +git-buildpackage (0.4.12) unstable; urgency=low + + * remove unused debian/dirs + * bump standards version + * add a homepage field + * add doc-base file (Closes: #457495) + * git-import-orig: fix doc url (Closes: #456535) + * use export-dir instead of build-area in gbp.conf because git- + buildpackage has no --git-build-area option - thanks to Frank S. Thomas + for the patch. + + -- Guido Guenther Sun, 23 Dec 2007 20:35:45 +0100 + git-buildpackage (0.4.11) unstable; urgency=low * --export-dir and --export are actually --git-export-dir and --git- -- cgit v1.2.3 From 1ac78c6b7d23a5d025742c2b7a5ddc4c2cdaedcb Mon Sep 17 00:00:00 2001 From: Guido Guenther Date: Fri, 28 Dec 2007 23:01:10 +0100 Subject: don't fail when importing into empty git archives --- gbp/git_utils.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gbp/git_utils.py b/gbp/git_utils.py index 39ff89af..fffa3f64 100644 --- a/gbp/git_utils.py +++ b/gbp/git_utils.py @@ -81,8 +81,10 @@ class GitRepository(object): out, ret = self.__git_getoutput('ls-files', ['-z']) if ret: raise GitRepositoryError, "Error listing files %d" % ret - files = [ file for file in out[0].split('\0') if file ] - return files + if out: + return [ file for file in out[0].split('\0') if file ] + else: + return [] def build_tag(format, version): -- cgit v1.2.3 From eb00b2cf3daf31e4faa60dbeea3bc066d905f363 Mon Sep 17 00:00:00 2001 From: Guido Guenther Date: Fri, 28 Dec 2007 23:01:42 +0100 Subject: document changes and release --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index a66d2443..5e2cc866 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-buildpackage (0.4.13) unstable; urgency=low + + * git-import-orig: don't fail when importing into empty git archives + + -- Guido Guenther Fri, 28 Dec 2007 23:01:29 +0100 + git-buildpackage (0.4.12) unstable; urgency=low * remove unused debian/dirs -- cgit v1.2.3