lp:ubuntu/saucy-proposed/aptitude

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

80. By Brian Murray on 2013-09-23

* Remove debian/05aptitude:
  - sudo setting is redundant with user-setup (LP: #1033838)
  - Keep-Unused-Pattern setting is redundant with apts NeverAutoRemove,
    which conflicts with an apt update to permit autoremoval of old kernel
    images (LP: #923876, #1053776)
  - Thanks to Daniel Hartwig for the patch.
  - Remove 05aptitude from debian/aptitude.install

79. By Dimitri John Ledkov on 2013-08-02

* Merge from Debian, remaining changes:
  - Cherry pick patch by Nick Black to fix FTBFS with boost1.53.
  - Fix build failure with GCC 4.8.
  - 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).
  - Fix gmock & gtest paths, use dh-autoreconf.

78. By Dimitri John Ledkov on 2013-05-04

Cherry pick patch by Nick Black to fix FTBFS with boost1.53.

77. By Matthias Klose on 2013-02-26

Fix build failure with GCC 4.8.

76. By Michael Terry on 2012-10-03

* 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.

75. By Marcin Juszkiewicz on 2012-07-02

* Resynchronise with Debian. 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.

74. By Dimitri John Ledkov on 2012-06-29

Fix FTBFS with gcc-4.7 (LP: #1007969)

73. By Colin Watson on 2012-03-30

releasing version 0.6.6-1ubuntu1

72. By Colin Watson on 2012-03-30

merge from Debian 0.6.6-1

71. By Micah Gersten on 2012-02-16

* 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