From 14d36c0a60c743e6980f82c47b839eaf81df8241 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Mon, 13 Feb 2012 08:46:02 +0100 Subject: Depend on git instead of git-core Closes: #659661 --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index ee40381f..abf49800 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 7.0.50~), python (>> 2.6.6-3~), pychecker, gtk-doc-tools, sgml2x, docbook-utils, jade, python-dateutil, python-nose, bash-completion, perl, python-epydoc, python-coverage, python-setuptools, # For the testsuite - git-core, bzip2, unzip, pristine-tar + git, bzip2, unzip, pristine-tar Standards-Version: 3.9.2 Vcs-Git: git://honk.sigxcpu.org/git/git-buildpackage.git Vcs-Browser: http://git.debian.org/?p=users/agx/git-buildpackage.git @@ -16,7 +16,7 @@ X-Python-Version: >= 2.6 Package: git-buildpackage Architecture: all Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, devscripts (>= 2.10.66~), - git (>= 1:1.7.0.4-2) | git-core (>= 1:1.5.0.1-1), python-dateutil + git (>= 1:1.7.0.4-2) | git (>= 1:1.5.0.1-1), python-dateutil Recommends: pristine-tar (>= 0.5), cowbuilder Suggests: python-notify, unzip Description: Suite to help with Debian packages in Git repositories -- cgit v1.2.3 From f25fa9ba31e4bcf16dc87176e356782b9289c91e Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Mon, 13 Feb 2012 09:39:49 +0100 Subject: Lower dependencies on python-nose and python-coverage the versions in Squeeze are recent enough. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9a0cb590..b9342c2a 100644 --- a/setup.py +++ b/setup.py @@ -57,5 +57,5 @@ setup(name = "gbp", 'bin/git-pbuilder'], packages = find_packages(), data_files = [("/etc/git-buildpackage/", ["gbp.conf"]),], - setup_requires=['nose>=1.0', 'coverage>=3.4'], + setup_requires=['nose>=0.11.1', 'coverage>=2.85'], ) -- cgit v1.2.3 From 7e416261e4e33d868645de8a669e69a606d20551 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Mon, 13 Feb 2012 17:10:47 +0100 Subject: Require git 1.7 which is already in Squeeze and Lenny Backports --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index abf49800..f9011ab3 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ X-Python-Version: >= 2.6 Package: git-buildpackage Architecture: all Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, devscripts (>= 2.10.66~), - git (>= 1:1.7.0.4-2) | git (>= 1:1.5.0.1-1), python-dateutil + git (>= 1:1.7.0.4-2), python-dateutil Recommends: pristine-tar (>= 0.5), cowbuilder Suggests: python-notify, unzip Description: Suite to help with Debian packages in Git repositories -- cgit v1.2.3 From 63411b702bc5b754f719af78af654e2fe5531f54 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Sat, 18 Feb 2012 16:15:51 +0100 Subject: gbp-pq: Properly print patch name when guessing authorship information --- gbp/scripts/pq.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gbp/scripts/pq.py b/gbp/scripts/pq.py index 9193f2b6..7fa57cf9 100644 --- a/gbp/scripts/pq.py +++ b/gbp/scripts/pq.py @@ -286,7 +286,7 @@ def apply_and_commit_patch(repo, patch, topic=None): name, email = get_maintainer_from_control() if name: gbp.log.warn("Patch '%s' has no authorship information, " - "using '%s <%s>'" % (patch, name, email)) + "using '%s <%s>'" % (patch.path, name, email)) author['name'] = name author['email'] = email else: -- cgit v1.2.3 From 1e1ae2ecae0660ce1e5cc1e97a77b2999b46cb3c Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Sat, 18 Feb 2012 16:17:26 +0100 Subject: Document changes and release 0.6.0~git20120211 --- debian/changelog | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9407334a..7f996ab0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +git-buildpackage (0.6.0~git20120218) unstable; urgency=low + + [ Markus Lehtonen ] + * [24e7725] Make pristine_tar testcases pass with older git versions that + don't support user-defined output formats (tar filters) in git-archive. + + [ Guido Günther ] + * [14d36c0] Depend on git instead of git-core (Closes: #659661) + * [f25fa9b] Lower dependencies on python-nose and python-coverage the + versions in Squeeze are recent enough. + * [7e41626] Require git 1.7 which is already in Squeeze and Lenny Backports + * [63411b7] gbp-pq: Properly print patch name when guessing authorship + information + + -- Guido Günther Sat, 18 Feb 2012 16:16:48 +0100 + git-buildpackage (0.6.0~git20120210) unstable; urgency=low * [d279757] PristineTar: fix links in testcases -- cgit v1.2.3