From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 6 May 2005 08:16:15 +0000 (+0000)
Subject: * added myself to uploaders, changelog is signed with mvo@debian.org and in sync... 
X-Git-Tag: 0.7.21~409
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/f3657a2f75381354a75cde84bc6fd54b91227340

* added myself to uploaders, changelog is signed with mvo@debian.org and in sync with the debian/experimental upload


Patches applied:

 * apt@packages.debian.org/apt--main--0--patch-77
   Merge apt--mvo--0

 * apt@packages.debian.org/apt--main--0--patch-78
   Update changelog

 * apt@packages.debian.org/apt--main--0--patch-79
   Merge michael.vogt@ubuntu.com--2005/apt--mvo--0
---

f3657a2f75381354a75cde84bc6fd54b91227340
diff --cc debian/changelog
index ad3d0f66e,87e713d3d..acfece5dd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,15 +1,15 @@@
  apt (0.6.36) experimental; urgency=low
  
-   * apt-pkg/acquire-item.cc:
-     added "Acquire::BrokenProxy" that will force apt to always 
-     re-get the Release.gpg file (for broken proxies)
-   * debian/apt.cron.daily:
-     MinAge is defaulting to 2 days now to prevent over-aggresive removal 
-   * apt-pkg/cdrom.cc:
-     - honor "Acquire::gpgv::Options" when verfiying the signature
+   * Merge apt--mvo--0:
+     - apt-pkg/acquire-item.cc:
+       added "Acquire::BrokenProxy" that will force apt to always 
+       re-get the Release.gpg file (for broken proxies)
+     - debian/apt.cron.daily:
+       MinAge is defaulting to 2 days now to prevent over-aggresive removal 
+     - apt-pkg/cdrom.cc:
+       honor "Acquire::gpgv::Options" when verifying the signature (Ubuntu #8496)
   
-- -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 31 Mar 2005 20:37:11 +0200
++ -- Michael Vogt <mvo@debian.org>  Fri,  6 May 2005 10:12:20 +0200
  
  apt (0.6.35) hoary; urgency=low
  
diff --cc debian/control
index b7c430997,b7c430997..9dd271619
--- a/debian/control
+++ b/debian/control
@@@ -2,7 -2,7 +2,7 @@@ Source: ap
  Section: admin
  Priority: important
  Maintainer: APT Development Team <deity@lists.debian.org>
--Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>
++Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
  Standards-Version: 3.6.1
  Build-Depends: debhelper (>= 4.1.62), libdb4.2-dev, gettext (>= 0.12)
  Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1)