From a9ecbb403e7da51aef6814c1b5a19bc18bdb3622 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Mon, 20 Aug 2018 10:13:28 +0200
Subject: Revert "Release 1.6.3ubuntu0.1"

This reverts commit ed94a024e14e0fdbd9ea6cabd07063da441bcc02.
---
 CMakeLists.txt                |  2 +-
 debian/changelog              | 10 ----------
 debian/control                |  3 +--
 doc/apt-get.8.xml             |  2 +-
 doc/apt-transport-https.1.xml |  2 +-
 doc/apt-verbatim.ent          |  2 +-
 doc/apt.conf.5.xml            |  2 +-
 doc/po/apt-doc.pot            |  4 ++--
 doc/sources.list.5.xml        |  2 +-
 po/apt-all.pot                |  4 ++--
 10 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a2723cfc..710fe9737 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,7 +182,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.6.3ubuntu0.1")
+set(PACKAGE_VERSION "1.6.3")
 
 if (NOT DEFINED DPKG_DATADIR)
   execute_process(COMMAND ${PERL_EXECUTABLE} -MDpkg -e "print $Dpkg::DATADIR;"
diff --git a/debian/changelog b/debian/changelog
index 1c700e21e..8dd68cdaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,3 @@
-apt (1.6.3ubuntu0.1) bionic-security; urgency=medium
-
-  [ David Kalnischkies ]
-  * SECURITY UPDATE: Fallback in the mirror method allowed a later server to
-    supply any InRelease file without it having to be verified. (LP: #1787752)
-    - apt-pkg/acquire-item.cc:: clear alternative URIs for mirror:// between steps
-    - CVE-2018-0501
-
- -- Julian Andres Klode <juliank@ubuntu.com>  Mon, 20 Aug 2018 09:48:01 +0200
-
 apt (1.6.3) unstable; urgency=medium
 
   * Handle JSON hooks that just close the file/exit and fix some other errors
diff --git a/debian/control b/debian/control
index 9b94059e4..333150ff8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,7 @@
 Source: apt
 Section: admin
 Priority: important
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
+Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Michael Vogt <mvo@debian.org>,
            Julian Andres Klode <jak@debian.org>,
            David Kalnischkies <donkult@debian.org>
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 5ca6cde85..c1db915b3 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>2018-08-20T00:00:00Z</date>
+   <date>2018-06-25T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/doc/apt-transport-https.1.xml b/doc/apt-transport-https.1.xml
index 204aae904..bccfa4fb0 100644
--- a/doc/apt-transport-https.1.xml
+++ b/doc/apt-transport-https.1.xml
@@ -13,7 +13,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2018-08-20T00:00:00Z</date>
+   <date>2018-06-25T00:00:00Z</date>
  </refentryinfo>
 
  <refmeta>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 639014c2f..227f93211 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -262,7 +262,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "1.6.3ubuntu0.1">
+<!ENTITY apt-product-version "1.6.3">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "jessie">
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 470fc8998..d377106f7 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>2018-08-20T00:00:00Z</date>
+   <date>2018-06-25T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 116b60891..68fb07f53 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.6.3ubuntu0.1\n"
+"Project-Id-Version: apt-doc 1.6.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2018-08-20 09:49+0200\n"
+"POT-Creation-Date: 2018-07-09 16:41+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"
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index d52e4ea55..4eedcf520 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>2018-08-20T00:00:00Z</date>
+   <date>2018-06-25T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 1edffc406..478f8e744 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 1.6.3ubuntu0.1\n"
+"Project-Id-Version: apt 1.6.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2018-08-20 09:49+0200\n"
+"POT-Creation-Date: 2018-07-09 16:41+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