-
Committer:
Bazaar Package Importer
-
Author(s):
Michael Vogt
-
Date:
2011-06-22 12:32:56 UTC
-
mfrom:
(1.8.6 sid)
-
Revision ID:
james.westby@ubuntu.com-20110622123256-8aox9w9ch3x72dci
Tags: 0.6.4-1ubuntu1
* Merge from debian unstable. Remaining changes:
- debian/05aptitude: never autoremove kernels
- drop aptitude-doc to Suggests
- 03_branding.dpatch: ubuntu branding
- 04_changelog.dpatch: take changelogs from changelogs.ubuntu.com
- 09_ubuntu_fortify_source.dpatch: Suppress a number of warnings (turned
into errors by -Werror) triggered by Ubuntu's default of
-D_FORTIFY_SOURCE=2.
- 11_ubuntu_uses_sudo.dpatch: fix status line of 'Become root' menu entry
to not refer to su.
- 12_point_manpage_to_doc_package.dpatch: point Finnish manpage to the
correct place for further info
- 14_html2text_preferred.dpatch: switch back to html2text in favor of
elinks, since html2text is in main and elinks isn't.
* dropped 01_intltool_update.dpatch
* updated 15_ftbfs_new_apt