summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2012-09-10 13:11:32 -0400
committerJoey Hess <joey@kitenet.net>2012-09-10 13:11:32 -0400
commitcdb8852a4b1ef3e83f5f9fdc60285c015a38c0e1 (patch)
tree434ce410b4ec1ae57a0172684997e1d0cfef056a /debian/changelog
parent073034791eea9df519a06deb4058908e30d0fa7d (diff)
parentd27f02705863d955be3d15410919a9faa2eb3ab0 (diff)
Merge branch 'wheezy'
Conflicts: man/po4a/po/de.po
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog10
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 3f85493..2ff9bfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,6 @@ debhelper (9.20120609) UNRELEASED; urgency=low
* dh_shlibdeps: Warn if -V flag is passed, to avoid it accidentially being
used here rather than in dh_makeshlibs. Closes: #680339
* dh_lintian: Source overrides doc improvement. Closes: #683941
- * Updated German man page translation. Closes: #685538
- * Updated French man page translation. Closes: #685560
- * Updated Spanish man page translation. Closes: #686291
* dh_installmime: No longer makes maintainer scripts run update-mime and
update-mime-database, that is now handled by triggers. Closes: #684689
Thanks, Charles Plessy
@@ -20,7 +17,7 @@ debhelper (9.20120609) UNRELEASED; urgency=low
-- Joey Hess <joeyh@debian.org> Thu, 05 Jul 2012 08:51:07 -0600
-debhelper (9.20120909) UNRELEASED; urgency=low
+debhelper (9.20120909) unstable; urgency=low
* autoscript() can now be passed a perl sub to run to s/// lines of
the script, which avoids problems with using sed, including potentially
@@ -28,8 +25,11 @@ debhelper (9.20120909) UNRELEASED; urgency=low
interface in the future; for now it can be used by specific commands
such as dh_installxmlcatalogs that encounter the problem.
Closes: #665296 Thanks, Marcin Owsiany
+ * Updated Spanish man page translation. Closes: #686291
+ * Updated German man page translation. Closes: #685538
+ * Updated French man page translation. Closes: #685560
- -- Joey Hess <joeyh@debian.org> Sun, 09 Sep 2012 14:23:10 -0400
+ -- Joey Hess <joeyh@debian.org> Mon, 10 Sep 2012 12:54:06 -0400
debhelper (9.20120830) unstable; urgency=low