diff options
author | Julian Andres Klode <julian.klode@canonical.com> | 2021-03-01 22:28:15 +0100 |
---|---|---|
committer | Julian Andres Klode <julian.klode@canonical.com> | 2021-03-01 22:28:15 +0100 |
commit | 16b905aabc9b8700b937dd1541d52ea0df2f3a0e (patch) | |
tree | 59f317fb7fabbfff52fdd041c614f9156fdc74c7 | |
parent | 0d51cf142884801c903df0cddaec5545f0174553 (diff) |
Release 2.2.12.2.1
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | debian/changelog | 15 | ||||
-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, 21 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 47f5d5c09..6e7ff2a9b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -200,7 +200,7 @@ endif() # 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.2.0") +set(PACKAGE_VERSION "2.2.1") string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION}) if (NOT DEFINED DPKG_DATADIR) diff --git a/debian/changelog b/debian/changelog index 9d3113009..b5d79119d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +apt (2.2.1) unstable; urgency=medium + + [ Julian Andres Klode ] + * Do not require force-loopbreak on Protected packages (Closes: #983014) + * Branch of as 2.2.y for bullseye + * configuration: Add missing #include <array> + * Remove .travis.yml, we are using GitLab CI these days + * RunScripts: Do not reset SIGQUIT and SIGINT to SIG_DFL (LP: #1898026) + * regression fix: do require force-loopbreak for Conflicts + + [ Алексей Шилин ] + * Russian translation update (Closes: #983348) + + -- Julian Andres Klode <jak@debian.org> Mon, 01 Mar 2021 22:27:55 +0100 + apt (2.2.0) unstable; urgency=medium * The "Happy soft freeze" release diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 733ed34b4..6b2107496 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.2.0"> +<!ENTITY apt-product-version "2.2.1"> <!-- (Code)names for various things used all over the place --> <!ENTITY debian-oldstable-codename "buster"> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index b9d3ce4b0..bf1c92e39 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.2.0\n" +"Project-Id-Version: apt-doc 2.2.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2021-02-18 20:35+0100\n" +"POT-Creation-Date: 2021-03-01 22:28+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 03d849b4e..38f5cda0e 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 2.2.0\n" +"Project-Id-Version: apt 2.2.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2021-02-18 20:35+0100\n" +"POT-Creation-Date: 2021-03-01 22:28+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" |