Last commit made on 2014-02-18
Get this branch:
git clone -b ubuntu/trusty https://git.launchpad.net/ubuntu/+source/aptitude
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

9671c67... by Adam Conrad on 2014-02-17

Import patches-unapplied version to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 7965f2dcf38353c895edba2648474688ac71cd0d

New changelog entries:
  * debian/rules: Force -O2 to work around FTBFS with -O3.

7965f2d... by Dimitri John Ledkov on 2013-10-21

Import patches-unapplied version to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: ce893a4bfb462c7e63f4e9b3b2b1c3d42c83783a

New changelog entries:
  * No change rebuild for Boost 1.54 transition.

ce893a4... by Brian Murray on 2013-09-24

Import patches-unapplied version to ubuntu/saucy-proposed

Imported using git-ubuntu import.

Changelog parent: 74c8b4cad9905fa556cbb860a1bcaba407770066

New changelog entries:
  * 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

74c8b4c... by Dimitri John Ledkov on 2013-08-02

Import patches-unapplied version to ubuntu/saucy-proposed

Imported using git-ubuntu import.

Changelog parent: 8be07cfa0181db414a2ce92ba84b960b4ea68d90

New changelog entries:
  * 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.

8be07cf... by Daniel Hartwig on 2012-11-05

Import patches-unapplied version to debian/sid

Imported using git-ubuntu import.

Changelog parent: aaba0d5a83694f0a9fc6ebe46ccdc5c36e1d54cc

