From c08cf1dc784a98a253296a51433f6de7d16d3125 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Sat, 19 Oct 2013 18:29:59 +0200
Subject: add Acquire::http::Proxy-Auto-Detect to the apt.conf.5 manpage
 (closes: 726597)

---
 doc/apt-verbatim.ent | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index c9bb06123..0d0d95c7a 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -124,6 +124,12 @@
   </citerefentry>"
 >
 
+<!ENTITY squid-deb-proxy-client "<citerefentry>
+    <refentrytitle><command>squid-deb-proxy-client</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
 <!ENTITY debsign "<citerefentry>
     <refentrytitle><command>debsign</command></refentrytitle>
     <manvolnum>1</manvolnum>
-- 
cgit v1.2.3


From eef71f11a5836eb82df133cb4e24cb4806642188 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sat, 30 Nov 2013 14:01:28 +0100
Subject: introduce a vendor system to change sources.list

Many derivatives make quiet a few simple changes to apt introducing
silly diffs just to change examples and co making it harder for
them to update apt and harder for us to merge real changes back.

First stop: doc/examples/sources.list
---
 doc/apt-verbatim.ent | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 0d0d95c7a..30b0c7fe0 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -221,11 +221,11 @@
 <!-- this will be updated by 'prepare-release' -->
 <!ENTITY apt-product-version "0.9.7.6ubuntu2">
 
-<!-- Codenames for debian releases -->
+<!-- (Code)names for various things used all over the place -->
 <!ENTITY oldstable-codename "squeeze">
 <!ENTITY stable-codename "wheezy">
 <!ENTITY testing-codename "jessie">
-<!ENTITY stable-version "7.0">
+<!ENTITY stable-version "7">
 <!ENTITY ubuntu-codename "precise">
 
 <!-- good and bad just refers to matching and not matching a pattern…
-- 
cgit v1.2.3


From ce34af08ad6866869147e3525fa6c89d8dcb4601 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Sat, 7 Dec 2013 14:54:55 +0100
Subject: really release 0.9.14

---
 doc/apt-verbatim.ent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 30b0c7fe0..11f722fbf 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -219,7 +219,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.7.6ubuntu2">
+<!ENTITY apt-product-version "0.9.14">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY oldstable-codename "squeeze">
-- 
cgit v1.2.3


From 5669725a6163d3e1184c3991f993085e42734c33 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Thu, 12 Dec 2013 18:36:49 +0100
Subject: releasing package apt version 0.9.14.1

---
 doc/apt-verbatim.ent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 11f722fbf..10e4d4d7c 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -219,7 +219,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.14">
+<!ENTITY apt-product-version "0.9.14.1">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY oldstable-codename "squeeze">
-- 
cgit v1.2.3


From 6de58cbf6b78506898ef23ca26b068eedf8ed97f Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Sat, 21 Dec 2013 17:56:32 +0100
Subject: vendor/getinfo:

* vendor/getinfo:
  - fix ubuntu-codename
---
 doc/apt-verbatim.ent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 10e4d4d7c..21b62e452 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -226,7 +226,7 @@
 <!ENTITY stable-codename "wheezy">
 <!ENTITY testing-codename "jessie">
 <!ENTITY stable-version "7">
-<!ENTITY ubuntu-codename "precise">
+<!ENTITY ubuntu-codename "trusty">
 
 <!-- good and bad just refers to matching and not matching a pattern…
      It is not a remark about the specific perl version.
-- 
cgit v1.2.3


From c2622bd69a5209739aa3055a8c7f3298612d8845 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Sun, 29 Dec 2013 17:01:11 +0100
Subject: prepare release

---
 doc/apt-verbatim.ent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 21b62e452..9a061e61d 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -219,7 +219,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.14.1">
+<!ENTITY apt-product-version "0.9.14.2">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY oldstable-codename "squeeze">
-- 
cgit v1.2.3


From c09548fde7a8a5efd793784d02bb933c2eef3c4d Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Sun, 5 Jan 2014 10:08:42 +0100
Subject: prepare 0.9.14.3~exp1

---
 doc/apt-verbatim.ent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 9a061e61d..8d6131d58 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -219,7 +219,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.14.2">
+<!ENTITY apt-product-version "0.9.14.3~exp1">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY oldstable-codename "squeeze">
-- 
cgit v1.2.3


