From 02b7ddb1404fa3969bceb03a5f35107884027ba6 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 16 Aug 2006 12:16:46 +0200
Subject: * methods/http.cc:   - check for incorrect proxy settings more
 carefully

---
 debian/changelog | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index a84146d20..e69c5091f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ apt (0.6.45.1) unstable; urgency=low
       versions of the package (closes: #257054)
     - properly handle recommends/suggests or-groups when printing the list of
       suggested/recommends packages (closes: #311619)
+  * methods/http.cc:
+    - check more careful for incorrect proxy settings (closes: #378868)
 
  --
 
-- 
cgit v1.2.3


From 9d2938d4e6e86c6afdb9606f76f4ae9ce0ac4ee5 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 6 Sep 2006 19:12:34 +0200
Subject: * cmdline/apt-get.cc:   - always show the autoremove information and
 give advice how to use it * debian/rules:   - install apt.conf.autoremove
 with blacklist for linux-image and linux-restriceted-modules

---
 debian/apt.conf.autoremove | 8 ++++++++
 debian/apt.dirs            | 1 +
 debian/rules               | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 debian/apt.conf.autoremove

(limited to 'debian')

diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove
new file mode 100644
index 000000000..98143ce9a
--- /dev/null
+++ b/debian/apt.conf.autoremove
@@ -0,0 +1,8 @@
+APT
+{
+  NeverAutoRemove  
+  { 
+	"^linux-image.*";  
+	"^linux-restricted-modules.*";
+  };
+};
diff --git a/debian/apt.dirs b/debian/apt.dirs
index e1cb738fa..1543e8bb1 100644
--- a/debian/apt.dirs
+++ b/debian/apt.dirs
@@ -2,6 +2,7 @@ usr/bin
 usr/lib/apt/methods
 usr/lib/dpkg/methods/apt
 etc/apt
+etc/apt/apt.conf.d
 etc/apt/sources.list.d
 var/cache/apt/archives/partial
 var/lib/apt/lists/partial
diff --git a/debian/rules b/debian/rules
index 044f742d0..6a142e759 100755
--- a/debian/rules
+++ b/debian/rules
@@ -211,7 +211,7 @@ apt: build debian/shlibs.local
 	cp debian/bugscript debian/$@/usr/share/bug/apt/script
 
 	cp share/debian-archive.gpg debian/$@/usr/share/$@
-
+	cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
 #	head -n 500 ChangeLog > debian/ChangeLog
 
 	dh_installexamples -p$@ $(BLD)/docs/examples/*
-- 
cgit v1.2.3