Upload 1.5~alpha4 to experimental1.5_alpha4

5 files changed, 22 insertions, 6 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30f3e6073..92b2b6529 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -186,7 +186,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.5~alpha3")
+set(PACKAGE_VERSION "1.5~alpha4")
 
 if (NOT DEFINED DPKG_DATADIR)
   execute_process(COMMAND ${PERL_EXECUTABLE} -MDpkg -e "print $Dpkg::DATADIR;"
diff --git a/debian/NEWS b/debian/NEWS
index 4afb403ca..026e3d1cf 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,7 +1,10 @@
-apt (1.5~alpha4) UNRELEASED; urgency=medium
+apt (1.5~alpha4) experimental; urgency=medium
 
-  The apt package now installs the http method for https access, the
-  apt-transport-https package is deprecated, and installs a curl method
+  All known issues in the new https method have been fixed, including
+  support for https:// proxies and the CONNECT method. Therefore, the
+  the http method is now the default for https access.
+
+  The apt-transport-https package is deprecated, and installs a 'curl' method
   now that can be used as a fallback with curl+https URLs, or by setting
   Dir::Bin::Methods::https to "curl".
 
diff --git a/debian/changelog b/debian/changelog
index deb751c16..d581c1f3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+apt (1.5~alpha4) experimental; urgency=medium
+
+  * Reset failure reason when connection was successful
+  * Allow running the TLS stack on any lower connection
+  * http: Add support for CONNECT proxying to HTTPS locations
+  * http: Add support for https:// proxies
+  * Allow http(s) and socks5h for http and https in proxy auto detect
+  * Switch to 'http' as the default https method
+  * Improve closing the TLS connection
+  * TLS support: Error out on unsupported curl options
+
+ -- Julian Andres Klode <jak@debian.org>  Fri, 30 Jun 2017 18:18:09 +0200
+
 apt (1.5~alpha3) experimental; urgency=medium
 
   * Don't read CaInfo if not specified (missing else)
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 8895e934f..7eea44b2c 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>2017-06-29T00:00:00Z</date>
+   <date>2017-06-30T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 4e0079366..197be4653 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.5~alpha3">
+<!ENTITY apt-product-version "1.5~alpha4">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "jessie">