From 609bb2ead3adef6e56daac1d12a9bdc482a4ae77 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Sat, 18 Jan 2014 21:12:40 +0100
Subject: releasing package apt version 0.9.14.3~exp3

---
 doc/apt-verbatim.ent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 8d6131d58..47763c4c1 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -219,7 +219,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.14.3~exp1">
+<!ENTITY apt-product-version "0.9.14.3~exp3">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY oldstable-codename "squeeze">
-- 
cgit v1.2.3


From b18dd45f2c71fbdf5c0eef113e9e8e01f84b70a7 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Wed, 22 Jan 2014 18:59:14 +0100
Subject: releasing package apt version 0.9.14.3~exp4

---
 doc/apt-verbatim.ent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 47763c4c1..8ed15f199 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -219,7 +219,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.14.3~exp3">
+<!ENTITY apt-product-version "0.9.14.3~exp4">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY oldstable-codename "squeeze">
-- 
cgit v1.2.3


From 8c39c4b6e65036390b8ca4d74174192739a4139d Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Fri, 24 Jan 2014 23:21:23 +0100
Subject: releasing package apt version 0.9.14.3~exp5

---
 doc/apt-verbatim.ent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 8ed15f199..f3a24e209 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -219,7 +219,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.14.3~exp4">
+<!ENTITY apt-product-version "0.9.14.3~exp5">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY oldstable-codename "squeeze">
-- 
cgit v1.2.3


From 9aef3908c892f9d9349d8bf8a5ceaeea313ba0fe Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Sat, 25 Jan 2014 21:57:26 +0100
Subject: releasing package apt version 0.9.15

---
 doc/apt-verbatim.ent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index f3a24e209..2b5a6fd47 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -219,7 +219,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.14.3~exp5">
+<!ENTITY apt-product-version "0.9.15">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY oldstable-codename "squeeze">
-- 
cgit v1.2.3


From 9f2df510b17f6b64801677915f5c25f73290d3f4 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Thu, 6 Feb 2014 18:10:48 +0100
Subject: releasing package apt version 0.9.15.1

---
 doc/apt-verbatim.ent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 2b5a6fd47..a96c84d3a 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -219,7 +219,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.15">
+<!ENTITY apt-product-version "0.9.15.1">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY oldstable-codename "squeeze">
-- 
cgit v1.2.3


From 72bae92a6c0deb638b0daf844ccb06273b1723c6 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Thu, 13 Feb 2014 09:52:03 +0100
Subject: releasing package apt version 0.9.15.2

---
 doc/apt-verbatim.ent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index a96c84d3a..cadcc27ae 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -219,7 +219,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.15.1">
+<!ENTITY apt-product-version "0.9.15.2">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY oldstable-codename "squeeze">
-- 
cgit v1.2.3


From 1c93747533dcf1cbbb2c743d0028ad157a7684a4 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Thu, 20 Feb 2014 14:42:50 +0100
Subject: releasing package apt version 0.9.15.3

---
 doc/apt-verbatim.ent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index cadcc27ae..966ca2b0f 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -219,7 +219,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.15.2">
+<!ENTITY apt-product-version "0.9.15.3">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY oldstable-codename "squeeze">
-- 
cgit v1.2.3


From bef4b142853642db669f6ffea54fa52c9b52cd95 Mon Sep 17 00:00:00 2001
From: Jon Severinsson <jon@severinsson.net>
Date: Sat, 22 Feb 2014 18:40:09 +0100
Subject: add apt-vendor information for tanglu

---
 doc/apt-verbatim.ent | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 966ca2b0f..d191c08fa 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -226,6 +226,7 @@
 <!ENTITY stable-codename "wheezy">
 <!ENTITY testing-codename "jessie">
 <!ENTITY stable-version "7">
+<!ENTITY tanglu-codename "bartholomea">
 <!ENTITY ubuntu-codename "trusty">
 
 <!-- good and bad just refers to matching and not matching a pattern…
-- 
cgit v1.2.3


From 39b73d816877098e7ccdd0a392cd02aa4c2fac04 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Sun, 23 Feb 2014 00:28:26 +0100
Subject: releasing package apt version 0.9.15.4

---
 doc/apt-verbatim.ent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/apt-verbatim.ent')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index d191c08fa..b9e6a881a 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -219,7 +219,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.15.3">
+<!ENTITY apt-product-version "0.9.15.4">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY oldstable-codename "squeeze">
-- 
cgit v1.2.3