lp://qastaging/~adam-stokes/ubuntu/raring/aptitude/merge-0.6.8.2

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

78. By Adam Stokes on 2013-01-25

debian/patches/no-google-mock: Dropped since package exists in main.

77. By Adam Stokes on 2013-01-24

* Merge from Debian unstable (LP #1103541)
  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: dropped since package exists in main.
* [all]: Support for matching architectures using specification
         strings and wildcards (for example, "linux-any"). See
         Debian Policy section 11.1 "Architecture specification
         strings" for more details.
* [cmdline]: Fix typo which prevented installing tasks using the
             apt-get compatible syntax ("aptitude install
             gnome-desktop^").
* [cmdline]: Do not assume that APT::Default-Release always provides
             the candidate version of a package, instead use the
             policy defined by apt_preferences(5).
             (Closes: #587775, #631464, #686316)
* [all]: Download changelogs from APT::Changelogs::Server instead
         of a fixed location, and replace very ancient and disused
         option for Aptitude::Changelog-URL-Template.
         (Closes: #687239)
* Documentation:
  - Update for default value of APT::AutoRemove::SuggestsImportant
    which is "true" since apt 0.8.15.3. (Closes: #685310)
  - Correctly reference APT::AutoRemove::RecommendsImportant and
    SuggestsImportant which do not contain any hyphens.
    (Closes: #579071)
* Translation updates:
  - Czech (Closes: #681693)
  - French (Closes: #680040, #685084)
  - Polish (Closes: #678153)
  - Russian (Closes: #686016)
  - Spanish (Closes: #686752)
* debian/control: Bump Build-Depends on libapt-pkg-dev to (>= 0.9.7) for
  architecture specification string support.

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

70. By Michael Vogt on 2012-01-30

also build against the new libept

69. By Michael Vogt on 2012-01-30

rebuild against latest libapt