diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | debian/changelog | 23 | ||||
| -rw-r--r-- | doc/apt-verbatim.ent | 2 | ||||
| -rw-r--r-- | po/apt-all.pot | 4 |
4 files changed, 27 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 41a887738..1571089c5 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, # 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.0.2") +set(PACKAGE_VERSION "2.1.0") string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION}) if (NOT DEFINED DPKG_DATADIR) diff --git a/debian/changelog b/debian/changelog index 0b4863cfe..aba34297b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +apt (2.1.0) unstable; urgency=medium + + [ Frans Spiesschaert ] + * Dutch manpages translation update (Closes: #956313) + + [ David Kalnischkies ] + * Refactor MarkInstall fixing various or-group handling issues + - Discard impossible candidate versions also for non-installed + - Explore or-groups for Recommends further than first + - Refactor and reorder MarkInstall code + - Discard candidate if its dependencies can't be satisfied + - Split up MarkInstall into private helper methods + - Fail earlier on impossible Conflicts in MarkInstall + - Propagate Protected flag to single-option dependencies + - Prefer upgrading installed orgroup members + - Protect a package while resolving in MarkInstall + + [ Julian Andres Klode ] + * Reinstate * wildcards (Closes: #953531) (LP: #1872200) + * apt list: Fix behavior of regex vs fnmatch vs wildcards + + -- Julian Andres Klode <jak@debian.org> Mon, 04 May 2020 15:58:24 +0200 + apt (2.0.2) unstable; urgency=medium [ Boyuan Yang ] diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index f59f7cb43..85a52ffd1 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.0.2"> +<!ENTITY apt-product-version "2.1.0"> <!-- (Code)names for various things used all over the place --> <!ENTITY debian-oldstable-codename "stretch"> diff --git a/po/apt-all.pot b/po/apt-all.pot index 2326a6d38..9cdb3fcdb 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 2.0.2\n" +"Project-Id-Version: apt 2.1.0\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-04-09 12:21+0200\n" +"POT-Creation-Date: 2020-05-04 15:59+0200\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" |