From 5426ad6462c5478592740146bf3ddd11179e52d8 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Wed, 13 Jan 2021 17:37:42 +0100
Subject: Release 2.1.18

---
 CMakeLists.txt       | 2 +-
 debian/changelog     | 7 +++++++
 doc/apt-verbatim.ent | 2 +-
 doc/po/apt-doc.pot   | 4 ++--
 po/apt-all.pot       | 4 ++--
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18999cdef..2d9afba61 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,7 +205,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.17")
+set(PACKAGE_VERSION "2.1.18")
 string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION})
 
 if (NOT DEFINED DPKG_DATADIR)
diff --git a/debian/changelog b/debian/changelog
index 9f3055a87..04e23fabe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (2.1.18) unstable; urgency=high
+
+  * pkgcachegen: Avoid write to old cache for Version::Extra (Closes: #980037)
+  * Adjust apt-mark test for dpkg 1.20.7
+
+ -- Julian Andres Klode <jak@debian.org>  Wed, 13 Jan 2021 17:37:30 +0100
+
 apt (2.1.17) unstable; urgency=medium
 
   [ Américo Monteiro ]
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 0cb1cfd5d..dd806cca8 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.17">
+<!ENTITY apt-product-version "2.1.18">
 
 <!-- (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 3f8a1c94c..38088d35f 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.17\n"
+"Project-Id-Version: apt-doc 2.1.18\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2021-01-11 12:11+0100\n"
+"POT-Creation-Date: 2021-01-13 17:37+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 ef7b77e81..325382601 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 2.1.17\n"
+"Project-Id-Version: apt 2.1.18\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2021-01-11 12:11+0100\n"
+"POT-Creation-Date: 2021-01-13 17:37+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"
-- 
cgit v1.2.3