summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--debian/changelog8
-rw-r--r--doc/apt-cache.8.xml2
-rw-r--r--doc/apt-get.8.xml2
-rw-r--r--doc/apt-verbatim.ent2
-rw-r--r--doc/apt.conf.5.xml2
-rw-r--r--doc/sources.list.5.xml2
7 files changed, 14 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index db0ea1f47..c29c27e27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -165,7 +165,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~rc3ubuntu1")
+set(PACKAGE_VERSION "1.3~rc3ubuntu2")
if (NOT DEFINED COMMON_ARCH)
execute_process(COMMAND dpkg-architecture -qDEB_HOST_ARCH
diff --git a/debian/changelog b/debian/changelog
index fcfd415d4..257219b4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt (1.3~rc3ubuntu2) yakkety; urgency=medium
+
+ * test-apt-cdrom: Fix for gnupg 2.1.15
+ * Revert "test: Assert multi-arch in the chroot"
+ * Revert "test: Make sure we always find a dpkg in status file"
+
+ -- Julian Andres Klode <juliank@ubuntu.com> Thu, 01 Sep 2016 13:06:14 +0000
+
apt (1.3~rc3ubuntu1) yakkety; urgency=medium
* Merge with Debian, remaining changes:
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index 5c16ce851..b425019ee 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-30T00:00:00Z</date>
+ <date>2016-09-01T00:00:00Z</date>
</refentryinfo>
<refmeta>
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 09a5ba950..b21a8219b 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-30T00:00:00Z</date>
+ <date>2016-09-01T00:00:00Z</date>
</refentryinfo>
<refmeta>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 347f60259..47b3c23cd 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~rc3ubuntu1">
+<!ENTITY apt-product-version "1.3~rc3ubuntu2">
<!-- (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 ca0203468..4740b7630 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-30T00:00:00Z</date>
+ <date>2016-09-01T00:00:00Z</date>
</refentryinfo>
<refmeta>
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index bfc97e705..7b27641e1 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -14,7 +14,7 @@
&apt-email;
&apt-product;
<!-- The last update date -->
- <date>2016-08-30T00:00:00Z</date>
+ <date>2016-09-01T00:00:00Z</date>
</refentryinfo>
<refmeta>