From 120365cee294d00706928b0327ac755ab3448eca Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 28 Jun 2005 08:41:51 +0000
Subject: * cleanups, documentation updates (don't show any debug output if no
 Debug::pkgAutomaticRemove was set, don't remove if not
 APT::Get::AutomaticRemove (--automatic-remove) was set)

---
 doc/examples/configure-index | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'doc/examples')

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index a09ea0c37..31bc13430 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -29,6 +29,7 @@ APT
   Get 
   {
      Arch-Only "false";
+     AutomaticRemove "false";       
      Download-Only "false";
      Simulate "false";
      Assume-Yes "false";
@@ -235,7 +236,8 @@ Debug
   pkgAcquire::Worker "false";
   pkgDPkgPM "false";
   pkgOrderList "false";
-  
+  pkgAutoRemove "false";   // show information about automatic removes
+
   pkgInitialize "false";   // This one will dump the configuration space
   NoLocking "false";
   Acquire::Ftp "false";    // Show ftp command traffic
-- 
cgit v1.2.3


From 22dcc318d978813b3c4d1ae1a1f41933d0e1d69b Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 30 Jun 2005 08:53:45 +0000
Subject: * added APT::NeverAutoRemove (a list of regexp for package names that
 should never be automatically removed)

---
 doc/examples/configure-index | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'doc/examples')

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 31bc13430..b4ac0ed4b 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -24,7 +24,10 @@ APT
 {
   Architecture "i386";
   Build-Essential "build-essential";
-  
+
+  NeverAutoRemove  { "linux-kernel.*";  };  // packages that should never
+                                            // considered for autoRemove
+
   // Options for apt-get
   Get 
   {
-- 
cgit v1.2.3


From 2a7e07c7578048abd9f7bfd4ce0ca5c3696b9f3a Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 18 Aug 2005 10:38:58 +0000
Subject: * merged from main

Patches applied:

 * apt@packages.debian.org/apt--main--0--patch-100
   Use debian.org address in mainline

 * apt@packages.debian.org/apt--main--0--patch-101
   Update pot file

 * apt@packages.debian.org/apt--main--0--patch-102
   Open 0.6.40

 * apt@packages.debian.org/apt--main--0--patch-103
   Patch from Jordi Mallach to mark some additional strings for translation

 * apt@packages.debian.org/apt--main--0--patch-104
   Updated Catalan translation from Jordi Mallach

 * apt@packages.debian.org/apt--main--0--patch-105
   Merge from bubulle@debian.org--2005/apt--main--0

 * apt@packages.debian.org/apt--main--0--patch-106
   Restore lost changelog entries

 * apt@packages.debian.org/apt--main--0--patch-107
   Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0

 * apt@packages.debian.org/apt--main--0--patch-108
   Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0

 * apt@packages.debian.org/apt--main--0--patch-109
   Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0

 * apt@packages.debian.org/apt--main--0--patch-110
   Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0

 * bubulle@debian.org--2005/apt--main--0--patch-90
   Merge with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-91
   Updated Slovak translation

 * bubulle@debian.org--2005/apt--main--0--patch-92
   Add apt-key French man page

 * bubulle@debian.org--2005/apt--main--0--patch-93
   Update Greek translations

 * bubulle@debian.org--2005/apt--main--0--patch-94
   Merge with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-95
   Sync PO files with the POT file/French translation update

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-85

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-1
   * inital proof of concept code, understands what dpkg tells it already

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-2
   * progress reporting works now

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-3
   * added "APT::Status-Fd" variable

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-4
   * do i18n now too

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-5
   * define N_(x) if it is not defined already

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-6
   * PackageManager::DoInstall(int status_fd) added (does not break the ABI)

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-7
   * merged with apt--fixes--0 to make it build again

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-8
   * added support for "error" and "conffile-prompt" messages from dpkg

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-9
   merge with main

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-10
   * use sizeof() for all snprintf() uses; fix a potential line break problem in the status reading code; changed the N_() to _() calls

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-11
   * added APT::KeepFDs configuration list for file descriptors that apt should leave open (needed for various frontends like debconf, synaptic)

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-12
   * fixed a API breakage

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-13
   * doc added, should be releasable now

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-14
   * merged with apt--main--0

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-15
   * more source comments, added Debug::DpkgPM debug code to inspect the dpkg<->apt communication, broke the abi (ok with matt)

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-16
   * the progress reporting has it's own "Debug::pkgDPkgProgressReporting" debug variable now

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-17
   * merged PackageOps and TranslatedPackageOps into a single Map with the new DpkgState struct

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-18
   * clear the APT::Keep-Fds configuration when it's no longer needed

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-19
   * rewrote the reading from dpkg so that it never blocks

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-20
   * merged the two status arrays into one

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-21
   * added support for download progress reporting too (for Kamion and base-config)

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-22
   * ABI break; added Configuration::Clear(string List, {int,string} value) added (to remove a single Value from a list); test/conf_clear.cc added

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-23
   * remvoed a debug string

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-24
   * soname changed, fixed a bug in the parsing code when dpkg send the same state more than once (at the end)

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-25
   * merged with apt@packages.debian.org/apt--main--0, added changelog entry for the 0.6.40.1 upload

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-26
   * fix a bug when out-of-order states are send from dpkg

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-27
   * changelog update

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-28
   * a real changelog entry now

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-29
   * changelog finalized

 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-30
   * propper (and sane) support for pmerror and pmconffile added
---
 doc/examples/configure-index | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'doc/examples')

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index b4ac0ed4b..2c16cd31f 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -88,6 +88,13 @@ APT
   Force-LoopBreak "false";         // DO NOT turn this on, see the man page
   Cache-Limit "4194304";
   Default-Release "";
+
+
+  // Write progress messages on this fd (for stuff like base-config)
+  Status-Fd "-1";
+  // Keep the list of FDs open (normally apt closes all fds when it
+  // does a ExecFork)
+  Keep-Fds {};
 };
 
 // Options for the downloading routines
