From 234fc02515642a1c9301a94d87b149d8a92fae7a Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Fri, 8 May 2020 18:02:59 +0200 Subject: Release 2.1.1 --- CMakeLists.txt | 2 +- debian/changelog | 12 ++++++++++++ doc/apt-verbatim.ent | 2 +- doc/po/apt-doc.pot | 54 ++++++++++++++-------------------------------------- po/apt-all.pot | 4 ++-- 5 files changed, 30 insertions(+), 44 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1571089c5..e98a166e4 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 ") -set(PACKAGE_VERSION "2.1.0") +set(PACKAGE_VERSION "2.1.1") string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION}) if (NOT DEFINED DPKG_DATADIR) diff --git a/debian/changelog b/debian/changelog index aba34297b..b33664ea5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +apt (2.1.1) unstable; urgency=medium + + [ David Kalnischkies ] + * Allow aptitude to MarkInstall broken packages via FromUser + * Drop nowrap from po4a --porefs as it is no longer supported + * Use "po4a --porefs file" instead of undocumented compat noline + + [ Artur Grącki ] + * Fix typo in Polish translation of --help messages + + -- Julian Andres Klode Fri, 08 May 2020 18:02:53 +0200 + apt (2.1.0) unstable; urgency=medium [ Frans Spiesschaert ] diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 85a52ffd1..301178caf 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -274,7 +274,7 @@ "> - + diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 770980cd1..a44998f18 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.0\n" +"Project-Id-Version: apt-doc 2.1.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2020-05-04 15:59+0200\n" +"POT-Creation-Date: 2020-05-08 18:03+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -496,18 +496,12 @@ msgid "" msgstr "" #. type: Content of: -#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml -#: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml +#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml msgid "8" msgstr "" #. type: Content of: -#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml -#: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml -#: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml -#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml -#: apt-transport-http.1.xml apt-transport-https.1.xml -#: apt-transport-mirror.1.xml apt-patterns.7.xml +#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml apt-transport-http.1.xml apt-transport-https.1.xml apt-transport-mirror.1.xml apt-patterns.7.xml msgid "APT" msgstr "" @@ -517,12 +511,7 @@ msgid "command-line interface" msgstr "" #. type: Content of: -#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml -#: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml -#: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml -#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml -#: apt-transport-http.1.xml apt-transport-https.1.xml -#: apt-transport-mirror.1.xml apt-patterns.7.xml +#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml apt-transport-http.1.xml apt-transport-https.1.xml apt-transport-mirror.1.xml apt-patterns.7.xml msgid "Description" msgstr "" @@ -722,11 +711,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml -#: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml -#: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml -#: apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml -#: apt-transport-http.1.xml apt-transport-https.1.xml apt-patterns.7.xml +#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml apt_auth.conf.5.xml apt-transport-http.1.xml apt-transport-https.1.xml apt-patterns.7.xml msgid "See Also" msgstr "" @@ -738,9 +723,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-cdrom.8.xml -#: apt-config.8.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml -#: apt-ftparchive.1.xml +#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-cdrom.8.xml apt-config.8.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml msgid "Diagnostics" msgstr "" @@ -766,8 +749,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml apt-cache.8.xml apt-cdrom.8.xml apt-config.8.xml -#: apt-ftparchive.1.xml +#: apt-get.8.xml apt-cache.8.xml apt-cdrom.8.xml apt-config.8.xml apt-ftparchive.1.xml msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given, " "one of the commands below must be present." @@ -1103,8 +1085,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml -#: apt-sortpkgs.1.xml apt-ftparchive.1.xml +#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml msgid "options" msgstr "" @@ -1526,8 +1507,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml -#: apt_preferences.5.xml apt_auth.conf.5.xml +#: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml apt_preferences.5.xml apt_auth.conf.5.xml msgid "Files" msgstr "" @@ -2158,8 +2138,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml apt-transport-http.1.xml -#: apt-transport-https.1.xml apt-transport-mirror.1.xml +#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml apt-transport-http.1.xml apt-transport-https.1.xml apt-transport-mirror.1.xml msgid "Options" msgstr "" @@ -2822,8 +2801,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml -#: apt-ftparchive.1.xml +#: apt-config.8.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml msgid "&apt-conf;" msgstr "" @@ -4266,9 +4244,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml -#: apt-transport-http.1.xml apt-transport-https.1.xml -#: apt-transport-mirror.1.xml apt-patterns.7.xml +#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml apt-transport-http.1.xml apt-transport-https.1.xml apt-transport-mirror.1.xml apt-patterns.7.xml msgid "Examples" msgstr "" @@ -6188,9 +6164,7 @@ msgid "&apt-get;, &apt-conf;, &apt-acquire-additional-files;" msgstr "" #. type: Content of: <refentry><refmeta><manvolnum> -#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml -#: apt-transport-http.1.xml apt-transport-https.1.xml -#: apt-transport-mirror.1.xml +#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml apt-transport-http.1.xml apt-transport-https.1.xml apt-transport-mirror.1.xml msgid "1" msgstr "" diff --git a/po/apt-all.pot b/po/apt-all.pot index 9cdb3fcdb..8b1b209aa 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 2.1.0\n" +"Project-Id-Version: apt 2.1.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2020-05-04 15:59+0200\n" +"POT-Creation-Date: 2020-05-08 18:03+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" -- cgit v1.2.3-18-g5258