Switch to 'http' as the default https method

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

1 files changed, 9 insertions, 4 deletions

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.