* merged with apt--debian-sid--0

Patches applied:

 * bubulle@debian.org--2005/apt--main--0--patch-134
   Updated Basque translation

 * bubulle@debian.org--2005/apt--main--0--patch-135
   Completed Basque translation

 * bubulle@debian.org--2005/apt--main--0--patch-136
   French manpage of sources.list updated

 * bubulle@debian.org--2005/apt--main--0--patch-137
   Disable Hebrew translation on trnaslator's request

 * bubulle@debian.org--2005/apt--main--0--patch-138
   Swedish translation update

 * bubulle@debian.org--2005/apt--main--0--patch-139
   Tagalog translation update

 * bubulle@debian.org--2005/apt--main--0--patch-140
   Fix a translation glitch in German

 * bubulle@debian.org--2005/apt--main--0--patch-141
   Revert the German fix 

 * bubulle@debian.org--2005/apt--main--0--patch-142
   Updated Vietnamese translation

 * bubulle@debian.org--2005/apt--main--0--patch-143
   Really add the Vietnamese translation

 * bubulle@debian.org--2005/apt--main--0--patch-144
   Greek translation update

 * bubulle@debian.org--2005/apt--main--0--patch-145
   Simplified Chinese completed

 * bubulle@debian.org--2005/apt--main--0--patch-146
   Czech translation update

 * bubulle@debian.org--2005/apt--main--0--patch-147
   British translation of apt

 * bubulle@debian.org--2005/apt--main--0--patch-148
   Italian translation update

 * bubulle@debian.org--2005/apt--main--0--patch-149
   Merge with Michael archive (Debian version)

 * bubulle@debian.org--2005/apt--main--0--patch-150
   Fix typo in apt-get.cc and update PO files

 * bubulle@debian.org--2005/apt--main--0--patch-151
   Update French translation (and document the update-po I ran previously)

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

 * bubulle@debian.org--2005/apt--main--0--patch-153
   Close the right bug for Slovak translation

 * bubulle@debian.org--2005/apt--main--0--patch-154
   French manpages translation update

 * bubulle@debian.org--2005/apt--main--0--patch-155
   Swedish translation update

 * bubulle@debian.org--2005/apt--main--0--patch-156
   Better makefile for more up-to-date PO and POT

 * bubulle@debian.org--2005/apt--main--0--patch-157
   Run make uupdate-po

 * bubulle@debian.org--2005/apt--main--0--patch-158
   Fix spaces errors in some translations

 * bubulle@debian.org--2005/apt--main--0--patch-159
   Patch to allow "make apt-all.pot" work in the baz archive

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-108
   * added "gl" to po/LINGUAS

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-109
   * add " " in update-po

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-110
   * make apt-get source smarter about not downloading the same sources twice

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-111
   * merged with bubulle

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-112
   * 2006 ftp-archive signing key added

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-113
   * be more clever about I-M-S hits for the Release file and gpg-failures with it, requeue it without i-m-s then

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-114
   * merged with mvo

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-115
   * string fix

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-116
   * changelog updates

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-117
   * merged with bubulle

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-118
   * merged from bubulle

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-119
   * fix http data corruption (#280844)

 * mvo@debian.org--2005/apt--debian-sid--0--patch-10
   * merged with apt--mvo and corrected conflicts in po/

 * mvo@debian.org--2005/apt--debian-sid--0--patch-11
   * changelog updates

 * mvo@debian.org--2005/apt--debian-sid--0--patch-12
   * apt--mvo merged

 * mvo@debian.org--2005/apt--debian-sid--0--patch-13
   * merged with mvo

 * mvo@debian.org--2005/apt--debian-sid--0--patch-14
   * merged with apt--mvo--0

 * mvo@debian.org--2005/apt--debian-sid--0--patch-15
   * support multiple signatures

 * mvo@debian.org--2005/apt--debian-sid--0--patch-16
   * merged with main

 * mvo@debian.org--2005/apt--debian-sid--0--patch-17
   * merged with apt--mvo--0

 * philippe.batailler@free.fr--2005/apt--main--0--patch-4
   Update of sources.list	

 * philippe.batailler@free.fr--2005/apt--main--0--patch-6
   Change apt.ent.fr 

 * philippe.batailler@free.fr--2005/apt--main--0--patch-7
   Update manpages

2 files changed, 6 insertions, 2 deletions

diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 5cb154f66..a114ad797 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -247,7 +247,11 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
                errmsg += (*I + "\n");
          }
       }
-      return _error->Error(errmsg.c_str());
+      // this is only fatal if we have no good sigs or if we have at
+      // least one bad signature. good signatures and NoPubKey signatures
+      // happen easily when a file is signed with multiple signatures
+      if(GoodSigners.empty() or !BadSigners.empty())
+      	 return _error->Error(errmsg.c_str());
    }
       
    // Transfer the modification times
diff --git a/methods/makefile b/methods/makefile
index d0b5a28c0..03146d1bc 100644
--- a/methods/makefile
+++ b/methods/makefile
@@ -7,7 +7,7 @@ include ../buildlib/defaults.mak
 BIN := $(BIN)/methods
 
 # FIXME..
-LIB_APT_PKG_MAJOR = 3.11
+LIB_APT_PKG_MAJOR = 4.0
 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
 
 # The file method