diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-06-29 15:40:40 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-06-29 15:40:40 -0400 |
| commit | b4a1bdaa371033df1f0c1755652e8e472982ff0d (patch) | |
| tree | 8c1e02f32a9f74685f50b02a7f009cfc2a8bf8ac /debian | |
| parent | fe3bf5cfa5e99cec28e0289508faaf9e68efec25 (diff) | |
| parent | 71ae3ea75a46cdf13ef14f0ebc09d78f05228651 (diff) | |
Merge branch 'master' into buildsystems
Conflicts:
debian/changelog
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 777bc0d2..66b88abd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,14 +26,14 @@ debhelper (7.3.0) UNRELEASED; urgency=low -- Joey Hess <joeyh@debian.org> Mon, 20 Apr 2009 16:26:08 -0400 -debhelper (7.2.18) UNRELEASED; urgency=low +debhelper (7.2.18) unstable; urgency=low * dh_shlibdeps: Ensure DEBIAN directory exists, as dpkg-shlibdeps prints a confusing warning if it does not. Closes: #534226 * dh_auto_install: Pass --install-layout=deb to setup.py to support python 2.6. Closes: #534620 - -- Joey Hess <joeyh@debian.org> Sun, 28 Jun 2009 15:59:11 -0400 + -- Joey Hess <joeyh@debian.org> Mon, 29 Jun 2009 15:35:40 -0400 debhelper (7.2.17) unstable; urgency=low |