summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2005-08-23 17:45:11 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2005-08-23 17:45:11 +0000
commit5d4aff08accfd096d50d99a24df1437a2fa41c8d (patch)
tree91a32f98ede58acdb870e4d88a6549643c786ec8 /debian
parentbdcf3b49360a353381e981d1918fc300c559948a (diff)
* merged the trust-cdrom branch
Patches applied: * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-79 * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-1 * implemented "TrustCDROM" mode * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-2 * added APT::Authentication::TrustCDROM to the configure-index
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog15
1 files changed, 8 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 61f5be622..a5f4f11ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.6.40.2) unstable; urgency=low
+apt (0.6.40.1ubuntu2) breezy; urgency=low
* improved the support for "error" and "conffile" reporting from
dpkg, added the format to README.progress-reporting
@@ -11,14 +11,15 @@ apt (0.6.40.2) unstable; urgency=low
* apt-pkg/acquire-item.cc:
- fail early if a FailReason is TmpResolveFailure (avoids hangs during
the install when no network is available)
+ * merged michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0
- --
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 23 Aug 2005 19:44:55 +0200
apt (0.6.40.1ubuntu1) breezy; urgency=low
- * Synchronize with Debian
+ * Synchronize with Debian
- -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 5 Aug 2005 14:20:56 +0200
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 5 Aug 2005 14:20:56 +0200
apt (0.6.40.1) unstable; urgency=low
@@ -27,13 +28,13 @@ apt (0.6.40.1) unstable; urgency=low
conditions
* 0.6.40 breaks the ABI but I accidentally didn't change the soname :/
- -- Michael Vogt <mvo@debian.org> Fri, 5 Aug 2005 13:24:58 +0200
+ -- Michael Vogt <mvo@debian.org> Fri, 5 Aug 2005 13:24:58 +0200
apt (0.6.40ubuntu1) breezy; urgency=low
- * Synchronize with Debian
+ * Synchronize with Debian
- -- Matt Zimmerman <mdz@ubuntu.com> Thu, 4 Aug 2005 15:53:22 -0700
+ -- Matt Zimmerman <mdz@ubuntu.com> Thu, 4 Aug 2005 15:53:22 -0700
apt (0.6.40) unstable; urgency=low