From f3b5d3c47ba042ddf60588ce9d5185db902a7b55 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Thu, 16 Jan 2020 12:15:39 +0100
Subject: Release 1.9.7

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8272daaff..e4e3fa746 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 "1.9.6")
+set(PACKAGE_VERSION "1.9.7")
 string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION})
 
 if (NOT DEFINED DPKG_DATADIR)
diff --git a/debian/changelog b/debian/changelog
index 17e9db590..5de79aefd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+apt (1.9.7) experimental; urgency=medium
+
+  * Trim trailing whitespace (thanks lintian-brush)
+  * NewProvidesAllArch: Check if group is empty before using it.
+    This caused automake-1.16 to not be provided by automake anymore,
+    because apt wanted to add provides to packages in an empty automake-1.16
+    group. LP: #1859952
+  * Fix debian-rules-uses-deprecated-systemd-override.
+    We accidentally managed to restart apt-daily{,-upgrade}.service
+    again because our dh_systemd_start override was being ignored
+    since we switched to debhelper 12. Override dh_installsystemd
+    instead.
+
+ -- Julian Andres Klode <jak@debian.org>  Thu, 16 Jan 2020 12:13:50 +0100
+
 apt (1.9.6) experimental; urgency=medium
 
   [ Julian Andres Klode ]
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index c094775ec..57264c5c1 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 "1.9.6">
+<!ENTITY apt-product-version "1.9.7">
 
 <!-- (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 1a80db808..0af4a2f1a 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 1.9.6\n"
+"Project-Id-Version: apt-doc 1.9.7\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2020-01-15 23:07+0100\n"
+"POT-Creation-Date: 2020-01-16 12:15+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 6d8c2cc26..bec6b83f9 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 1.9.6\n"
+"Project-Id-Version: apt 1.9.7\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2020-01-15 23:07+0100\n"
+"POT-Creation-Date: 2020-01-16 12:15+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