Switch to 'http' as the default https method

The old curl based method is still available as 'curl',
'curl+http', and 'curl+https'.

4 files changed, 22 insertions, 6 deletions

diff --git a/debian/NEWS b/debian/NEWS
index 5722ca0c5..4afb403ca 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,12 @@
+apt (1.5~alpha4) UNRELEASED; 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
+  now that can be used as a fallback with curl+https URLs, or by setting
+  Dir::Bin::Methods::https to "curl".
+
+ -- Julian Andres Klode <jak@debian.org>  Fri, 30 Jun 2017 15:26:44 +0200
+
 apt (1.5~alpha1) experimental; urgency=medium
 
   [ Changes to unauthenticated repositories ]
diff --git a/debian/apt-transport-https.install b/debian/apt-transport-https.install
index 7b14886df..4849f1484 100644
--- a/debian/apt-transport-https.install
+++ b/debian/apt-transport-https.install
@@ -1 +1,3 @@
-usr/lib/apt/methods/https
+usr/lib/apt/methods/curl
+usr/lib/apt/methods/curl+http
+usr/lib/apt/methods/curl+https
diff --git a/debian/control b/debian/control
index 4f9043d22..896f98783 100644
--- a/debian/control
+++ b/debian/control
@@ -36,8 +36,9 @@ Depends: adduser,
          ${apt:keyring},
          ${misc:Depends},
          ${shlibs:Depends}
-Replaces: apt-utils (<< 1.3~exp2~)
-Breaks: apt-utils (<< 1.3~exp2~)
+Replaces: apt-utils (<< 1.3~exp2~), apt-transport-https (<< 1.5~alpha4~)
+Breaks: apt-utils (<< 1.3~exp2~), apt-transport-https (<< 1.5~alpha4~)
+Provides: apt-transport-https (= ${binary:Version})
 Recommends: ca-certificates
 Suggests: apt-doc,
           aptitude | synaptic | wajig,
@@ -148,10 +149,10 @@ Description: package management related utility programs
 
 Package: apt-transport-https
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, apt (>= 1.5~alpha4~)
 Recommends: ca-certificates
 Priority: optional
-Description: https download transport for APT
+Description: Transitional package: curl-https download transport for APT
  This package enables the usage of 'deb https://foo distro main' lines
  in the /etc/apt/sources.list so that all package managers using the
  libapt-pkg library can access metadata and packages available in sources
@@ -159,3 +160,7 @@ Description: https download transport for APT
  .
  This transport supports server as well as client authentication
  with certificates.
+ .
+ This package is no longer needed, https support was integrated into apt,
+ and is only provided as a fallback if some bugs are found in apt's native
+ https support.
diff --git a/debian/rules b/debian/rules
index ede9591d1..d4e9600a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ override_dh_install-indep:
 
 override_dh_install-arch:
 	dh_install -papt-utils -X/dump
-	dh_install -papt -Xmethods/https
+	dh_install -papt -Xmethods/curl -Xmethods/curl+https -Xmethods/curl+http
 	dh_install --remaining --list-missing
 	install -m 644 debian/apt.conf.autoremove debian/apt/etc/apt/apt.conf.d/01autoremove
 	install -m 755 debian/apt.auto-removal.sh debian/apt/etc/kernel/postinst.d/apt-auto-removal