-
Committer:
Package Import Robot
-
Author(s):
Micah Gersten
-
Date:
2012-02-16 02:24:09 UTC
-
mfrom:
(1.8.9 sid)
-
Revision ID:
package-import@ubuntu.com-20120216022409-spupv53rbz8t3p6e
Tags: 0.6.5-1ubuntu1
* Merge from debian unstable. (LP: #933259) 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.
- 15_ftbfs_new_apt
- no-google-mock patch: don't use google-mock as it and libgtest-dev are in
universe
* Refresh no-google-mock patch for build system changes
- update debian/patches/no-google-mock
* Actually drop 01_intltool_update patch as it's a 60k line diff we don't
need as we don't have any po diffs anymore
- update debian/patches/series
- remove debian/patches/01_intltool_update