diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-05-14 14:25:07 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-05-14 14:25:07 -0400 |
| commit | 692ac0f0d2b7acc570cd6a5f8cac848109daf026 (patch) | |
| tree | 595da5b949e88f2e05c44cf755f007dc5bdc2465 /debian | |
| parent | 9803d8bb635132458142416d32273c9c754b2aca (diff) | |
| parent | 61aa7954cd6c8620ca99a0d7895aa5a6f59d37e0 (diff) | |
Merge branch 'master' into buildsystems
Conflicts:
debian/changelog
dh_auto_configure
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 3a9a9f3f..8a76e1c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,15 +15,25 @@ debhelper (7.3.0) UNRELEASED; urgency=low -- Joey Hess <joeyh@debian.org> Mon, 20 Apr 2009 16:26:08 -0400 -debhelper (7.2.11) UNRELEASED; urgency=low +debhelper (7.2.12) unstable; urgency=low + + * dh_auto_configure: Revert --skipdeps change + Closes: #528647, reopens: #528235 + + -- Joey Hess <joeyh@debian.org> Thu, 14 May 2009 14:15:26 -0400 + +debhelper (7.2.11) unstable; urgency=low * dh: Support --with addon,addon,... Closes: #528178 * dh_auto_configure: Add --skipdeps when running Makefile.PL, to prevent Module::Install from trying to download dependencies. Closes: #528235 + * Support debian/foo.os files to suppliment previous debian/foo.arch + file support. Closes: #494914 + (Thanks, Aurelien Jarno) - -- Joey Hess <joeyh@debian.org> Mon, 11 May 2009 14:50:33 -0400 + -- Joey Hess <joeyh@debian.org> Tue, 12 May 2009 14:52:18 -0400 debhelper (7.2.10) unstable; urgency=low |