@@ -238,6 +245,7 @@ Debug
   pkgAcquire "false";
   pkgAcquire::Worker "false";
   pkgDPkgPM "false";
+  pkgDPkgProgressReporting "false";
   pkgOrderList "false";
   pkgAutoRemove "false";   // show information about automatic removes
 
-- 
cgit v1.2.3


From e9ae36778e841f09ad195c17004e711bf7b7abae Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 9 Aug 2006 15:08:58 +0200
Subject: * cmdline/apt-get.cc:   - added "{no-}install-recommends" option to
 apt-get * doc/examples/configure-index:   - recommends/suggests option
 documented

---
 doc/examples/configure-index | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'doc/examples')

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index f8abd75ed..c4329dfa0 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -90,6 +90,10 @@ APT
   Cache-Limit "4194304";
   Default-Release "";
 
+  // consider Recommends, Suggests as important dependencies that should
+  // be installed by default
+  APT::Install-Recommends "false";
+  APT::Install-Suggests "false";
 
   // Write progress messages on this fd (for stuff like base-config)
   Status-Fd "-1";
-- 
cgit v1.2.3


From 714ee06cb1f8892f283bcdcfbb7ebbba8d642193 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 19 Dec 2006 13:11:26 +0100
Subject: * methods/https.cc:   - implemented various cert verification options

---
 doc/examples/configure-index | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'doc/examples')

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 73e20aa43..dad8b691c 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -120,6 +120,18 @@ Acquire
     Dl-Limit "7";        // 7Kb/sec maximum download rate
   };
 
+  // HTTPS method configuration:
+  // - uses the http proxy config 
+  // - uses the http cache-control values
+  // - uses the http Dl-Limit values
+  https 
+  {
+	Verify-Peer "false";
+	SslCert "/etc/apt/some.pem";
+        CaPath  "/etc/ssl/certs";
+        Verify-Host" "2";
+  };
+
   ftp
   {
     Proxy "ftp://127.0.0.1/";
@@ -261,6 +273,7 @@ Debug
   NoLocking "false";
   Acquire::Ftp "false";    // Show ftp command traffic
   Acquire::Http "false";   // Show http command traffic
+  Acquire::Https "false";   // Show https debug
   Acquire::gpgv "false";   // Show the gpgv traffic
   aptcdrom "false";        // Show found package files
   IdentCdrom "false";
-- 
cgit v1.2.3


From 92b9551f03035f5a875a44588a318773f652da6a Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 14 Mar 2007 11:45:33 +0100
Subject: * apt-pkg/depcache.cc:   - added APT::Never-MarkAuto-Section variable
 - that will consider dependencies of packages in this section manual

---
 doc/examples/configure-index | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc/examples')

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 1911d091b..32b7168a0 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -94,6 +94,8 @@ APT
   Cache-Limit "4194304";
   Default-Release "";
 
+  // consider dependencies of packages in this section manual
+  Never-MarkAuto-Section "metapackages";
 
   // Write progress messages on this fd (for stuff like base-config)
   Status-Fd "-1";
-- 
cgit v1.2.3


From 7898bd970a791bb8892b0dfdffc683828a447900 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 14 Mar 2007 13:57:57 +0100
Subject: =?UTF-8?q?*=20cmdline/apt-get.cc:=20=20=20-=20applied=20patch=20f?=
 =?UTF-8?q?rom=20Frode=20M.=20D=C3=B8ving=20=20to=20have=20APT::Get::HideA?=
 =?UTF-8?q?utoRemove?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/examples/configure-index | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc/examples')

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 32b7168a0..d3e061f9a 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -33,6 +33,7 @@ APT
   {
      Arch-Only "false";
      AutomaticRemove "false";       
+     HideAutoRemove "false";
      Download-Only "false";
      Simulate "false";
      Assume-Yes "false";
-- 
cgit v1.2.3