aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorLoïc Minier <lool@dooz.org>2007-04-01 09:00:08 +0200
committerLoïc Minier <lool@dooz.org>2007-04-01 09:00:08 +0200
commitefab133bb85277bb858d8660f3e748b24c95d26a (patch)
tree26db0b7a0278444b4d5e8976fb07370d6f7119ca /debian
parent275a316ca8672eb90a5b38e3ff00d9f9ca9c07c1 (diff)
parent0b460b77a4919f3929f91eccebc0052f8e304122 (diff)
downloadpbuilder-efab133bb85277bb858d8660f3e748b24c95d26a.tar
pbuilder-efab133bb85277bb858d8660f3e748b24c95d26a.tar.gz
Merge branch 'satisfydepends-aptitude'
Conflicts: ChangeLog debian/changelog
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
1 files changed, 5 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index a8e871d..e24b0e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,11 @@ pbuilder (0.166) UNRELEASED; urgency=low
* Bug fix: "pbuilder-uml: --uml-ip broken", thanks to Paul TBBle Hampson
(Closes: #416920).
- -- Junichi Uekawa <dancer@debian.org> Sat, 31 Mar 2007 23:38:20 +0900
+ [ Loic Minier ]
+ * New pbuilder-satisfydepends-aptitude resolver based on aptitude; based on
+ an idea by Mike Hommey; closes: #337015.
+
+ -- Loic Minier <lool@dooz.org> Sun, 01 Apr 2007 08:58:21 +0200
pbuilder (0.165) unstable; urgency=low