From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 8 Feb 2006 10:30:15 +0000 (+0000)
Subject: * merged with bubulle
X-Git-Tag: 0.7.24ubuntu1~271^2~1
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/48f0b1de6f858ef42cfedb1068e2251c6b0e445d?hp=977888b4b4492bf1b3cad6ad8c273749310ed28f

* merged with bubulle


Patches applied:

 * bubulle@debian.org--2005/apt--main--0--patch-167
   Resync with Michael

 * bubulle@debian.org--2005/apt--main--0--patch-168
   Vietnamese translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-169
   Update PO files and POT file...again

 * bubulle@debian.org--2005/apt--main--0--patch-170
   Compelted French translation

 * bubulle@debian.org--2005/apt--main--0--patch-171
   Activate Welsh translation

 * bubulle@debian.org--2005/apt--main--0--patch-172
   Completed to 512 strings

 * bubulle@debian.org--2005/apt--main--0--patch-173
   Russian translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-174
   Swedish translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-175
   Merge from Philippe Batailler French manpages tree/Vietnamese translation update

 * bubulle@debian.org--2005/apt--main--0--patch-176
   Galician translation update

 * bubulle@debian.org--2005/apt--main--0--patch-177
   Slovak translation update

 * bubulle@debian.org--2005/apt--main--0--patch-178
   Polish translation update

 * bubulle@debian.org--2005/apt--main--0--patch-179
   Correct permissions

 * bubulle@debian.org--2005/apt--main--0--patch-180
   Japanese translation update

 * bubulle@debian.org--2005/apt--main--0--patch-181
   Basque translation update

 * bubulle@debian.org--2005/apt--main--0--patch-182
   Catalan translation completed

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

diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index b11d2531c..d0dc7a260 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -504,11 +504,12 @@ bool debListParser::ParseProvides(pkgCache::VerIterator Ver)
       Start = ParseDepends(Start,Stop,Package,Version,Op);
       if (Start == 0)
 	 return _error->Error("Problem parsing Provides line");
-      if (Op != pkgCache::Dep::NoOp)
-	 return _error->Error("Malformed provides line");
-
-      if (NewProvides(Ver,Package,Version) == false)
-	 return false;
+      if (Op != pkgCache::Dep::NoOp) {
+	 _error->Warning("Ignoring Provides line with DepCompareOp for package %s", Package.c_str());
+      } else {
+	 if (NewProvides(Ver,Package,Version) == false)
+	    return false;
+      }
 
       if (Start == Stop)
 	 break;
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index abeb57c6f..837094ee0 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1411,15 +1411,6 @@ bool DoUpgrade(CommandLine &CmdL)
 /* Install named packages */
 bool DoInstall(CommandLine &CmdL)
 {
-   // Lock the list directory
-   FileFd Lock;
-   if (_config->FindB("Debug::NoLocking",false) == false)
-   {
-      Lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock"));
-      if (_error->PendingError() == true)
-        return _error->Error(_("Unable to lock the list directory"));
-   }
-   
    CacheFile Cache;
    if (Cache.OpenForInstall() == false || 
        Cache.CheckDeps(CmdL.FileSize() != 1) == false)
diff --git a/configure.in b/configure.in
index 0d80e5ed9..8d4b99904 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.6.43.2")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.43.3")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
diff --git a/debian/changelog b/debian/changelog
index 3c3fbb4a9..1f9823971 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,34 @@
+apt (0.6.43.3) unstable; urgency=low
+
+  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182:
+  	* ca.po: Completed to 512t. Closes: #351592
+	* eu.po: Completed to 512t. Closes: #350483
+	* ja.po: Completed to 512t. Closes: #349806
+	* pl.po: Completed to 512t. Closes: #349514
+	* sk.po: Completed to 512t. Closes: #349474
+	* gl.po: Completed to 512 strings 
+	         Closes: #349407
+	* vi.po: Completed to 512 strings
+	* sv.po: Completed to 512 strings
+	         Closes: #349210
+	* ru.po: Completed to 512 strings
+	         Closes: #349154
+	* da.po: Completed to 512 strings
+	         Closes: #349084
+	* fr.po: Completed to 512 strings
+	* LINGUAS: Add Welsh
+	* *.po: Updated from sources (512 strings)
+	* vi.po: Completed to 511 strings
+	         Closes: #348968
+  * apt-pkg/deb/deblistparser.cc:
+    - don't explode on a DepCompareOp in a Provides line, but warn about
+      it and ignore it otherwise (thanks to James Troup for reporting it)
+  * cmdline/apt-get.cc:
+    - don't lock the lists directory in DoInstall, breaks --print-uri 
+      (thanks to James Troup for reporting it)
+
+ -- 
+
 apt (0.6.43.2) unstable; urgency=low
 
   * Merge bubulle@debian.org--2005/apt--main--0 up to patch-166: