diff options
| author | Guido Guenther <agx@sigxcpu.org> | 2007-02-27 18:18:46 +0100 |
|---|---|---|
| committer | Guido Guenther <agx@bogon.sigxcpu.org> | 2007-02-27 18:18:46 +0100 |
| commit | 1bf66bc8b1fc957b98a043f4f24743ef5dc57e10 (patch) | |
| tree | 40b9277dac74d0cfb2be2bd922756ae8eb144912 | |
| parent | e25f35b3ea11d73e4973af5795b67a16035a6e58 (diff) | |
depend on a git that has the "removed files left in working copy after merge" bug (#410325)
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index b2f5cfeb..1fce6dfa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,12 @@ -git-buildpackage (0.2.25.gbp0) unstable; urgency=low +git-buildpackage (0.2.26) unstable; urgency=low + * UNRELEASED * use GbpError everywhere * move commands into a submodule * git-import-orig: pass --verbose on to git_load_dirs * use default python version in setup.py + * depend on a git that has the "removed files left in working copy after + merge" bug (#410325) -- Guido Guenther <agx@sigxcpu.org> Sun, 11 Feb 2007 22:52:31 +0100 diff --git a/debian/control b/debian/control index 04f5ddbd..3901d3e0 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.4.4) + git-load-dirs (>= 1.0.35), 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 |