diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | apt-pkg/packagemanager.cc | 3 | ||||
| -rw-r--r-- | debian/changelog | 20 | ||||
| -rw-r--r-- | doc/apt-verbatim.ent | 2 | ||||
| -rw-r--r-- | doc/po/apt-doc.pot | 4 | ||||
| -rw-r--r-- | po/apt-all.pot | 4 | ||||
| -rwxr-xr-x | test/integration/test-ubuntu-bug-835625-multiarch-lockstep-installed-first | 4 |
7 files changed, 30 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 51f0c25d9..973fb2e9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -204,7 +204,7 @@ check_cxx_target(HAVE_FMV_SSE42_AND_CRC32DI "sse4.2" "__builtin_ia32_crc32di(0,i # Configure some variables like package, version and architecture. set(PACKAGE ${PROJECT_NAME}) set(PACKAGE_MAIL "APT Development Team <deity@lists.debian.org>") -set(PACKAGE_VERSION "2.1.11") +set(PACKAGE_VERSION "2.1.12") string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION}) if (NOT DEFINED DPKG_DATADIR) diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 55880d1b5..a1b3f4537 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -609,7 +609,8 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth) List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States); - if ((Cache[Pkg].InstVerIter(Cache)->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same) + if ((Cache[Pkg].InstVerIter(Cache)->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same && + not List->IsFlag(Pkg, pkgOrderList::Immediate)) for (PkgIterator P = Pkg.Group().PackageList(); P.end() == false; P = Pkg.Group().NextPkg(P)) { diff --git a/debian/changelog b/debian/changelog index 55febd4b8..39afd8340 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +apt (2.1.12) unstable; urgency=medium + + [ Julian Andres Klode ] + * pkgnames: Correctly set the default for AllNames to false (LP: #1876495) + * pkgnames: Do not exclude virtual packages with --all-names + * Remove expired domain that became nsfw from debian/changelog + * Do not immediately configure m-a: same packages in lockstep (LP: #1871268) + + [ Américo Monteiro ] + * Portuguese manpages translation update (Closes: #968414) + + [ David Kalnischkies ] + * Rename CMake find_package helpers to avoid developer warnings + * Install translated apt-patterns(7) man pages + * Remove ancient versions support from apts postinst + * Update libapt-pkg6.0 symbols file + * Refresh lintian-overrides of apt and libapt-pkg-doc + + -- Julian Andres Klode <jak@debian.org> Mon, 23 Nov 2020 17:52:37 +0100 + apt (2.1.11) unstable; urgency=medium [ JCGoran ] diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 8a91889d4..c75fef182 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -274,7 +274,7 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "2.1.11"> +<!ENTITY apt-product-version "2.1.12"> <!-- (Code)names for various things used all over the place --> <!ENTITY debian-oldstable-codename "stretch"> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 3b3288791..73ba791a9 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 2.1.11\n" +"Project-Id-Version: apt-doc 2.1.12\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-10-21 12:01+0200\n" +"POT-Creation-Date: 2020-11-23 17:52+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/po/apt-all.pot b/po/apt-all.pot index 030d486a3..e98aef3dd 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 2.1.11\n" +"Project-Id-Version: apt 2.1.12\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-10-21 12:01+0200\n" +"POT-Creation-Date: 2020-11-23 17:52+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/test/integration/test-ubuntu-bug-835625-multiarch-lockstep-installed-first b/test/integration/test-ubuntu-bug-835625-multiarch-lockstep-installed-first index 5a3e2762e..beb7c0854 100755 --- a/test/integration/test-ubuntu-bug-835625-multiarch-lockstep-installed-first +++ b/test/integration/test-ubuntu-bug-835625-multiarch-lockstep-installed-first @@ -26,9 +26,9 @@ The following packages will be upgraded: Inst libsame:i386 [1] (2 unstable [i386]) [apt:i386 ] Inst libsame (2 unstable [amd64]) [apt:i386 ] Conf libsame:i386 (2 unstable [i386]) [apt:i386 ] -Conf libsame (2 unstable [amd64]) [apt:i386 ] Inst apt:i386 [1] (2 unstable [i386]) -Conf apt:i386 (2 unstable [i386])' 'Reading package lists... +Conf apt:i386 (2 unstable [i386]) +Conf libsame (2 unstable [amd64])' 'Reading package lists... Building dependency tree... The following additional packages will be installed: apt:i386 libsame:i386 |