From 8bdbcf67d5686ab823e466e6df7900aec8c21c1a Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Tue, 24 May 2005 21:33:29 +0000 Subject: Merge michael.vogt@ubuntu.com--2005/apt--fixes--0 Patches applied: * apt@packages.debian.org/apt--misc-abi-changes--0--patch-4 Merge from mainline * apt@packages.debian.org/apt--misc-abi-changes--0--patch-5 Merge from mainline * apt@packages.debian.org/apt--misc-abi-changes--0--patch-6 Collapse both pkgAcquire::Run() methods into one, with a default value * michael.vogt@ubuntu.com--2005/apt--fixes--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-79 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-1 * merged obvious fixes into the tree to make it easy for matt to merge * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-2 * more merges from otavio that looks good/uncritical * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-3 * merged Matts misc-abi-changes tree * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-4 * finalized the changelog for a ubuntu build * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-26 * fix the cache-control header generation * otavio@debian.org--2005/apt--fixes--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-71 * otavio@debian.org--2005/apt--fixes--0--patch-1 Fix comments about the need of xmlto * otavio@debian.org--2005/apt--fixes--0--patch-2 Fix a compile warning * otavio@debian.org--2005/apt--fixes--0--patch-3 Sync with apt--main--0--patch-76 * otavio@debian.org--2005/apt--fixes--0--patch-4 Sync with apt--main--0--patch-78 * otavio@debian.org--2005/apt--fixes--0--patch-5 Add fixes that was wrongly included on DDTP changes. * otavio@debian.org--2005/apt--fixes--0--patch-8 Add information about the other fixes include on this branch now. * otavio@debian.org--2005/apt--fixes--0--patch-9 Merge last changes from apt--main--0. * otavio@debian.org--2005/apt--fixes--0--patch-10 Fix warnings about min/max change in gcc-4.0 * otavio@debian.org--2005/apt--fixes--0--patch-11 Fix remaning warnings while compiling gcc-4.0 * otavio@debian.org--2005/apt--fixes--0--patch-12 Add changelog entry about the fixes for warnings while compiling using GCC 4.0 compiler. --- debian/changelog | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 87e713d3d..aec1bd2dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +apt (0.6.36ubuntu1) breezy; urgency=low + + * make it possible to write a cache-control: no-cache header even if + no proxy is set to support transparent proxies (closes ubuntu: #10773) + + * Merge otavio@debian.org--2005/apt--fixes--0.6: + - Fix comment about the need of xmlto while building from Arch; + - Fix StatStore struct on cachedb.h to use time_t and then fix a compile + warning; + - Lock database at start of DoInstall routine to avoid concurrent + runs of install/remove and update commands (Closes: #194467) + - Fix warnings while compiling with GCC 4.0 compiler + + -- Michael Vogt Mon, 23 May 2005 11:57:53 +0200 + apt (0.6.36) experimental; urgency=low * Merge apt--mvo--0: @@ -9,7 +24,7 @@ apt (0.6.36) experimental; urgency=low - apt-pkg/cdrom.cc: honor "Acquire::gpgv::Options" when verifying the signature (Ubuntu #8496) - -- Michael Vogt Thu, 31 Mar 2005 20:37:11 +0200 + -- Michael Vogt Thu, 31 Mar 2005 20:37:11 +0200 apt (0.6.35) hoary; urgency=low -- cgit v1.2.3 From df6689e496db0bf173bb0007ef4fbfca2fbacc7c Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Tue, 24 May 2005 21:35:10 +0000 Subject: Open 0.6.37 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index aec1bd2dd..1c15f1be7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.6.37) breezy; urgency=low + + * + + -- Matt Zimmerman Tue, 24 May 2005 14:33:37 -0700 + apt (0.6.36ubuntu1) breezy; urgency=low * make it possible to write a cache-control: no-cache header even if -- cgit v1.2.3 From dab55ef96e5a3b65bead9244006d4138a2c4fd22 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Tue, 24 May 2005 21:41:42 +0000 Subject: Update changelog --- debian/changelog | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1c15f1be7..d5602ffda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,16 @@ apt (0.6.37) breezy; urgency=low - * - - -- Matt Zimmerman Tue, 24 May 2005 14:33:37 -0700 + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-81 + - patch-66: Italian update + - patch-71: French update + - patch-73: Basque update + - patch-74: Hebrew update + - patch-76: Correct Hebrew translation (Closes: #306658) + - patch-77: French man page update + - patch-79: Correct syntax errors in Hebrew translation + - patch-81: Portuguese update + + -- Matt Zimmerman Tue, 24 May 2005 14:38:25 -0700 apt (0.6.36ubuntu1) breezy; urgency=low -- cgit v1.2.3 From 0c48b235cc099fd2a6f43adc0135a96fc4e524ea Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Tue, 24 May 2005 21:54:59 +0000 Subject: Fix build of French man pages (now using XML, not SGML) --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d5602ffda..6e25169c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ apt (0.6.37) breezy; urgency=low - patch-77: French man page update - patch-79: Correct syntax errors in Hebrew translation - patch-81: Portuguese update + * Fix build of French man pages (now using XML, not SGML) -- Matt Zimmerman Tue, 24 May 2005 14:38:25 -0700 -- cgit v1.2.3 From e16fa233f2147ad668d972a93f76751981f4abcf Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Mon, 6 Jun 2005 17:04:17 +0000 Subject: Update changelog --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6e25169c7..1ce780163 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ apt (0.6.37) breezy; urgency=low - patch-79: Correct syntax errors in Hebrew translation - patch-81: Portuguese update * Fix build of French man pages (now using XML, not SGML) + * Add Welsh translation from Dafydd Harries + (daf@muse.19inch.net--2005/apt--main--0--patch-1) -- Matt Zimmerman Tue, 24 May 2005 14:38:25 -0700 -- cgit v1.2.3 From 402a9d49447c221d0240ada18b644edc538fd9a6 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Mon, 13 Jun 2005 20:50:09 +0000 Subject: Change debian/bugscript to use #!/bin/bash (Closes: #313402) --- debian/bugscript | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/bugscript b/debian/bugscript index 8423e07c2..f5ec9e05d 100755 --- a/debian/bugscript +++ b/debian/bugscript @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/bash -e # reportbug #169495 if [ -z "$YESNO" ]; then diff --git a/debian/changelog b/debian/changelog index 1ce780163..57b746a56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ apt (0.6.37) breezy; urgency=low * Fix build of French man pages (now using XML, not SGML) * Add Welsh translation from Dafydd Harries (daf@muse.19inch.net--2005/apt--main--0--patch-1) + * Change debian/bugscript to use #!/bin/bash (Closes: #313402) -- Matt Zimmerman Tue, 24 May 2005 14:38:25 -0700 -- cgit v1.2.3