-
Committer:
Package Import Robot
-
Author(s):
Michael Terry
-
Date:
2012-10-03 22:55:21 UTC
-
mfrom:
(1.8.14 sid)
-
Revision ID:
package-import@ubuntu.com-20121003225521-gq3k90h4ts0viwdw
Tags: 0.6.8.1-2ubuntu1
* Resynchronise with Debian to pick up multi-arch fixes (LP: #831768).
Remaining changes:
- debian/05aptitude: Never autoremove kernels.
- Drop aptitude-doc to Suggests.
- 03_branding: Ubuntu branding.
- 04_changelog: Take changelogs from changelogs.ubuntu.com.
- 14_html2text_preferred: Switch back to html2text in favor of elinks,
since html2text is in main and elinks isn't. Convert all files to utf-8
encoding as it is better then ascii for iso-8859-1 (English docs).
- no-google-mock: Don't use google-mock as it and libgtest-dev are in
universe. Refreshed to cover all changes.