merged lp:~jackyf-devel/apt/debian-sid

3 files changed, 32 insertions, 11 deletions

diff --git a/debian/apt-transport-https.README b/debian/apt-transport-https.README
new file mode 100644
index 000000000..0c470a1a2
--- /dev/null
+++ b/debian/apt-transport-https.README
@@ -0,0 +1,2 @@
+See APT::https group of options in apt.conf(5) to configure how APT will handle
+https:// URIs.
diff --git a/debian/changelog b/debian/changelog
index b2da4648b..5d6a6d6b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+apt (0.7.20) unstable; urgency=low
+
+  [ Eugene V. Lyubimkin ]
+  * debian/changelog:
+    - Fixed place of 'merged install-recommends and install-task branches'
+      from 0.6.46.1 to 0.7.0. (Closes: #439866)
+  * buildlib/config.{sub,guess}:
+    - Renewed. This fixes lintian errors.
+  * doc/apt.conf.5.xml, debian/apt-transport-https:
+    - Documented briefly 'APT::https' group of options. (Closes: #507398)
+    - Applied patch from Daniel Burrows to document 'Debug' group of options.
+      (Closes: #457265)
+    - Mentioned 'APT::Periodic' and 'APT::Archives' groups of options.
+      (Closes: #438559)
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Sat, 06 Dec 2008 20:57:00 +0200
+
 apt (0.7.20~exp3) unstable; urgency=low
 
   [ Michael Vogt ]
@@ -6,6 +23,8 @@ apt (0.7.20~exp3) unstable; urgency=low
     APT::Get::Build-Dep-Automatic to false (thanks to Aaron 
     Haviland, closes: #44874, LP: #248268)
 
+apt (0.7.20~exp2) unstable; urgency=low
+
   [ Eugene V. Lyubimkin ]
   * doc/examples/sources.list:
     - Removed obsolete commented non-us deb-src entry, replaced it with
@@ -873,6 +892,16 @@ apt (0.7.0) experimental; urgency=low
   * support for unattended-upgrades (via unattended-upgrades
     package)
   * added apt-transport-https method
+  * merged "install-recommends" branch (ABI break): 
+    - new "--install-recommends"
+    - install new recommends on "upgrade" if --install-recommends is 
+      given
+    - new "--fix-policy" option to install all packages with unmet
+      important dependencies (usefull with --install-recommends to
+      see what not-installed recommends are on the system)
+    - fix of recommended packages display (only show CandidateVersion
+      fix or-group handling)
+  * merged "install-task" branch (use with "apt-get install taskname^")
 
  -- Michael Vogt <mvo@debian.org>  Fri, 12 Jan 2007 20:48:07 +0100
 
@@ -963,16 +992,6 @@ apt (0.6.46.2) unstable; urgency=low
 
 apt (0.6.46.1) unstable; urgency=low
 
-  * merged "install-recommends" branch (ABI break): 
-    - new "--install-recommends"
-    - install new recommends on "upgrade" if --install-recommends is 
-      given
-    - new "--fix-policy" option to install all packages with unmet
-      important dependencies (usefull with --install-recommends to
-      see what not-installed recommends are on the system)
-    - fix of recommended packages display (only show CandidateVersion
-      fix or-group handling)
-  * merged "install-task" branch (use with "apt-get install taskname^")
   * methods/gzip.cc:
     - deal with empty files 
   * Applied patch from Daniel Schepler to make apt bin-NMU able.
diff --git a/debian/rules b/debian/rules
index f587b141a..f1eb62b57 100755
--- a/debian/rules
+++ b/debian/rules
@@ -307,7 +307,7 @@ apt-transport-https: build debian/shlibs.local libapt-pkg-dev
 	mkdir -p debian/$@/usr/lib/apt/methods
 	cp $(BLD)/bin/methods/https debian/$@/usr/lib/apt/methods
 
-	dh_installdocs -p$@
+	dh_installdocs -p$@ debian/apt-transport-https.README
 	dh_installexamples -p$@
 
 	# Install the man pages..