diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2020-05-19 11:29:11 +0200 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2020-05-19 11:29:11 +0200 |
| commit | 9d0a37e9cf644f99666b60e5a1ca5131fd0c6519 (patch) | |
| tree | 756c519bd079ea63386c1298475a27d118600772 | |
| parent | dcd920e99df964d320e18ac133d575d4151deb85 (diff) | |
Release 2.1.42.1.4
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -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 |
5 files changed, 13 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d4215964b..9df96ee85 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.1.3") +set(PACKAGE_VERSION "2.1.4") string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION}) if (NOT DEFINED DPKG_DATADIR) diff --git a/debian/changelog b/debian/changelog index f789db2d2..1e33ff23f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (2.1.4) unstable; urgency=medium + + [ David Kalnischkies ] + * Check satisfiability for versioned provides, not providing version + + -- Julian Andres Klode <jak@debian.org> Tue, 19 May 2020 11:28:59 +0200 + apt (2.1.3) unstable; urgency=medium [ David Kalnischkies ] diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index b3d8c95fe..35f0cb610 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.3"> +<!ENTITY apt-product-version "2.1.4"> <!-- (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 80eabaaad..c54974473 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.3\n" +"Project-Id-Version: apt-doc 2.1.4\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-18 22:24+0200\n" +"POT-Creation-Date: 2020-05-19 11:29+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" diff --git a/po/apt-all.pot b/po/apt-all.pot index 4d9a4135a..60a64d5d7 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 2.1.3\n" +"Project-Id-Version: apt 2.1.4\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-18 22:24+0200\n" +"POT-Creation-Date: 2020-05-19 11:29+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" |