diff -pruN 0.8.13-3/debian/changelog 0.8.13-3ubuntu1/debian/changelog --- 0.8.13-3/debian/changelog 2021-02-14 06:07:06.000000000 +0000 +++ 0.8.13-3ubuntu1/debian/changelog 2021-04-01 22:53:05.000000000 +0000 @@ -1,3 +1,12 @@ +aptitude (0.8.13-3ubuntu1) hirsute; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - d/p/03_branding: Ubuntu branding. + - d/p/04_changelog: Take changelogs from changelogs.ubuntu.com. + - Force -O2 build to resolve FTBFS on ppc64el. + + -- Logan Rosen Thu, 01 Apr 2021 18:53:05 -0400 + aptitude (0.8.13-3) unstable; urgency=medium * Add lintian overrides for tons of overzealous @@ -10,6 +19,21 @@ aptitude (0.8.13-3) unstable; urgency=me -- Axel Beckert Sun, 14 Feb 2021 07:07:06 +0100 +aptitude (0.8.13-2ubuntu2) hirsute; urgency=medium + + * No-change rebuild for boost soname change. + + -- Matthias Klose Sat, 12 Dec 2020 13:02:55 +0100 + +aptitude (0.8.13-2ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changesa + - 03_branding: Ubuntu branding. + - 04_changelog: Take changelogs from changelogs.ubuntu.com. + - Try forcing -O2 build, to resolve FTBFS on ppc64el. + + -- Julian Andres Klode Wed, 11 Nov 2020 16:21:06 +0100 + aptitude (0.8.13-2) unstable; urgency=medium * Drop fix-ftbfs-with-po4a-0.58.patch and build-depend on po4a versions @@ -86,6 +110,37 @@ aptitude (0.8.12-2) unstable; urgency=me -- Julian Andres Klode Sun, 08 Mar 2020 15:00:25 +0100 +aptitude (0.8.12-1ubuntu4) focal; urgency=high + + * Update for apt 1.9.11 + + -- Julian Andres Klode Thu, 27 Feb 2020 09:14:00 +0100 + +aptitude (0.8.12-1ubuntu3) focal; urgency=medium + + * Handle APT's _error becoming a smart pointer thingy, breaking the build + because it references _error directly rather than _error->. + + -- Julian Andres Klode Wed, 19 Feb 2020 13:51:33 +0100 + +aptitude (0.8.12-1ubuntu2) focal; urgency=medium + + * No change rebuild against new boost1.71 ABI + + -- Dimitri John Ledkov Mon, 03 Feb 2020 19:52:52 +0000 + +aptitude (0.8.12-1ubuntu1) focal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - 03_branding: Ubuntu branding. + - 04_changelog: Take changelogs from changelogs.ubuntu.com. + - Try forcing -O2 build, to resolve FTBFS on ppc64el. + * Dropped changes, included in Debian: + - Adjust multi_index_container use for boost >= 1.66 + - Port to APT 1.9.0 + + -- Steve Langasek Thu, 31 Oct 2019 15:10:04 -0700 + aptitude (0.8.12-1) unstable; urgency=medium * New upstream release. Please see /usr/share/aptitude/NEWS for a change @@ -184,6 +239,33 @@ aptitude (0.8.11-4) unstable; urgency=me -- Manuel A. Fernandez Montecelo Fri, 16 Nov 2018 03:35:30 +0100 +aptitude (0.8.11-3ubuntu3) eoan; urgency=medium + + * Port to APT 1.9.0 + + -- Julian Andres Klode Tue, 18 Jun 2019 11:31:06 +0200 + +aptitude (0.8.11-3ubuntu2) eoan; urgency=high + + * No change rebuild against apt 1.9.0. + + -- Julian Andres Klode Mon, 17 Jun 2019 13:08:52 +0200 + +aptitude (0.8.11-3ubuntu1) disco; urgency=low + + * Merge from Debian unstable. Remaining changes: + - 03_branding: Ubuntu branding. + - 04_changelog: Take changelogs from changelogs.ubuntu.com. + - Try forcing -O2 build, to resolve FTBFS on ppc64el. + - Adjust multi_index_container use for boost >= 1.66 (merged upstream) + * Dropped changes: + - Allow older gmock so we can build again (not needed anymore) + - Build with -std=c++14 (code uses C++17 features now) + - 14_html2text_preferred: we are no longer in main, so we can build + with elinks now + + -- Julian Andres Klode Tue, 13 Nov 2018 13:57:03 +0100 + aptitude (0.8.11-3) unstable; urgency=medium [ Axel Beckert ] @@ -237,6 +319,37 @@ aptitude (0.8.11-1) experimental; urgenc -- Manuel A. Fernandez Montecelo Sun, 29 Jul 2018 18:09:10 +0200 +aptitude (0.8.10-9ubuntu4) cosmic; urgency=medium + + * Adjust multi_index_container use for boost >= 1.66 + + -- Julian Andres Klode Mon, 03 Sep 2018 16:33:32 +0200 + +aptitude (0.8.10-9ubuntu3) cosmic; urgency=medium + + * No-change rebuild for boost soname change. + + -- Matthias Klose Tue, 17 Jul 2018 12:52:53 +0000 + +aptitude (0.8.10-9ubuntu2) cosmic; urgency=medium + + * Allow older gmock so we can build again + + -- Julian Andres Klode Thu, 03 May 2018 22:36:12 +0200 + +aptitude (0.8.10-9ubuntu1) cosmic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - 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). + - Try forcing -O2 build, to resolve FTBFS on ppc64el. + + -- Julian Andres Klode Thu, 03 May 2018 12:11:34 +0100 + aptitude (0.8.10-9) unstable; urgency=medium * Release to unstable @@ -264,6 +377,19 @@ aptitude (0.8.10-7) unstable; urgency=me -- Manuel A. Fernandez Montecelo Fri, 27 Apr 2018 01:31:22 +0200 +aptitude (0.8.10-6ubuntu1) bionic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - 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). + - Try forcing -O2 build, to resolve FTBFS on ppc64el. + + -- Julian Andres Klode Fri, 19 Jan 2018 12:30:23 +0100 + aptitude (0.8.10-6) unstable; urgency=medium * Bump Breaks/Replaces of aptitude-common to aptitude (<< 0.8.10-4) from @@ -318,6 +444,19 @@ aptitude (0.8.10-4) experimental; urgenc -- Manuel A. Fernandez Montecelo Sun, 14 Jan 2018 23:02:55 +0100 +aptitude (0.8.10-3ubuntu1) bionic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - 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). + - Try forcing -O2 build, to resolve FTBFS on ppc64el. + + -- Julian Andres Klode Thu, 11 Jan 2018 11:54:46 +0100 + aptitude (0.8.10-3) unstable; urgency=medium * Reinstate elinks and librsvg2-bin as arch-dependent Build-Depends to @@ -339,6 +478,19 @@ aptitude (0.8.10-2) unstable; urgency=me -- Manuel A. Fernandez Montecelo Wed, 03 Jan 2018 22:22:19 +0100 +aptitude (0.8.10-1ubuntu1) bionic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - 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). + - Try forcing -O2 build, to resolve FTBFS on ppc64el. + + -- Julian Andres Klode Wed, 03 Jan 2018 23:12:24 +0100 + aptitude (0.8.10-1) unstable; urgency=medium [ Manuel A. Fernandez Montecelo ] @@ -529,6 +681,44 @@ aptitude (0.8.4-1) unstable; urgency=med -- Manuel A. Fernandez Montecelo Tue, 27 Dec 2016 23:27:07 +0100 +aptitude (0.8.3-1ubuntu5) bionic; urgency=medium + + * No-change rebuild for boost soname change. + + -- Matthias Klose Thu, 26 Oct 2017 17:09:01 +0000 + +aptitude (0.8.3-1ubuntu4) zesty; urgency=medium + + * No-change rebuild for libxapian30 + + -- Iain Lane Wed, 02 Nov 2016 11:48:55 +0000 + +aptitude (0.8.3-1ubuntu3) zesty; urgency=high + + * No change rebuild against boost1.62. + + -- Dimitri John Ledkov Tue, 01 Nov 2016 16:08:26 +0000 + +aptitude (0.8.3-1ubuntu2) zesty; urgency=medium + + * Update d/patches/04_changelog with patches from PÁLFALVI Tamás to restore + aptitude changelog functionality. (LP: #1583226) + + -- Michael Hudson-Doyle Thu, 27 Oct 2016 12:24:27 +1300 + +aptitude (0.8.3-1ubuntu1) yakkety; urgency=medium + + * Merge with Debian; remaining changes: + - 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). + - Try forcing -O2 build, to resolve FTBFS on ppc64el. + + -- Matthias Klose Tue, 06 Sep 2016 14:46:35 +0200 + aptitude (0.8.3-1) unstable; urgency=medium [ Manuel A. Fernandez Montecelo ] @@ -554,6 +744,25 @@ aptitude (0.8.3-1) unstable; urgency=med -- Manuel A. Fernandez Montecelo Sun, 07 Aug 2016 12:00:02 +0100 +aptitude (0.8.2-1ubuntu2) yakkety; urgency=medium + + * No-change rebuild for boost soname change. + + -- Matthias Klose Thu, 04 Aug 2016 08:09:50 +0000 + +aptitude (0.8.2-1ubuntu1) yakkety; urgency=medium + + * Merge with Debian; remaining changes: + - 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). + - Try forcing -O2 build, to resolve FTBFS on ppc64el. + + -- Matthias Klose Tue, 02 Aug 2016 15:06:43 +0200 + aptitude (0.8.2-1) unstable; urgency=medium [ Manuel A. Fernandez Montecelo ] @@ -627,6 +836,45 @@ aptitude (0.8.1-1) unstable; urgency=low -- Manuel A. Fernandez Montecelo Thu, 05 May 2016 20:50:08 +0100 +aptitude (0.8-1ubuntu1) yakkety; urgency=medium + + * Merge with Debian; remaining changes: + - 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). + - Try forcing -O2 build, to resolve FTBFS on ppc64el. + + -- Matthias Klose Thu, 28 Apr 2016 23:50:03 +0200 + +aptitude (0.8.1-1) unstable; urgency=low + + [ Manuel A. Fernandez Montecelo ] + * New upstream release. Please see /usr/share/aptitude/NEWS for a change + log with more details. + + - Bug fixes: + * Install new Essential or Required packages with the commands + "full-upgrade" (command line) and MarkUpgradable ('U' in the curses + interface) (Closes: #555896, #757028) + * Do not prevent to remove/purge aptitude if already removed or purged + (Closes: #822331) + * [curses] Indent section descriptions in subtrees (Closes: #103416) + * Invoke the resolver for unfulfilled Recommends only once + (Closes: #822329) + * [curses] Be more verbose when quitting after dpkg actions + (Closes: #822560) + + - Translation updates: + * ja.po: Japanese translation by Takuma Yamada (Closes: #822208) + * nl.po: Dutch translation by Frans Spiesschaert (Closes: #822889) + * Dutch documentation translation by Frans Spiesschaert + (Closes: #822890) + + -- Manuel A. Fernandez Montecelo Thu, 05 May 2016 20:50:08 +0100 + aptitude (0.8-1) unstable; urgency=low [ Manuel A. Fernandez Montecelo ] @@ -1079,6 +1327,30 @@ aptitude (0.7.5-1) unstable; urgency=low -- Manuel A. Fernandez Montecelo Tue, 08 Dec 2015 22:14:03 +0000 +aptitude (0.7.4-2ubuntu3) yakkety; urgency=medium + + * No-change rebuild for boost soname change. + + -- Matthias Klose Sat, 23 Apr 2016 18:36:44 +0000 + +aptitude (0.7.4-2ubuntu2) xenial; urgency=high + + * Try forcing -O2 build, to resolve FTBFS on ppc64el. + + -- Dimitri John Ledkov Wed, 09 Dec 2015 18:56:17 +0000 + +aptitude (0.7.4-2ubuntu1) xenial; urgency=low + + * Merge from Debian unstable. Remaining changes: + - 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). + + -- Michael Vogt Tue, 01 Dec 2015 07:46:08 +0100 + aptitude (0.7.4-2) unstable; urgency=high * Cherry-pick patch cfc3c6b9 from master to fix build against APT 1.1. @@ -1137,6 +1409,18 @@ aptitude (0.7.4-1) unstable; urgency=low -- Manuel A. Fernandez Montecelo Fri, 16 Oct 2015 13:28:08 +0100 +aptitude (0.7.3-1ubuntu1) wily; urgency=medium + + * Merge with Debian; remaining changes: + - 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). + + -- Rico Tzschichholz Mon, 12 Oct 2015 15:32:41 +0200 + aptitude (0.7.3-1) unstable; urgency=low * New upstream release. Please see /usr/share/aptitude/NEWS for a change @@ -1363,6 +1647,24 @@ aptitude (0.7.1-1) unstable; urgency=med -- Manuel A. Fernandez Montecelo Sat, 05 Sep 2015 23:57:57 +0100 +aptitude (0.7-1ubuntu1.1) wily; urgency=medium + + * No change rebuild against libapt-pkg4.16 + + -- Michael Vogt Mon, 05 Oct 2015 16:00:59 +0200 + +aptitude (0.7-1ubuntu1) wily; urgency=medium + + * Merge with Debian; remaining changes: + - 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). + + -- Matthias Klose Wed, 05 Aug 2015 21:29:36 +0200 + aptitude (0.7-1) unstable; urgency=medium [ Manuel A. Fernandez Montecelo ] @@ -1418,6 +1720,35 @@ aptitude (0.7-1) unstable; urgency=mediu -- Axel Beckert Wed, 05 Aug 2015 19:05:18 +0200 +aptitude (0.6.11-1ubuntu3) vivid; urgency=medium + + * Fix 04_changelog (LP: #1383789) + + -- Rico Tzschichholz Mon, 09 Feb 2015 13:31:56 +0100 + +aptitude (0.6.11-1ubuntu2) utopic; urgency=low + + * debian/rules: Force -O2 to work around FTBFS with -O3. + + -- Michael Vogt Wed, 16 Jul 2014 17:30:48 +0200 + +aptitude (0.6.11-1ubuntu1) utopic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - 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). + * Patches dropped (applied upstream): + - gcc-4.8 + - fixgtest.patch + - 0001-fix-FTBFS-with-Boost-1.53.patch + - 0002-support-again-Boost-1.53.patch (and dh-autoreconf) + + -- Michael Vogt Wed, 16 Jul 2014 15:19:46 +0200 + aptitude (0.6.11-1) unstable; urgency=medium * Includes fix for FTBFS with gcc-4.9. @@ -1551,6 +1882,52 @@ aptitude (0.6.8.2-1.1) unstable; urgency -- Andreas Barth Fri, 16 Aug 2013 13:19:40 +0000 +aptitude (0.6.8.2-1ubuntu5) utopic; urgency=high + + * No change rebuild against boost1.55. + + -- Dimitri John Ledkov Sat, 26 Apr 2014 23:25:57 +0100 + +aptitude (0.6.8.2-1ubuntu4) trusty; urgency=medium + + * debian/rules: Force -O2 to work around FTBFS with -O3. + + -- Adam Conrad Mon, 17 Feb 2014 16:35:55 -0700 + +aptitude (0.6.8.2-1ubuntu3) trusty; urgency=low + + * No change rebuild for Boost 1.54 transition. + + -- Dmitrijs Ledkovs Mon, 21 Oct 2013 14:02:47 +0100 + +aptitude (0.6.8.2-1ubuntu2) saucy; urgency=low + + * 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 + + -- Brian Murray Mon, 23 Sep 2013 17:05:47 -0700 + +aptitude (0.6.8.2-1ubuntu1) saucy; urgency=low + + * 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. + + -- Dmitrijs Ledkovs Fri, 02 Aug 2013 14:36:22 +0100 + aptitude (0.6.8.2-1) unstable; urgency=low * [all]: Support for matching architectures using specification @@ -1585,6 +1962,34 @@ aptitude (0.6.8.2-1) unstable; urgency=l -- Daniel Hartwig Mon, 05 Nov 2012 09:52:12 +0800 +aptitude (0.6.8.1-2ubuntu3) saucy; urgency=low + + * Cherry pick patch by Nick Black to fix FTBFS with boost1.53. + + -- Dmitrijs Ledkovs Sat, 04 May 2013 00:54:20 +0100 + +aptitude (0.6.8.1-2ubuntu2) raring; urgency=low + + * Fix build failure with GCC 4.8. + + -- Matthias Klose Tue, 26 Feb 2013 09:14:45 +0100 + +aptitude (0.6.8.1-2ubuntu1) quantal; urgency=low + + * 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. + + -- Michael Terry Wed, 03 Oct 2012 22:55:21 -0400 + aptitude (0.6.8.1-2) unstable; urgency=low * Use xz compression for all binaries. (Closes: #687294) @@ -1604,6 +2009,21 @@ aptitude (0.6.8.1-1) unstable; urgency=l -- Daniel Hartwig Tue, 28 Aug 2012 11:39:01 +0800 +aptitude (0.6.8-1ubuntu1) quantal; urgency=low + + * 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. + + -- Marcin Juszkiewicz Mon, 02 Jul 2012 12:48:26 +0200 + aptitude (0.6.8-1) unstable; urgency=low * Fix build with g++ 4.7 @@ -1707,6 +2127,30 @@ aptitude (0.6.7-1) unstable; urgency=low -- Daniel Hartwig Thu, 03 May 2012 15:57:42 +0800 +aptitude (0.6.6-1ubuntu2) quantal; urgency=low + + * Fix FTBFS with gcc-4.7 (LP: #1007969) + + -- Dmitrijs Ledkovs Fri, 29 Jun 2012 01:48:31 +0100 + +aptitude (0.6.6-1ubuntu1) precise; urgency=low + + * 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. + - 11_ubuntu_uses_sudo: Fix status line of 'Become root' menu entry to + not refer to su. + - 12_point_manpage_to_doc_package: Point Finnish manpage to the correct + place for further info. + - 14_html2text_preferred: Switch back to html2text in favor of elinks, + since html2text is in main and elinks isn't. + - no-google-mock: Don't use google-mock as it and libgtest-dev are in + universe. + + -- Colin Watson Fri, 30 Mar 2012 18:00:04 +0100 + aptitude (0.6.6-1) unstable; urgency=low * New upstream release. @@ -1803,6 +2247,35 @@ aptitude (0.6.6-1) unstable; urgency=low -- Daniel Hartwig Tue, 27 Mar 2012 17:02:31 +0800 +aptitude (0.6.5-1ubuntu1) precise; urgency=low + + * 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 + + -- Micah Gersten Thu, 16 Feb 2012 02:24:09 -0600 + aptitude (0.6.5-1) unstable; urgency=low [ Christian Perrier ] @@ -1897,6 +2370,51 @@ aptitude (0.6.4-1.1) unstable; urgency=l -- Philipp Kern Sun, 16 Oct 2011 22:29:57 +0200 +aptitude (0.6.4-1ubuntu5) precise; urgency=low + + * also build against the new libept + + -- Michael Vogt Mon, 30 Jan 2012 12:33:23 +0100 + +aptitude (0.6.4-1ubuntu4) precise; urgency=low + + * rebuild against latest libapt + + -- Michael Vogt Mon, 30 Jan 2012 11:03:37 +0100 + +aptitude (0.6.4-1ubuntu3) precise; urgency=low + + * No-change rebuild to drop spurious libsfgcc1 dependency on armhf. + + -- Adam Conrad Fri, 02 Dec 2011 17:34:28 -0700 + +aptitude (0.6.4-1ubuntu2) oneiric; urgency=low + + * rebuild against the latest apt + + -- Michael Vogt Mon, 08 Aug 2011 14:35:33 +0200 + +aptitude (0.6.4-1ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. 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. + * dropped 01_intltool_update.dpatch + * updated 15_ftbfs_new_apt + + -- Michael Vogt Wed, 22 Jun 2011 12:32:56 +0200 + aptitude (0.6.4-1) unstable; urgency=low * New upstream release. @@ -1928,6 +2446,32 @@ aptitude (0.6.3-4) unstable; urgency=low -- Daniel Burrows Sat, 02 Apr 2011 13:55:04 -0700 +aptitude (0.6.3-3.2ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining changes: + - debian/05aptitude: never autoremove kernels + - drop aptitude-doc to Suggests + - 01_intltool_update.dpatch: run intltool-update against the source + directory, so that irrelevant cosmetic .po file changes don't end up + tangled in other patches. + - 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 + - debian/rules: build with --disable-werror + - 14_html2text_preferred.dpatch: switch back to html2text in favor of + elinks, since html2text is in main and elinks isn't. + * dropped: + - 13_screensize.dpatch: applied upstream + - 15_ftbfs_new_apt.dpatch: applied upstream + + -- Michael Vogt Thu, 18 Nov 2010 09:46:28 +0100 + aptitude (0.6.3-3.2) unstable; urgency=low * Non-maintainer upload. @@ -1962,6 +2506,62 @@ aptitude (0.6.3-3) unstable; urgency=low -- Daniel Burrows Sat, 10 Jul 2010 13:44:48 -0700 +aptitude (0.6.3-2ubuntu4) maverick; urgency=low + + * debian/patches/15_ftbfs_new_apt: + - fix FTBFS with latest apt + + -- Michael Vogt Mon, 27 Sep 2010 13:47:55 +0200 + +aptitude (0.6.3-2ubuntu3) maverick; urgency=low + + * debian/patches/15_ftbfs_new_apt: + - fix build failure with latest apt + * debian/control: + - build depend on latest libapt, libept-dev + + -- Michael Vogt Thu, 29 Jul 2010 14:58:26 +0200 + +aptitude (0.6.3-2ubuntu2) maverick; urgency=low + + * debian/patches/no-google-mock: don't build the boost tests either; they + also require gmock.h and while this didn't cause a build failure in my + local chroot, it does on the buildds, and there's no sense in running a + test we know will fail. + + -- Steve Langasek Sat, 10 Jul 2010 16:40:21 +0000 + +aptitude (0.6.3-2ubuntu1) maverick; urgency=low + + * Merge from Debian unstable, remaining changes: + - debian/05aptitude: never autoremove kernels + - drop aptitude-doc to Suggests + - 01_intltool_update.dpatch: run intltool-update against the source + directory, so that irrelevant cosmetic .po file changes don't end up + tangled in other patches. + - 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 + - 13_screensize.dpatch: fix a bug that stops outputting aptitude + downloads on big screens + - debian/rules: build with --disable-werror + - 14_html2text_preferred.dpatch: switch back to html2text in favor of + elinks, since html2text is in main and elinks isn't. + * Dropped changes, superseded in Debian: + - Drop dpatch, switch to 3.0 (quilt) source format + * Drop build-dependency on google-mock/libgtest-dev and disable the test + suite at build time; google-mock hasn't built in Ubuntu and is in + universe. This should probably be revisited once google-mock is + buildable in Ubuntu. + + -- Steve Langasek Fri, 09 Jul 2010 11:09:33 -0700 + aptitude (0.6.3-2) unstable; urgency=low * Cherry-pick an upstream patch that fixes the Makefiles so that files @@ -2046,6 +2646,40 @@ aptitude (0.6.2-1) unstable; urgency=low -- Daniel Burrows Sun, 18 Apr 2010 08:45:16 -0700 +aptitude (0.6.1.5-3ubuntu1) maverick; urgency=low + + * Merge from Debian unstable, 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 manpages to the correct + place for further info + - 13_screensize.dpatch: fix a bug that stops outputting aptitude + downloads on big screens + - debian/rules: build with --disable-werror + * Dropped changes, superseded in Debian: + - debian/control: depend on debhelper 5 or later (lintian warning) + - aptitude-0.4.11.11/doc/fi/fixman: comment line to fix FTBFS + * Drop 07_hide_recommends_warning.dpatch, which wasn't being applied anyway + * Drop 10_gcc44.dpatch, apparently these headers are now being included + elsewhere because the package no longer fails to build. + * 01_intltool_update.dpatch: run intltool-update against the source + directory, since the po/ directory in the upstream tarball doesn't match + the source! + * 12_point_manpage_to_doc_package.dpatch: German manpage is now built with + po4a, so this is now only applicable to the Finnish manpage + * 14_html2text_preferred.dpatch: switch back to html2text in favor of + elinks, since html2text is in main and elinks isn't. + * Drop dpatch, switch to 3.0 (quilt) source format + + -- Steve Langasek Sun, 20 Jun 2010 01:17:51 +0000 + aptitude (0.6.1.5-3) unstable; urgency=low * Backport changes from head to increase how long the resolver is @@ -2439,6 +3073,119 @@ aptitude (0.5.0-1) experimental; urgency -- Daniel Burrows Tue, 11 Nov 2008 20:39:29 -0800 +aptitude (0.4.11.11-1ubuntu10) lucid; urgency=low + + * 13_screensize.dpatch: + - Fix to avoid overflowing the BlankLine buffer. (LP: #515525) + + -- Anders Kaseorg Thu, 08 Apr 2010 00:28:08 -0400 + +aptitude (0.4.11.11-1ubuntu9) lucid; urgency=low + + * 13_screensize.dpatch: + - Fixes a bug that stops outputting aptitude downloads on big screens (LP: #391035). + + -- Jean-Louis Dupond Mon, 08 Feb 2010 20:42:30 +0100 + +aptitude (0.4.11.11-1ubuntu8) lucid; urgency=low + + * No-change rebuild against fixed apt ABI + + -- Michael Vogt Wed, 23 Dec 2009 15:03:02 +0100 + +aptitude (0.4.11.11-1ubuntu7) lucid; urgency=low + + * No-change rebuild to handle libapt ABI changes (LP: #499631). + + -- Kees Cook Tue, 22 Dec 2009 23:17:50 -0800 + +aptitude (0.4.11.11-1ubuntu6) karmic; urgency=low + + * rebuild against latest libapt + + -- Michael Vogt Fri, 25 Sep 2009 23:29:18 +0200 + +aptitude (0.4.11.11-1ubuntu5) karmic; urgency=low + + * point manpages to the correct place for further info (LP: #348548) + * debian/control: depend on debhelper 5 or later (lintian warning) + + -- Rolf Leggewie Fri, 31 Jul 2009 04:42:04 +0200 + +aptitude (0.4.11.11-1ubuntu4) karmic; urgency=low + + * 04_changelog.dpatch: + - point to the right changelog download location in the aptitude + options (LP: #400083) + + -- Rolf Leggewie Thu, 16 Jul 2009 02:28:52 +0200 + +aptitude (0.4.11.11-1ubuntu3) karmic; urgency=low + + * debian/patches/11_ubuntu_uses_sudo.dpatch: + Fix status line of 'Become root' menu entry to not refer to su. + (LP: #139661) + + -- Rolf Leggewie Fri, 12 Jun 2009 15:59:11 +0000 + +aptitude (0.4.11.11-1ubuntu2) karmic; urgency=low + + * debian/rules: + - build with --disable-werror + * aptitude-0.4.11.11/doc/fi/fixman: + - comment line to fix FTBFS + * debian/patches/10_gcc44.dpatch: + - fixes for gcc 4.4 + + -- Michael Vogt Wed, 03 Jun 2009 11:12:10 +0200 + +aptitude (0.4.11.11-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - 03_branding.dpatch: ubuntu branding + - 04_changelog.dpatch: take changelogs from changelogs.ubuntu.com + - 07_hide_recommends_warning.dpatch: do not show a warning about + missing recommends + - 11_gxx43.dpatch:build tests without -Werror + - 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. + - make aptitude-doc to Suggests + * rebuild against latest libapt + + -- Michael Vogt Mon, 09 Feb 2009 15:14:30 +0100 + +aptitude (0.4.11.11-1) unstable; urgency=low + + * New upstream release. + + - Translation updates: + + Catalan (Closes: #499464) + + German (Closes: #500444) + + Greek (Closes: #498583) + + Romanian (Closes: #502413) + + Slovak (Closes: #498910) + + Spanish (Closes: #501096, #502695, #502696, #502697) + + -- Daniel Burrows Wed, 19 Nov 2008 19:57:40 -0800 + +aptitude (0.4.11.10-1lenny1.1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - 03_branding.dpatch: ubuntu branding + - 04_changelog.dpatch: take changelogs from changelogs.ubuntu.com + - 07_hide_recommends_warning.dpatch: do not show a warning about + missing recommends + - 11_gxx43.dpatch:build tests without -Werror + - 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. + - make aptitude-doc to Suggests + * droppend, taken by upstream: + - 08_ubuntu_default_source.dpatch + + -- Michael Vogt Mon, 17 Nov 2008 10:28:03 +0100 + aptitude (0.4.11.10-1lenny1.1) testing-proposed-updates; urgency=low * Non-maintainer upload. @@ -2447,6 +3194,12 @@ aptitude (0.4.11.10-1lenny1.1) testing-p -- Christian Perrier Sat, 25 Oct 2008 10:37:09 +0200 +aptitude (0.4.11.10-1lenny1) testing-proposed-updates; urgency=low + + * Upload to testing-proposed-updates. + + -- Daniel Burrows Sun, 05 Oct 2008 10:56:06 -0700 + aptitude (0.4.11.10-1) unstable; urgency=low * New upstream release. @@ -2574,6 +3327,33 @@ aptitude (0.4.11.4-1) unstable; urgency= -- Daniel Burrows Sat, 07 Jun 2008 17:05:21 -0700 +aptitude (0.4.11.3-1ubuntu3) intrepid; urgency=low + + * 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. + + -- Colin Watson Tue, 02 Sep 2008 12:45:30 +0100 + +aptitude (0.4.11.3-1ubuntu2) intrepid; urgency=low + + * Drop aptitude-doc to Suggests (LP: #252044). + + -- Colin Watson Tue, 02 Sep 2008 00:09:08 +0100 + +aptitude (0.4.11.3-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - 03_branding.dpatch: ubuntu branding + - 04_changelog.dpatch: take changelogs from changelogs.ubuntu.com + - 07_hide_recommends_warning.dpatch: do not show a warning about + missing recommends + - 08_ubuntu_default_source.dpatch: do not clean lists directory + on transient network failures + - 11_gxx43.dpatch:build tests without -Werror + + -- Michael Vogt Thu, 05 Jun 2008 10:13:45 +0200 + aptitude (0.4.11.3-1) unstable; urgency=low * New upstream release. @@ -2607,6 +3387,23 @@ aptitude (0.4.11.3-1) unstable; urgency= -- Daniel Burrows Mon, 26 May 2008 21:25:26 -0700 +aptitude (0.4.11.2-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - 03_branding.dpatch: ubuntu branding + - 04_changelog.dpatch: take changelogs from changelogs.ubuntu.com + - 07_hide_recommends_warning.dpatch: do not show a warning about + missing recommends + - 08_ubuntu_default_source.dpatch: do not clean lists directory + on transient network failures + - 11_gxx43.dpatch:build tests without -Werror + * Updated: + - 03_branding.dpatch + * Disabled 07_hide_recommends warning because we do install + recommends now by default too + + -- Michael Vogt Tue, 27 May 2008 10:28:10 +0200 + aptitude (0.4.11.2-1) unstable; urgency=low * New upstream release. @@ -2762,6 +3559,49 @@ aptitude (0.4.10-1) unstable; urgency=lo -- Daniel Burrows Sun, 16 Dec 2007 11:56:23 -0800 +aptitude (0.4.9-2ubuntu5) hardy; urgency=low + + * 12_fix_crash_from_hg.dpatch: + - cherry pick fix from hg to fix crash in the package view + * 13_build_with_current_cwdiget_from_hg.dpatch: + - make it build with latest cwidget + + -- Michael Vogt Thu, 03 Apr 2008 19:28:25 +0200 + +aptitude (0.4.9-2ubuntu4) hardy; urgency=low + + * Build with -Wno-deprecated to build with g++-4.3 as well. + + -- Matthias Klose Thu, 31 Jan 2008 17:28:30 +0100 + +aptitude (0.4.9-2ubuntu3) hardy; urgency=low + + * rebuild against latest apt + + -- Michael Vogt Thu, 13 Dec 2007 16:27:54 +0100 + +aptitude (0.4.9-2ubuntu2) hardy; urgency=low + + * 03_branding.dpatch, 04_changelog.dpatch: + - adjusted for current version + + -- Michael Vogt Tue, 27 Nov 2007 10:36:15 +0100 + +aptitude (0.4.9-2ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - 01_allow_unauthenticated.dpatch: add --allow-unauthenticated + - 03_branding.dpatch: ubuntu branding + - 04_changelog.dpatch: take changelogs from changelogs.ubuntu.com + - 07_hide_recommends_warning.dpatch: do not show a warning about + missing recommends + - 08_ubuntu_default_source.dpatch: do not clean lists directory + on transient network failures + - 11_gxx43.dpatch:build tests without -Werror + (thanks to Ryan Kavanagh for the initial merge) + + -- Michael Vogt Fri, 23 Nov 2007 15:39:29 +0100 + aptitude (0.4.9-2) unstable; urgency=low * Add a -dbg package. (Closes: #448884) @@ -2799,6 +3639,21 @@ aptitude (0.4.8-1) unstable; urgency=low -- Daniel Burrows Thu, 15 Nov 2007 21:58:20 -0800 +aptitude (0.4.7-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - 01_allow_unauthenticated.dpatch: add --allow-unauthenticated + - 03_branding.dpatch: ubuntu branding + - 04_changelog.dpatch: take changelogs from changelogs.ubuntu.com + - 07_hide_recommends_warning.dpatch: do not show a warning about + missing recommends + - 08_ubuntu_default_source.dpatch: do not clean lists directory + on transient network failures + - 11_gxx43.dpatch:build tests without -Werror + * dropped 10_dpkg_breaks.dpatch, taken upstream + + -- Michael Vogt Tue, 13 Nov 2007 10:32:27 +0100 + aptitude (0.4.7-1) unstable; urgency=low * New upstream release. @@ -2838,6 +3693,34 @@ aptitude (0.4.6.1-1.1) unstable; urgency -- Cyril Brulebois Sun, 30 Sep 2007 00:14:43 +0200 +aptitude (0.4.6.1-1ubuntu3) gutsy; urgency=low + + * Fix build failures with g++-4.3. LP: #138555. + * Build the tests without -Werror. + + -- Matthias Klose Fri, 14 Sep 2007 22:15:50 +0000 + +aptitude (0.4.6.1-1ubuntu2) gutsy; urgency=low + + * dpkg-triggers: Deal properly with new package states. + + -- Ian Jackson Wed, 15 Aug 2007 20:48:39 +0100 + +aptitude (0.4.6.1-1ubuntu1) gutsy; urgency=low + + * Build against latest apt + * Merge from debian unstable, remaining changes: + - 01_allow_unauthenticated.dpatch: add --allow-unauthenticated + - 03_branding.dpatch: ubuntu branding + - 04_changelog.dpatch: take changelogs from changelogs.ubuntu.com + - 07_hide_recommends_warning.dpatch: do not show a warning about + missing recommends + - 08_ubuntu_default_source.dpatch: do not clean lists directory + on transient network failures + - 10_dpkg_breaks.dpatch: support dpkg Breaks field + + -- Michael Vogt Fri, 03 Aug 2007 21:23:00 +0200 + aptitude (0.4.6.1-1) unstable; urgency=low * New upstream release (includes scripts I missed in the last release). @@ -2875,6 +3758,22 @@ aptitude (0.4.6-1) unstable; urgency=low -- Daniel Burrows Wed, 25 Jul 2007 21:39:50 -0700 +aptitude (0.4.5.4-1ubuntu1) gutsy; urgency=low + + * Merge from debian unstable to get better integration + with apt 0.7 + * dropped debian/patches/09_action_group_integration.dpatch, + - taken upstream + * debian/patches/10_dpkg_breaks.dpatch: + - updated + * moved debian/patches/06_no_auto_remove_kernels.dpatch + into debian/05aptitude + * debian/05aptitude: + - default to sudo as "Get-Root-Command" + - add linux-ubuntu-modules to never-autoremove pattern + + -- Michael Vogt Tue, 24 Jul 2007 09:52:29 +0200 + aptitude (0.4.5.4-1) unstable; urgency=low * Upload to unstable since aptitude has been binNMUed against the @@ -3083,6 +3982,39 @@ aptitude (0.4.4-5~1) experimental; urgen -- Daniel Burrows Tue, 15 May 2007 19:07:19 -0700 +aptitude (0.4.4-4ubuntu3) gutsy; urgency=low + + * another rebuild against latest apt + + -- Reinhard Tartler Sun, 08 Jul 2007 15:46:44 +0000 + +aptitude (0.4.4-4ubuntu2) gutsy; urgency=low + + * rebuild against latest apt + * bump build-depends + + -- Michael Vogt Tue, 19 Jun 2007 11:13:26 +0200 + +aptitude (0.4.4-4ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - maintainer set to ubuntu + - 01_allow_unauthenticated.dpatch: add --allow-unauthenticated + - 02_sudo.dpatch: use sudo to become root + - 03_branding.dpatch: use ubuntu in various places + - 04_changelog.dpatch: get the changelog from the ubuntu location + - 06_no_auto_remove_kernels.dpatch: never autoremove kernels + - 07_hide_recommends_warning.dpatch: hide warning about recommends not + being installed + - 08_ubuntu_default_source.dpatch: do not clean out the lists dir + on transient network failures + - 09_action_group_integration.dpatch: use the new libapt + pkgDepCache::ActionGroup to make it work well with new apt + - 10_dpkg_breaks.dpatch: map Breaks to Conflicts to implement dpkg + breaks + + -- Michael Vogt Tue, 15 May 2007 10:10:46 +0200 + aptitude (0.4.4-4) unstable; urgency=low * In addition to the bugfix for ssprintf, the last release included @@ -3167,6 +4099,24 @@ aptitude (0.4.4-2) unstable; urgency=low -- Daniel Burrows Sun, 4 Mar 2007 20:37:48 -0800 +aptitude (0.4.4-1ubuntu3) feisty; urgency=low + + * rebuild against the latest apt + + -- Michael Vogt Mon, 26 Feb 2007 14:55:22 +0100 + +aptitude (0.4.4-1ubuntu2) feisty; urgency=low + + * rebuild against the latest apt + + -- Michael Vogt Tue, 6 Feb 2007 18:54:17 +0100 + +aptitude (0.4.4-1ubuntu1) feisty; urgency=low + + * Merge from debian unstable. + + -- Michael Vogt Tue, 21 Nov 2006 16:48:35 +0100 + aptitude (0.4.4-1) unstable; urgency=low * New upstream release. @@ -3237,6 +4187,18 @@ aptitude (0.4.4-1) unstable; urgency=low -- Daniel Burrows Thu, 26 Oct 2006 21:02:00 -0700 +aptitude (0.4.3-1ubuntu1) feisty; urgency=low + + * merged from debian + * debian/patches/09_no_crawl_extended_states: + - dropped + * debian/patches/09_action_group_integration.dpatch: + - integrate the apt pkgDepCache::ActionGroup into aptitude + * debian/patches/10_dpkg_breaks.dpatch: + - dpkg breaks support + + -- Michael Vogt Mon, 30 Oct 2006 09:41:05 +0100 + aptitude (0.4.3-1) unstable; urgency=low * New upstream release. @@ -3359,6 +4321,59 @@ aptitude (0.4.2-1) unstable; urgency=low -- Daniel Burrows Tue, 1 Aug 2006 17:23:40 -0700 +aptitude (0.4.1-1.1ubuntu7) edgy; urgency=low + + * use libapt pkgDepCache::ActionGroup in aptitudes + pkgDepCache::{begin,end}_action_grup() to fix performance the + worst regression, more to come + + -- Michael Vogt Mon, 11 Sep 2006 18:58:19 +0200 + +aptitude (0.4.1-1.1ubuntu6) edgy; urgency=low + + * Parse Breaks and treat it like Conflicts. + (PackageDependencyFieldBreaks; not the full implementation, but enough + to make it feasible to deploy Breaks in the archive straight away.) + + -- Ian Jackson Thu, 7 Sep 2006 15:20:13 +0100 + +aptitude (0.4.1-1.1ubuntu5) edgy; urgency=low + + * debian/patches/10_error_checking_in_changelog.dpatch: + - update the patch for a more correct fix + + -- Michael Vogt Wed, 23 Aug 2006 17:28:29 +0200 + +aptitude (0.4.1-1.1ubuntu4) edgy; urgency=low + + * debian/patches/10_error_checking_in_changelog.dpatch: + - don't segfault if get_changelog() returns NULL (lp: #57326) + + -- Michael Vogt Wed, 23 Aug 2006 14:22:04 +0200 + +aptitude (0.4.1-1.1ubuntu3) edgy; urgency=low + + * rebuild to enable ddtp support + * debian/patches/09_no_crawl_in_extended_states.dpatch: + - fix the problem that it is very slow when applying the + extended selections + + -- Michael Vogt Mon, 14 Aug 2006 17:01:56 +0200 + +aptitude (0.4.1-1.1ubuntu2) edgy; urgency=low + + * fix FTBFS + * dropped: debian/patches/05_fix_read (moved upstream) + + -- Michael Vogt Tue, 4 Jul 2006 09:13:31 +0200 + +aptitude (0.4.1-1.1ubuntu1) edgy; urgency=low + + * Merge from debian unstable. + * build-dep on latest apt + + -- Michael Vogt Mon, 3 Jul 2006 21:46:41 +0200 + aptitude (0.4.1-1.1) unstable; urgency=low * NMU as part of the GCC 4.1 transition. @@ -3404,6 +4419,35 @@ aptitude (0.4.1-1) unstable; urgency=low -- Daniel Burrows Fri, 9 Dec 2005 10:20:01 -0800 +aptitude (0.4.0-5ubuntu3) dapper; urgency=low + + * debian/patches/06_no_auto_remove_kernels.dpatch: + - don't auto-remove linux-kernel.* | linux-restricted-modules.* + (Ubuntu: #28822) + + -- Michael Vogt Mon, 3 Apr 2006 15:48:19 +0200 + +aptitude (0.4.0-5ubuntu2) dapper; urgency=low + + * debian/patches/08_ubuntu_default_source: + - don't clean the lists dir on transient network failures + * debian/patches/04_changelogs.dpatch: + - make aptitude changelog work as well (ubuntu #28821) + + -- Michael Vogt Tue, 21 Feb 2006 16:25:32 +0100 + +aptitude (0.4.0-5ubuntu1) dapper; urgency=low + + * merged with debian + * debian/patches/01_allow_unauthenticaed: + - redone, didn't applied cleanly anymore + * debian/patches/08_fix_is_trusted, 09_sa_restorer: + - removed, now part of upstream + * tighten build-dep to 0.6.43ubuntu2 to make sure it builds with + the latest apt upload + + -- Michael Vogt Thu, 8 Dec 2005 17:44:26 +0100 + aptitude (0.4.0-5experimental2) experimental; urgency=low * Rebuild auto* tools before upload. (Closes: #342218) @@ -3488,6 +4532,33 @@ aptitude (0.4.0-4) unstable; urgency=low -- Daniel Burrows Sun, 20 Nov 2005 17:20:29 -0800 +aptitude (0.4.0-3ubuntu4) dapper; urgency=low + + * debian/patches/09_sa_restorer.dpatch: + - move the sa_restorer patch into a dpatch + * debian/patches/10_fix_purge.dpatch: + - make it possible to cleanly purge aptitude (ubuntu: #20372) + + -- Michael Vogt Wed, 7 Dec 2005 22:18:46 +0100 + +aptitude (0.4.0-3ubuntu3) dapper; urgency=low + + * sa_restorer is an optional field + + -- LaMont Jones Sat, 26 Nov 2005 16:12:26 +0000 + +aptitude (0.4.0-3ubuntu2) dapper; urgency=low + + * rebuild for c++ transition, tightend build dependency + + -- Michael Vogt Fri, 25 Nov 2005 12:24:55 +0100 + +aptitude (0.4.0-3ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. + + -- Colin Watson Fri, 18 Nov 2005 10:58:00 +0000 + aptitude (0.4.0-3experimental2) experimental; urgency=low * Hack around bug #339533 (Closes: #339648). @@ -3548,6 +4619,12 @@ aptitude (0.4.0-3) unstable; urgency=low -- Daniel Burrows Mon, 7 Nov 2005 18:12:04 -0800 +aptitude (0.4.0-2ubuntu1) dapper; urgency=low + + * merged with debian, using dpatch now for the ubuntu bits + + -- Michael Vogt Wed, 9 Nov 2005 08:36:19 +0100 + aptitude (0.4.0-2) unstable; urgency=low * Apply patch from lamont@debian.org to be POSIX-compliant and thus @@ -5113,3 +6190,4 @@ aptitude (0.0.6a-1) unstable; urgency=lo * Initial Release. -- Daniel Burrows Sun, 6 Feb 2000 12:58:13 -0500 + diff -pruN 0.8.13-3/debian/control 0.8.13-3ubuntu1/debian/control --- 0.8.13-3/debian/control 2021-02-14 06:01:06.000000000 +0000 +++ 0.8.13-3ubuntu1/debian/control 2021-02-14 08:43:56.000000000 +0000 @@ -1,14 +1,15 @@ Source: aptitude Section: admin Priority: optional -Maintainer: Aptitude Development Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Aptitude Development Team Uploaders: Manuel A. Fernandez Montecelo , Axel Beckert Build-Depends: autoconf-archive, debhelper-compat (= 13), dpkg-dev (>= 1.16.1), gettext, - libapt-pkg-dev (>= 1.1), + libapt-pkg-dev (>= 1.9.11~), libboost-dev, libboost-iostreams-dev, libboost-system-dev, diff -pruN 0.8.13-3/debian/patches/03_branding 0.8.13-3ubuntu1/debian/patches/03_branding --- 0.8.13-3/debian/patches/03_branding 1970-01-01 00:00:00.000000000 +0000 +++ 0.8.13-3ubuntu1/debian/patches/03_branding 2020-02-19 12:51:33.000000000 +0000 @@ -0,0 +1,80 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_branding.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +--- a/section-descriptions ++++ b/section-descriptions +@@ -22,13 +22,13 @@ Aptitude::Sections + + admin "Administrative utilities (install software, manage users, etc)\n Packages in the 'admin' section allow you to perform administrative tasks such as installing software, managing users, configuring and monitoring your system, examining network traffic, and so on."; + alien "Packages converted from foreign formats (rpm, tgz, etc)\n Packages in the 'alien' section were created by the 'alien' program from a non-Debian package format such as RPM"; +- base "The Debian base system\n Packages in the 'base' section are part of the initial system installation."; ++ base "The Ubuntu base system\n Packages in the 'base' section are part of the initial system installation."; + cli-mono "Mono and the Common Language Infrastructure\n Packages in the 'cli-mono' section provide open source implementation of Microsoft's .NET development framework based on the ECMA standards for C# and the Common Language Runtime. Unless you are a .NET programmer, you don't need to install packages from this section explicitly; the package system will install them if they are required."; + comm "Programs for faxmodems and other communication devices\n Packages in the 'comm' section are used to control modems and other hardware communications devices. This includes software to control faxmodems (for instance, PPP for dial-up internet connections and programs originally written for that purpose, such as zmodem/kermit), as well as software to control cellular phones, interface with FidoNet, and run a BBS."; + database "Database servers and tools\n Packages in the 'database' section contain database engines such as PostgreSQL and SQLite, database clients, and database management tools."; + debug "Debugging symbols\n Packages in the 'debug' section contain files required for debugging programs. You don't need packages from this section unless you want to debug a particular piece of software."; + devel "Utilities and programs for software development\n Packages in the 'devel' section are used to write new software and work on existing software. Non-programmers who do not compile their own software probably do not need much software from this section.\n .\n It includes compilers, debugging tools, programmer's editors, source processing tools, and other things related to software development."; +- doc "Documentation and specialized programs for viewing documentation\n Packages in the 'doc' section document parts of the Debian system, or are viewers for documentation formats."; ++ doc "Documentation and specialized programs for viewing documentation\n Packages in the 'doc' section document parts of the Ubuntu system, or are viewers for documentation formats."; + editors "Text editors and word processors\n Packages in the 'editors' section allow you to edit plain ASCII text. These are not necessarily word processors, although some word processors may be found in this section."; + education "Software, documentation or data related to educational activities\n Packages in the 'education' section are related to educational activities."; + electronics "Programs for working with circuits and electronics\n Packages in the 'electronics' section include circuit design tools, simulators and assemblers for microcontrollers, and other related software."; +@@ -60,7 +60,7 @@ Aptitude::Sections + net "Programs to connect to and provide various services\n Packages in the 'net' section include clients and servers for many protocols, tools to manipulate and debug low-level network protocols, IM systems, and other network-related software."; + news "Usenet clients and servers\n Packages in the 'news' section are related to the Usenet distributed news system. They include news readers and news servers."; + ocaml "OCaml programming language and libraries\n Packages in the 'ocaml' section provide the OCaml programming language and many third-party libraries for it. Unless you are a OCaml programmer, you don't need to install packages from this section explicitly; the package system will install them if they are required."; +- oldlibs "Obsolete libraries\n Packages in the 'oldlibs' section are obsolete and should not be used by new software. They are provided for compatibility reasons, or because software distributed by Debian still requires them.\n .\n With very few exceptions, you should not need to explicitly install a package from this section; the package system will install them as required to fulfill dependencies."; ++ oldlibs "Obsolete libraries\n Packages in the 'oldlibs' section are obsolete and should not be used by new software. They are provided for compatibility reasons, or because software distributed by Ubuntu still requires them.\n .\n With very few exceptions, you should not need to explicitly install a package from this section; the package system will install them as required to fulfill dependencies."; + otherosfs "Emulators and software to read foreign filesystems\n Packages in the 'otherosfs' section emulate hardware and operating systems and provide tools for transferring data between different operating systems and hardware platforms. (for instance, utilities to read DOS floppies, and utilities to communicate with Palm Pilots)\n .\n It is worth noting that CD burning software is included in THIS section."; + perl "Perl programming language and libraries\n Packages in the 'perl' section provide the Perl programming language and many third-party libraries for it. Unless you are a Perl programmer, you don't need to install packages from this section explicitly; the package system will install them if they are required."; + php "PHP programming language and libraries\n Packages in the 'php' section provide the PHP programming language and many third-party libraries for it. Unless you are a PHP programmer, you don't need to install packages from this section explicitly; the package system will install them if they are required."; +@@ -80,8 +80,9 @@ Aptitude::Sections + xfce "The Xfce Desktop Environment\n Xfce is a collection of software which provides an easy-to-use desktop. Packages in the 'xfce' section are part of the Xfce environment or closely integrated into it."; + zope "Zope/Plone framework\n Packages in the 'zope' section provide application server for building content management systems, intranets, portals, and custom applications. One such a content management system build upon Zope is Plone."; + +- main "The main Debian archive\n The Debian distribution consists of packages from the 'main' section. Every package in 'main' is Free Software.\n .\n For more information about what Debian considers to be Free Software, see http://www.debian.org/social_contract#guidelines"; +- contrib "Programs which depend on software not in Debian\n Packages in the 'contrib' section are not part of Debian.\n .\n These packages are Free Software, but they depend on software which is not part of Debian. This may be because it is not Free Software, but is packaged in the non-free section of the archive, because Debian cannot distribute it at all, or (in rare cases) because no-one has packaged it yet.\n .\n For more information about what Debian considers to be Free Software, see http://www.debian.org/social_contract#guidelines"; +- non-free "Programs which are not free software\n Packages in the 'non-free' section are not part of Debian.\n .\n These packages fail to meet one or more of the requirements of the Debian Free Software Guidelines (see below). You should read the license of programs in this section to be sure that you are allowed to use them in the way you intend.\n .\n For more information about what Debian considers to be Free Software, see http://www.debian.org/social_contract#guidelines"; ++ main "Fully supported Free Software.\n .\nUbuntu software in the \"main\" component is fully supported, and is Free Software. Not only is this software freely available, it comes with signficant rights for you to modify it, improve it and share it. Read more about the Ubuntu manifesto and licence policy at http://www.ubuntulinux.org/ubuntu/licensing/"; ++ restricted "Binary-only device drivers.\n .\nThe \"restricted\" component of Ubuntu consists of device drivers that are only available in binary form, and cannot be modified. We provide these solely because it is the only way to make the rest of Ubuntu run on certain hardware, we recommend you determine whether or not you need this, and if not, to remove it."; ++ universe "Unsupported Free Software.\n .\nUbuntu software in the \"universe\" component is Free Software, but does not receive the same level of testing and polish that software in the \"main\" component receives. The Ubuntu team does not review this software for security, nor does it provide any assurance of ongoing security updates after release."; ++ multiverse "Unsupported Non-free Software.\n .\nSoftware in the \"multiverse\" component has not been determined to be Free Software, please make certain that you verify your rights to use this software and comply with the licensing terms of the copyright holder. This software receives no support and usually cannot be fixed or updated. Use it at your own risk on your own advice."; + }; + }; +--- a/src/gtk/previewtab.cc ++++ b/src/gtk/previewtab.cc +@@ -94,7 +94,7 @@ namespace gui + // be in common code. + const char * const PreviewView::Generator::child_names[num_pkg_action_states]= + { +- N_("Packages with unsatisfied dependencies\n The dependency requirements of these packages will be unmet after the install is complete.\n .\n The presence of this tree probably indicates that something is broken, either on your system or in the Debian archive."), ++ N_("Packages with unsatisfied dependencies\n The dependency requirements of these packages will be unmet after the install is complete.\n .\n The presence of this tree probably indicates that something is broken, either on your system or in the Ubuntu archive."), + N_("Packages being removed because they are no longer used\n These packages are being deleted because they were automatically installed to fulfill dependencies, and the planned action will result in no installed package declaring an 'important' dependency on them.\n"), + N_("Packages being automatically held in their current state\n These packages could be upgraded, but they have been kept in their current state to avoid breaking dependencies."), + N_("Packages being automatically installed to satisfy dependencies\n These packages are being installed because they are required by another package you have chosen for installation."), +--- a/src/pkg_grouppolicy.cc ++++ b/src/pkg_grouppolicy.cc +@@ -459,9 +459,9 @@ public: + + const char * const pkg_grouppolicy_status::state_titles[numgroups] = + { +- N_("Security Updates\n Security updates for these packages are available from security.debian.org (or mirrors)."), ++ N_("Security Updates\n Security updates for these packages are available from security.ubuntu.com (or mirrors)."), + N_("Upgradable Packages\n A newer version of these packages is available."), +- N_("New Packages\n These packages have been added to Debian since the last time you cleared the list of \"new\" packages (choose \"Forget new packages\" from the Actions menu to empty this list)."), ++ N_("New Packages\n These packages have been added to Ubuntu since the last time you cleared the list of \"new\" packages (choose \"Forget new packages\" from the Actions menu to empty this list)."), + N_("Installed Packages\n These packages are currently installed on your computer."), + N_("Not Installed Packages\n These packages are not installed on your computer."), + N_("Obsolete and Locally Created Packages\n These packages are currently installed on your computer, but they are not available from any apt source. They may be obsolete and removed from the archive, or you may have built a private version of them yourself."), +@@ -687,7 +687,7 @@ public: + + const char * const pkg_grouppolicy_mode::child_names[num_pkg_action_states]= + { +- N_("Packages with unsatisfied dependencies\n The dependency requirements of these packages will be unmet after the install is complete.\n .\n The presence of this tree probably indicates that something is broken, either on your system or in the Debian archive."), ++ N_("Packages with unsatisfied dependencies\n The dependency requirements of these packages will be unmet after the install is complete.\n .\n The presence of this tree probably indicates that something is broken, either on your system or in the Ubuntu archive."), + N_("Packages being removed because they are no longer used\n These packages are being deleted because they were automatically installed to fulfill dependencies, and the planned action will result in no installed package declaring an 'important' dependency on them.\n"), + N_("Packages being automatically held in their current state\n These packages could be upgraded, but they have been kept in their current state to avoid breaking dependencies."), + N_("Packages being automatically installed to satisfy dependencies\n These packages are being installed because they are required by another package you have chosen for installation."), diff -pruN 0.8.13-3/debian/patches/04_changelog 0.8.13-3ubuntu1/debian/patches/04_changelog --- 0.8.13-3/debian/patches/04_changelog 1970-01-01 00:00:00.000000000 +0000 +++ 0.8.13-3ubuntu1/debian/patches/04_changelog 2020-02-19 12:51:33.000000000 +0000 @@ -0,0 +1,92 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_changelog.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +Index: aptitude-0.8.12-1ubuntu1/src/apt_options.cc +=================================================================== +--- aptitude-0.8.12-1ubuntu1.orig/src/apt_options.cc ++++ aptitude-0.8.12-1ubuntu1/src/apt_options.cc +@@ -302,7 +302,7 @@ + "should only need to change this if the changelogs move " + "to a different URL."), + "APT::Changelogs::Server", +- "http://metadata.ftp-master.debian.org/changelogs"), ++ "http://changelogs.ubuntu.com/changelogs"), + option_item(N_("Display a preview of what will be done before doing it"), + N_("If this option is enabled, then when you ask " + "aptitude to perform an install run, it will " +Index: aptitude-0.8.12-1ubuntu1/src/cmdline/cmdline_changelog.cc +=================================================================== +--- aptitude-0.8.12-1ubuntu1.orig/src/cmdline/cmdline_changelog.cc ++++ aptitude-0.8.12-1ubuntu1/src/cmdline/cmdline_changelog.cc +@@ -292,7 +292,7 @@ + + if(access("/usr/bin/sensible-pager", X_OK)!=0) + { +- _error->Warning(_("Can't execute sensible-pager, is this a working Debian system?")); ++ _error->Warning(_("Can't execute sensible-pager, is this a working Ubuntu system?")); + + pager=getenv("PAGER"); + +Index: aptitude-0.8.12-1ubuntu1/src/generic/apt/pkg_changelog.cc +=================================================================== +--- aptitude-0.8.12-1ubuntu1.orig/src/generic/apt/pkg_changelog.cc ++++ aptitude-0.8.12-1ubuntu1/src/generic/apt/pkg_changelog.cc +@@ -584,14 +584,14 @@ + + // WATCH: apt/cmdline/apt-get.cc(DownloadChangelog) + string server = aptcfg->Find("APT::Changelogs::Server", +- "http://metadata.ftp-master.debian.org/changelogs"); +- string path = cw::util::ssprintf("%s/%s/%s/%s_%s", ++ "http://changelogs.ubuntu.com/changelogs"); ++ string path = cw::util::ssprintf("pool/%s/%s/%s/%s_%s", + realsection.c_str(), + prefix.c_str(), + source_package.c_str(), + source_package.c_str(), + realver.c_str()); +- uri = cw::util::ssprintf("%s/%s_changelog", ++ uri = cw::util::ssprintf("%s/%s/changelog", + server.c_str(), + path.c_str()); + } +@@ -690,9 +690,7 @@ + { + if (!vf.File().end() && + vf.File().Origin() && +- (string("Debian") == vf.File().Origin() || +- string("Debian Ports") == vf.File().Origin() || +- string("Debian Backports") == vf.File().Origin())) ++ (string("Ubuntu") == vf.File().Origin())) + { + return true; + } +Index: aptitude-0.8.12-1ubuntu1/src/view_changelog.cc +=================================================================== +--- aptitude-0.8.12-1ubuntu1.orig/src/view_changelog.cc ++++ aptitude-0.8.12-1ubuntu1/src/view_changelog.cc +@@ -275,7 +275,7 @@ + string menulabel = + ssprintf(_("Changelog of %s"), pkgname.c_str()); + string tablabel = ssprintf(_("%s changes"), pkgname.c_str()); +- string desclabel = _("View the list of changes made to this Debian package."); ++ string desclabel = _("View the list of changes made to this Ubuntu package."); + + cw::util::ref_ptr changelog(aptitude::apt::parse_changelog(filename)); + cw::fragment *f = changelog.valid() ? render_changelog(changelog, curverstr) : NULL; +Index: aptitude-0.8.12-1ubuntu1/src/generic/apt/download_queue.cc +=================================================================== +--- aptitude-0.8.12-1ubuntu1.orig/src/generic/apt/download_queue.cc ++++ aptitude-0.8.12-1ubuntu1/src/generic/apt/download_queue.cc +@@ -875,7 +875,8 @@ + + if (req.get_uri().find("/changelogs/") != std::string::npos) + { +- std::string uri_filename = req.get_uri().substr(req.get_uri().find_last_of("/") + 1); ++ auto last_slash = req.get_uri().find_last_of("/"); ++ std::string uri_filename = req.get_uri().substr(req.get_uri().find_last_of("/", last_slash - 1) + 1); + + std::regex underscore_regex("[^_]+"); + auto elem_begin = std::sregex_iterator(uri_filename.begin(), uri_filename.end(), underscore_regex); diff -pruN 0.8.13-3/debian/patches/series 0.8.13-3ubuntu1/debian/patches/series --- 0.8.13-3/debian/patches/series 2021-02-14 06:03:08.000000000 +0000 +++ 0.8.13-3ubuntu1/debian/patches/series 2021-04-01 22:52:58.000000000 +0000 @@ -1,2 +1,4 @@ fix-ftbfs-with-gcc-10.patch apt_2.1.19_compatibility.patch +03_branding +04_changelog diff -pruN 0.8.13-3/debian/rules 0.8.13-3ubuntu1/debian/rules --- 0.8.13-3/debian/rules 2020-12-22 00:23:13.000000000 +0000 +++ 0.8.13-3ubuntu1/debian/rules 2021-02-14 08:43:56.000000000 +0000 @@ -9,6 +9,8 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_O DEB_CXXFLAGS_MAINT_APPEND += -fno-inline endif +DEB_CXXFLAGS_MAINT_APPEND += -O2 + export DEB_CXXFLAGS_MAINT_APPEND ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))