From 43329109786beca8f2eb7a239050059b249651b7 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Thu, 18 Aug 2016 14:25:01 +0200
Subject: 1.3~rc2ubuntu2

---
 CMakeLists.txt       | 2 +-
 debian/changelog     | 6 ++++++
 doc/apt-cache.8.xml  | 2 +-
 doc/apt-get.8.xml    | 2 +-
 doc/apt-verbatim.ent | 2 +-
 doc/apt.conf.5.xml   | 2 +-
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a85b53f5..ad0fcc0d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,7 +113,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 "1.3~rc2ubuntu1")
+set(PACKAGE_VERSION "1.3~rc2ubuntu2")
 
 if (NOT DEFINED COMMON_ARCH)
   execute_process(COMMAND dpkg-architecture -qDEB_HOST_ARCH
diff --git a/debian/changelog b/debian/changelog
index e5e3f99e5..96805c4b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apt (1.3~rc2ubuntu2) yakkety; urgency=medium
+
+  * tests/control: Handle the gpg1/gpg2 mess a bit better
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Thu, 18 Aug 2016 12:24:10 +0000
+
 apt (1.3~rc2ubuntu1) yakkety; urgency=medium
 
   * Merge with Debian, remaining changes (forgotten to merge upstream):
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index 571779931..7ebc1c5c6 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -14,7 +14,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2016-08-17T00:00:00Z</date>
+   <date>2016-08-18T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 33130684c..f87419229 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -14,7 +14,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2016-08-17T00:00:00Z</date>
+   <date>2016-08-18T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 715e71001..7fbfddd9e 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -239,7 +239,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "1.3~rc2ubuntu1">
+<!ENTITY apt-product-version "1.3~rc2ubuntu2">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "wheezy">
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 403975627..0c2b7f763 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -19,7 +19,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2016-08-12T00:00:00Z</date>
+   <date>2016-08-18T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
-- 
cgit v1.2.3