New changelog entries:
  * [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
  * [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 (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.

aaba0d5... by Daniel Hartwig on 2012-09-25

Import patches-unapplied version to debian/sid

Imported using git-ubuntu import.

Changelog parent: 1b5c9494fe1f6182c06137a84789929290cddbd8

New changelog entries:
  * Use xz compression for all binaries. (Closes: #687294)

1b5c949... by Daniel Hartwig on 2012-08-28

Import patches-unapplied version to debian/sid

Imported using git-ubuntu import.

Changelog parent: 303d4aebfaa2157bdecad202ded1e22faab79e39

New changelog entries:
  * Multi-arch update for the problem resolver:
    - handle conflicts without removing all foreign-arch
      packages (Closes: #672340) (LP: #831768)
    - correctly recognise dependencies solved by Multi-Arch:
      foreign packages (LP: #968412)
  * [curses]: Use dpkg package names when calling dpkg
              (Closes: #680333)
  * Add (temporary) helpers for interacting with dpkg.

303d4ae... by Daniel Hartwig on 2012-06-04

Import patches-unapplied version 0.6.8-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: f49f02b4e439b956006cf1e146eb39a1769a3171

New changelog entries:

  * Fix build with g++ 4.7
    Thanks Adrian Lang for the patch (Closes: #672335)
  * New binary packages:
    - aptitude-doc-it: Italian documentation (Closes: #674664)
    - aptitude-common: data files and translations
  * debian/rules:
    - use dh (debhelper command sequencer)
  * Require libapt-pkg 0.9.3 to avoid "Method http has died
    unexpectedly" (Closes: #669322)
  * Removed preinst script, the one transition it handled is
    over ten years old.
  * New upstream release.
    - Update to tasks support: task packages, multi-arch, syntax
      Task packages (introduced with tasksel 3.0) are
      meta-packages which define the dependencies of tasks. The
      packages themselves have always worked but the 'tasks'
      grouping policy and '?task' search term did not support
      them. This update corrects for this.
      As a result of this change to tasksel all Debian tasks now
      function exactly like meta-packages. (Closes: #382631)
      The syntax for installing tasks from the command line has
      been updated. It now supports specifying an arch and
      requires the same syntax as apt-utils ('^' must be the last
      part of the name). Examples:
        # aptitude install gnome-desktop^
        # aptitude install ssh-server^:armel
      This avoids ambiguity that may arise when a task and
      package have the same name.
    - Changelog downloading is restored
      (Closes: #669569, LP: #824708)
    - Exit with non-zero status when a package run is
      aborted. (Closes: #293008)
    - Restore candidate version on undo, keep
      (Closes: #529403)
    - Adjust default widths of localized columns:
      broken_count, downloadsize (Closes: #674045)
    - Update package views after 'Cancel pending actions'
      (Closes: #595753)
    - Fix minor errors in documentation. Thanks to Beatrice Torracca
      (Closes: #674675)
    - Fix groff warning in manpage (Closes: #675085)
    - Translation updates:
      + French (Closes: #673827, LP: #642840)
      + German (Closes: #672467, #668875)
      + Simplified Chinese

f49f02b... by Daniel Hartwig on 2012-05-03

Import patches-unapplied version 0.6.7-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 40225aafd738e0dfc0b388c6f7e857758c67b14d

New changelog entries:
  * Fix FTBFS in sid: include build of gtest when building gmock
   (Closes: #670403, #671439)
  * New upstream release.
    - Avoid dpkg and infinite loop in download-only mode
      (Closes: #629266, LP: #975793)
    - Check for apt_init errors in cmdline_download.cc (Closes: #670379)
    - Downloading/installing now locks /var/cache/apt/archives
      (Closes: #370381)
    - Actually use aptitude::Logging::Levels (Closes: #654344)
    - No longer use ListUpdate (from libapt-pkg) to update package lists.
      Instead, restore the previous code and update it to include the
      semantics from ListUpdate which were missing.
      ListUpdate was too coarse to suit download_update_manager properly
      even though it more-or-less worked.
    - Do not call debtags on list update. This was a rather unsightly
      kludge is better suited as a script for APT::Update::Post-Invoke.
    - Use arch-qualified names in 'Provided by' for virtual packages
      (LP: #972847)
    - Preview screen ignores Pkg-Display-Limit
      Previously it would apply that limit if UI::Preview-Limit was not
      set. This was causing confusion and it is more useful to have these
      as two clearly distinct settings. (LP: #381507)
    - New translations:
      + Croatian (Closes: #667934)
  * Use export to really enable build hardening, etc.
  * debian/control: remove traces of aptitude-gtk:
    - aptitude: description
    - aptitude-dbg: build-depends

40225aa... by Daniel Hartwig on 2012-03-27

Import patches-unapplied version 0.6.6-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 882254fcbaeb7fc88ee66addc0b0eaf2740e4c2c

New changelog entries:
  * New upstream release.
    - Basic multi-arch support. See NEWS for details.
      + add search terms ?architecture and ?multiarch;
      + add grouping policy 'architecture';
      (Closes: #659079, #661744)
      (LP: #454941, #845136, #884945, #904486)
    - Apply patch from Ubuntu to fix build -D_FORTIFY_SOURCE=2 errors.
      Thanks to Colin Watson and Michael Vogt (Closes: #497539)
    - Remove GTK+ menu entry for minesweeper. (Closes: #552522)
    - Hack to prevent debug messages dumping to the screen (Closes: #651748)
    - Fix '?action(upgrade)' and others (were finding kept
      packages instead). Thanks to 'Rogier' for the patch (Closes: #603862)
    - List update errors are reported. (Closes: #451137)
    - List update now runs APT::Update hooks. (Closes: #476399)
    - Actually silence progress messages with '-q2'. (Closes: #141719)
    - Fix various locking issues:
      + '[auto]clean' locks /var/cache/apt/archives;
      + 'update' locks /var/lib/apt/lists; (Closes: #653479)
    - Fix 'priority' cost level in resolver. The values should
      have been negated but were not. Thanks to Modestas Vainius
      for this one. (Closes: #608786)
    - Fix some help and prompt strings which wrongly included
      localized names for commands such as 'why'. (Closes: #486615)
    - Change ordering of top-level sections to match the order
      in aptitude::Sections::Top-Sections. The default order
      is now: main, contrib, non-free. (Closes: #181997)
    - Improve error messages when parsing grouping policies to
      use the user-visible names, rather than the internal
      names. (Closes: #231595)
    - Change default width of %D, %I, %o, and %Z. Thanks to
      Michał Kułach for this one. (Closes: #599209) (LP: #741417)
    - Change default width of %V, %v to 14. This greatly increases the
      number of versions which will display completely. (Closes: #624542)
    - 'versions' now groups it's results by 'package:arch' instead of
    - Cleared up grouping, sorting policy error messages.
      (Closes: #231595)
    - Minor correction to the user's manual. (Closes: #365485)
    - Translation updates:
      + Brazilian Portuguese (Closes: #483964)
      + Hungarian (Closes: #592468)
      + Polish (Closes: #659803)
      + Russian (Closes: #662624)
  * No longer supplying aptitude-gtk. It can still be compiled from the
    source but this was an experimental interface that was never finished.
    Anyone interested in continuing either of the GTK+ or Qt interfaces
    should contact the mailing list:
    - Dropped Build-Depends: needed only for aptitude-gtk.
  * Enable build hardening.
  * Bump debian/compat to level 9, use dh_auto_configure.
    - Adds cross build support. (Closes: #465076)
  * Add empty build-arch, build-indep targets. (Closes: #648490)
  * Extend aptitude-doc-* packages to include a more complete description
    of the program.
  * Update README.Debian with details of Git repository.
  * Support DEB_BUILD_OPTIONS=nocheck to disable tests.