-
Committer:
Bazaar Package Importer
-
Author(s):
Martin Pitt
-
Date:
2009-05-06 11:03:50 UTC
-
Revision ID:
james.westby@ubuntu.com-20090506110350-fwvdyju1kscltc9q
Tags: 2.6.0-6ubuntu1
* Merge with Debian unstable; Remaining Ubuntu changes:
- Some patches, see their tag headers for details:
+ 00git-format-strings.patch
+ 00git-policy-i18n.patch
+ 08_rosetta_translations.patch
+ 61_cleanup-pid-file.patch
+ 99_autoreconf.patch (for the changes in 00git-policy-i18n.patch)
+ Drop 60_fix-permissions-of-pid-file.patch, superseded by
00git-format-strings.patch.
* Debian's cleanup of 01_debian_4.0.patch also fixed operation for Karmic.
(LP: #371234)
* Add 06_check_etc_timezone.patch: Check /etc/timezone instead of
/etc/localtime, to fix zones being misreported as some other zone. Thanks,
Michael Terry! (LP: #43644)