diff -Nru --exclude '*.po' --exclude '*.pot' --exclude 'configure*' --exclude '*.gmo' aptitude-0.8.5/debian/changelog aptitude-0.8.6/debian/changelog --- aptitude-0.8.5/debian/changelog 2017-01-24 23:19:19.000000000 +0100 +++ aptitude-0.8.6/debian/changelog 2017-03-05 21:39:31.000000000 +0100 @@ -1,3 +1,36 @@ +aptitude (0.8.6-1) UNRELEASED; urgency=medium + + [ Manuel A. Fernandez Montecelo ] + * New upstream release. Please see /usr/share/aptitude/NEWS for a change + log with more details. + + - User visible changes: + * [cmdline] Better message when there are no deb-src in sources.list + (Closes: #841875) + + - Bug fixes: + * Use a more strict mask for comparison of dependency operators, thanks to + Aaron M. Ucko for the initial patch (Closes: #836567, #837946, #849370) + * Fix reading tag and their classification in subtrees (Closes: #853037) + * Fix misdetection of auto-installed packages from apt + (Closes: #831858, #841347) + + - Translation updates: + * ru.po: Russian translation by Lev Lamberov (Closes: #855329) + * Dutch documentation translation by Frans Spiesschaert (Closes: #854897) + + + * Remove wrong "From:" from contributor name in prev. changelog entry. + * d/patches: + - drop ftbfs-fix-french-doc.patch + + [ Axel Beckert ] + * Restrict build-dependency on google-mock to >= 1.8.0 as aptitude FTBFS + with earlier versions since the adaptions for 1.8.0 in 0.8.4-1. + (Closes: #852666) + + -- Manuel A. Fernandez Montecelo Sun, 05 Mar 2017 21:39:31 +0100 + aptitude (0.8.5-1) unstable; urgency=medium * New upstream release. Please see /usr/share/aptitude/NEWS for a change @@ -8,8 +41,7 @@ (Closes: #849761) * nl.po: Dutch translation by Frans Spiesschaert (Closes: #851888) * Dutch documentation translation by Frans Spiesschaert (Closes: #851890) - * French documentation translation by From: Cédric Boutillier - (Closes: #852352) + * French documentation translation by Cédric Boutillier (Closes: #852352) * d/patches: diff -Nru --exclude '*.po' --exclude '*.pot' --exclude 'configure*' --exclude '*.gmo' aptitude-0.8.5/debian/control aptitude-0.8.6/debian/control --- aptitude-0.8.5/debian/control 2017-01-24 22:40:10.000000000 +0100 +++ aptitude-0.8.6/debian/control 2017-03-05 21:39:31.000000000 +0100 @@ -11,7 +11,7 @@ dpkg-dev (>= 1.16.1), elinks, gettext, - google-mock, + google-mock (>= 1.8.0), libapt-pkg-dev (>= 1.1), libboost-dev, libboost-filesystem-dev, diff -Nru --exclude '*.po' --exclude '*.pot' --exclude 'configure*' --exclude '*.gmo' aptitude-0.8.5/debian/patches/ftbfs-fix-french-doc.patch aptitude-0.8.6/debian/patches/ftbfs-fix-french-doc.patch --- aptitude-0.8.5/debian/patches/ftbfs-fix-french-doc.patch 2017-01-24 23:24:47.000000000 +0100 +++ aptitude-0.8.6/debian/patches/ftbfs-fix-french-doc.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ ---- a/doc/po4a/po/fr.po -+++ b/doc/po4a/po/fr.po -@@ -1986,7 +1986,7 @@ - "menu d'&aptitude; avec le raccourci clavier Contrôlet (ou " - "bien aussi ContrôleEspace ou F10) ; vous pouvez aussi cliquer avec la " -+"keycap> ou F10) ; vous pouvez aussi cliquer avec la " - "souris sur un onglet du menu si votre système gère ce mécanisme. Utiliser le " - "raccourci Contrôlet va ouvrir le menu Actions :" -@@ -11062,7 +11062,7 @@ - "mais leurs versions qui sont mises en correspondance. Pour " - "aptitude search et d'autres usages, cela " - "ne fait pas beaucoup de différence, mais aptitude versions ne montrera que les versions qui correspondent, et non pas toutes " -+"literal> ne montrera que les versions qui correspondent, et non pas toutes " - "les versions de paquets dont l'une des versions correspondrait. Pour étendre " - "la recherche, utilisez un opérateur &Swiden;." - diff -Nru --exclude '*.po' --exclude '*.pot' --exclude 'configure*' --exclude '*.gmo' aptitude-0.8.5/debian/patches/series aptitude-0.8.6/debian/patches/series --- aptitude-0.8.5/debian/patches/series 2017-01-24 23:17:16.000000000 +0100 +++ aptitude-0.8.6/debian/patches/series 2017-03-05 21:39:31.000000000 +0100 @@ -1 +0,0 @@ -ftbfs-fix-french-doc.patch diff -Nru --exclude '*.po' --exclude '*.pot' --exclude 'configure*' --exclude '*.gmo' aptitude-0.8.5/doc/en/aptitude.xml aptitude-0.8.6/doc/en/aptitude.xml --- aptitude-0.8.5/doc/en/aptitude.xml 2016-12-27 23:48:23.000000000 +0100 +++ aptitude-0.8.6/doc/en/aptitude.xml 2017-03-05 22:26:40.000000000 +0100 @@ -7,7 +7,7 @@ dselect'> apt-get'> root'> - + diff -Nru --exclude '*.po' --exclude '*.pot' --exclude 'configure*' --exclude '*.gmo' aptitude-0.8.5/NEWS aptitude-0.8.6/NEWS --- aptitude-0.8.5/NEWS 2017-01-24 22:09:04.000000000 +0100 +++ aptitude-0.8.6/NEWS 2017-03-05 22:26:40.000000000 +0100 @@ -1,3 +1,39 @@ +[2017-03-05] +Version 0.8.6 + +- User visible changes: + + * [cmdline] Better message when there are no deb-src in sources.list + (Closes: #841875) + +- Bug fixes: + + * Use a more strict mask for comparison of dependency operators, thanks to + Aaron M. Ucko for the initial patch (Closes: #836567, #837946, #849370) + + Recently apt started to use more values in an enum used for dependency + operator comparisons, which causes some problems because aptitude's code + from many years ago, which did not expect new values. + + Using a stricter mask to capture only the operators, as per the + documentation of the enum (lower 4 bits). + + * Fix reading tag and their classification in subtrees (Closes: #853037) + + Newline characters were added to the last tag (or the only one), and it + caused extra problems like classifying the tag in their own subtree due to + the new-line mismatch in the tag name. + + * Fix misdetection of auto-installed packages from apt + (Closes: #831858, #841347) + +- Translation updates: + + * ru.po: Russian translation by Lev Lamberov (Closes: #855329) + + * Dutch documentation translation by Frans Spiesschaert (Closes: #854897) + + [2017-01-24] Version 0.8.5 @@ -10,8 +46,7 @@ * Dutch documentation translation by Frans Spiesschaert (Closes: #851890) - * French documentation translation by From: Cédric Boutillier - (Closes: #852352) + * French documentation translation by Cédric Boutillier (Closes: #852352) [2016-12-27] diff -Nru --exclude '*.po' --exclude '*.pot' --exclude 'configure*' --exclude '*.gmo' aptitude-0.8.5/src/cmdline/cmdline_action.cc aptitude-0.8.6/src/cmdline/cmdline_action.cc --- aptitude-0.8.5/src/cmdline/cmdline_action.cc 2016-12-27 23:08:08.000000000 +0100 +++ aptitude-0.8.6/src/cmdline/cmdline_action.cc 2017-03-05 22:26:40.000000000 +0100 @@ -1,7 +1,7 @@ // cmdline_action.cc // // Copyright 2004 Daniel Burrows -// Copyright 2015-2016 Manuel A. Fernandez Montecelo +// Copyright 2015-2017 Manuel A. Fernandez Montecelo #include "cmdline_action.h" #include "cmdline_util.h" @@ -46,6 +46,13 @@ bool allow_auto, const std::shared_ptr &term_metrics) { + // check for deb-src in sources.list or die -- needs to instantiate + { + pkgSrcRecords records(*apt_source_list); + aptitude::cmdline::on_apt_errors_print_and_die(); + } + + aptitude::cmdline::source_package sourcepkg = aptitude::cmdline::find_source_package(pkg, version_source, diff -Nru --exclude '*.po' --exclude '*.pot' --exclude 'configure*' --exclude '*.gmo' aptitude-0.8.5/src/cmdline/cmdline_action.h aptitude-0.8.6/src/cmdline/cmdline_action.h --- aptitude-0.8.5/src/cmdline/cmdline_action.h 2016-05-06 00:15:45.000000000 +0200 +++ aptitude-0.8.6/src/cmdline/cmdline_action.h 2017-03-05 22:26:40.000000000 +0100 @@ -1,7 +1,7 @@ // cmdline_action.h -*-c++-*- // // Copyright (C) 2004, 2010 Daniel Burrows -// Copyright (C) 2015-2016 Manuel A. Fernandez Montecelo +// Copyright (C) 2015-2017 Manuel A. Fernandez Montecelo // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License as diff -Nru --exclude '*.po' --exclude '*.pot' --exclude 'configure*' --exclude '*.gmo' aptitude-0.8.5/src/generic/apt/aptcache.cc aptitude-0.8.6/src/generic/apt/aptcache.cc --- aptitude-0.8.5/src/generic/apt/aptcache.cc 2016-08-06 19:18:38.000000000 +0200 +++ aptitude-0.8.6/src/generic/apt/aptcache.cc 2017-03-05 22:26:40.000000000 +0100 @@ -1,7 +1,7 @@ // aptcache.cc // // Copyright 1999-2009, 2011 Daniel Burrows -// Copyright 2015-2016 Manuel A. Fernandez Montecelo +// Copyright 2015-2017 Manuel A. Fernandez Montecelo // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -398,6 +398,13 @@ pkg_state.remove_reason=(changed_reason) section.FindI("Remove-Reason", manual); + // marked as auto-installed from apt? -- bug #841347 + // + // using PkgState[pkg->ID] because passing "pkg" needs + // apt_cache_file initialised + if (is_auto_installed(PkgState[pkg->ID])) + pkg_state.previously_auto_package = true; + candver=section.FindS("Version"); pkg_state.selection_state=(pkgCache::State::PkgSelectedState) section.FindI("State", pkgCache::State::Unknown); diff -Nru --exclude '*.po' --exclude '*.pot' --exclude 'configure*' --exclude '*.gmo' aptitude-0.8.5/src/generic/apt/aptcache.h aptitude-0.8.6/src/generic/apt/aptcache.h --- aptitude-0.8.5/src/generic/apt/aptcache.h 2016-07-23 23:54:43.000000000 +0200 +++ aptitude-0.8.6/src/generic/apt/aptcache.h 2017-03-05 22:26:40.000000000 +0100 @@ -1,7 +1,7 @@ // aptcache.h -*-c++-*- // // Copyright 1999-2005, 2007-2009, 2011 Daniel Burrows -// Copyright 2015-2016 Manuel A. Fernandez Montecelo +// Copyright 2015-2017 Manuel A. Fernandez Montecelo // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff -Nru --exclude '*.po' --exclude '*.pot' --exclude 'configure*' --exclude '*.gmo' aptitude-0.8.5/src/generic/apt/apt.cc aptitude-0.8.6/src/generic/apt/apt.cc --- aptitude-0.8.5/src/generic/apt/apt.cc 2016-05-06 00:15:45.000000000 +0200 +++ aptitude-0.8.6/src/generic/apt/apt.cc 2017-03-05 22:26:40.000000000 +0100 @@ -1141,8 +1141,11 @@ if(!d2.TargetVer()) return false; - pkgCache::Dep::DepCompareOp t1 = (pkgCache::Dep::DepCompareOp) (d1->CompareOp &~ pkgCache::Dep::Or); - pkgCache::Dep::DepCompareOp t2 = (pkgCache::Dep::DepCompareOp) (d2->CompareOp &~ pkgCache::Dep::Or); + // the lower 4 bits are the actual operator (from documentation of the + // data type) + static const int comp_mask = 0xf; + pkgCache::Dep::DepCompareOp t1 = (pkgCache::Dep::DepCompareOp) (d1->CompareOp & comp_mask); + pkgCache::Dep::DepCompareOp t2 = (pkgCache::Dep::DepCompareOp) (d2->CompareOp & comp_mask); int cmpresult = _system->VS->DoCmpVersion(d1.TargetVer(), d1.TargetVer()+strlen(d1.TargetVer()), d2.TargetVer(), d2.TargetVer()+strlen(d2.TargetVer())); diff -Nru --exclude '*.po' --exclude '*.pot' --exclude 'configure*' --exclude '*.gmo' aptitude-0.8.5/src/generic/apt/tags.cc aptitude-0.8.6/src/generic/apt/tags.cc --- aptitude-0.8.5/src/generic/apt/tags.cc 2016-05-06 00:15:45.000000000 +0200 +++ aptitude-0.8.6/src/generic/apt/tags.cc 2017-03-05 22:26:40.000000000 +0100 @@ -2,7 +2,7 @@ // // Copyright (C) 2005, 2007-2008, 2010 Daniel Burrows // Copyright (C) 2014 Daniel Hartwig -// Copyright (C) 2016 Manuel A. Fernandez Montecelo +// Copyright (C) 2016-2017 Manuel A. Fernandez Montecelo // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License as @@ -243,6 +243,10 @@ const char *tagend = tagstart; while((*tagend) != '\0') ++tagend; + // remove last position, which is a newline (\n), and was later used as + // part of the tag string causing different problems -- see bug #853037 + if (tagend > tagstart) + --tagend; tag_list ts(tagstart, tagend); for(tag_list::const_iterator t = ts.begin(); diff -Nru --exclude '*.po' --exclude '*.pot' --exclude 'configure*' --exclude '*.gmo' aptitude-0.8.5/src/generic/apt/tags.h aptitude-0.8.6/src/generic/apt/tags.h --- aptitude-0.8.5/src/generic/apt/tags.h 2016-05-06 00:15:45.000000000 +0200 +++ aptitude-0.8.6/src/generic/apt/tags.h 2017-03-05 22:26:40.000000000 +0100 @@ -2,7 +2,7 @@ // // Copyright (C) 2005, 2007, 2010 Daniel Burrows // Copyright (C) 2014 Daniel Hartwig -// Copyright (C) 2016 Manuel A. Fernandez Montecelo +// Copyright (C) 2016-2017 Manuel A. Fernandez Montecelo // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License as