Merge with Michael

Basque translation update

apt-pkg/depcache.cc

@@ -16,7 +16,8 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/algorithms.h>
-    
+#include <apt-pkg/configuration.h>
+
 #include <apti18n.h>    
 									/*}}}*/
 
@@ -712,6 +713,10 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
 	 
 	 if (InstPkg.end() == false)
 	 {
+	    if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true)
+	       std::clog << "Installing " << InstPkg.Name() 
+			 << " as dep of " << Pkg.Name() 
+			 << std::endl;
 	    MarkInstall(InstPkg,true,Depth + 1);
 
 	    // Set the autoflag, after MarkInstall because MarkInstall unsets it

apt-pkg/tagfile.cc

@@ -98,7 +98,8 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset)
    iOffset = Offset;
    Start = Buffer + iOffset;
    
-   if (Tag.Scan(Start,End - Start) == false)
+   // Start != End is a special case to not fail on empty TagFiles
+   if (Start != End && Tag.Scan(Start,End - Start) == false)
       return _error->Error(_("Unable to parse package file %s (2)"),Fd.Name().c_str());
    
    return true;

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.44")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.44.1-0.1")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

debian/changelog

@@ -1,3 +1,26 @@
+apt (0.6.44.2) unstable; urgency=low
+
+  * apt-pkg/depcache.cc:
+    - added Debug::pkgDepCache::AutoInstall (thanks to infinity)
+  * merged from 
+    http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
+  	* sk.po: Completed to 512t
+	* eu.po: Completed to 512t
+	* fr.po: Completed to 512t
+	* sv.po: Completed to 512t
+	* Update all PO and the POT. Gives 506t6f for formerly
+	  complete translations
+
+ --
+
+apt (0.6.44.1-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Don't give an error when parsing empty Packages/Sources files.
+    (Closes: #366931, #367086, #370160)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Fri,  9 Jun 2006 00:52:21 +0200
+
 apt (0.6.44.1) unstable; urgency=low
 
   * merged from 
@@ -7,7 +30,7 @@ apt (0.6.44.1) unstable; urgency=low
     - po/hu.po: Hungarian translation update. Closes: #365448
     - po/cs.po: Czech translation updated. Closes: #367244
 
- --
+ -- Michael Vogt <mvo@debian.org>  Tue, 16 May 2006 21:51:16 +0200
 
 apt (0.6.44) unstable; urgency=low
 

doc/examples/configure-index

@@ -244,6 +244,7 @@ DPkg
 Debug 
 {
   pkgProblemResolver "false";
+  pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies
   pkgAcquire "false";
   pkgAcquire::Worker "false";
   pkgDPkgPM "false";

doc/sources.list.5.xml

@@ -204,7 +204,7 @@ deb http://http.us.debian.org/debian dists/stable-updates/
 
    <para>Uses HTTP to access the archive at nonus.debian.org, under the
    debian-non-US directory, and uses only files found under
-   <filename>unstable/binary-i3866</filename> on i386 machines, 
+   <filename>unstable/binary-i386</filename> on i386 machines, 
    <filename>unstable/binary-m68k</filename> on m68k, and so
    forth for other supported architectures. [Note this example only 
    illustrates how to use the substitution variable; non-us is no longer 

po/ChangeLog

@@ -1,3 +1,7 @@
+2006-06-21  Piarres Beobide  <pi@beobide.net>
+
+	* eu.po: Updated
+
 2006-06-07  Piarres Beobide  <pi@beobide.net>
 
 	* eu.po: Updated

po/apt-all.pot

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-16 07:48-0500\n"
+"POT-Creation-Date: 2006-05-27 13:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2089,15 +2089,15 @@ msgstr ""
 msgid "extra"
 msgstr ""
 
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
 msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:62
 msgid "Candidate versions"
 msgstr ""
 
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:91
 msgid "Dependency generation"
 msgstr ""
 

po/eu.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-16 07:33-0500\n"
-"PO-Revision-Date: 2006-06-06 15:10+0200\n"
+"POT-Creation-Date: 2006-05-27 13:46+0200\n"
+"PO-Revision-Date: 2006-06-17 00:10+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: librezale <librezale@librezale.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,14 +21,14 @@ msgstr ""
 #: cmdline/apt-cache.cc:135
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
-msgstr "%s paketeak (%s bertsioa) mendekotasun arazo bat du:\n"
+msgstr "%s paketeak (%s bertsioa) mendekotasun-arazo bat du:\n"
 
 #: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
 #: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
 #: cmdline/apt-cache.cc:1508
 #, c-format
 msgid "Unable to locate package %s"
-msgstr "Ezin da %s paketea kokatu"
+msgstr "Ezin da %s paketea lokalizatu"
 
 #: cmdline/apt-cache.cc:232
 msgid "Total package names : "
@@ -44,7 +44,7 @@ msgstr "  Pakete birtual puruak:"
 
 #: cmdline/apt-cache.cc:274
 msgid "  Single virtual packages: "
-msgstr "  Pakete birtual bakanak: "
+msgstr "  Bakanako pakete birtualak: "
 
 #: cmdline/apt-cache.cc:275
 msgid "  Mixed virtual packages: "
@@ -72,7 +72,7 @@ msgstr "Guztira Saltzaile Mapatzea: "
 
 #: cmdline/apt-cache.cc:297
 msgid "Total globbed strings: "
-msgstr "Guztira bateratutako kateak: "
+msgstr "Guztira beteratutakokateak: "
 
 #: cmdline/apt-cache.cc:311
 msgid "Total dependency version space: "
@@ -84,7 +84,7 @@ msgstr "Guztira galdutako tokia:"
 
 #: cmdline/apt-cache.cc:324
 msgid "Total space accounted for: "
-msgstr "Guztira erregistratutako lekua: "
+msgstr "Guztira erregitratutako lekua: "
 
 #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
 #, c-format
@@ -106,7 +106,7 @@ msgstr "Pakete Fitxatefiak:"
 #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
-"Katxea ez dago sinkronizatuta, ezin zaio erreferentziarik (x-ref) egin "
+"Cachea ez dago sinkronizatuta, ezin zaio erreferentziarik (x-ref) egin "
 "pakete-fitxategi bati"
 
 #: cmdline/apt-cache.cc:1470
@@ -233,7 +233,8 @@ msgstr ""
 
 #: cmdline/apt-cdrom.cc:78
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr "Mesedez idatzi izen bat diska honentzat, 'Debian 2.1r1 1 Diska' antzerakoan"
+msgstr ""
+"Mesedez idatzi izen bat diska honentzat, 'Debian 2.1r1 1 Diska' antzerakoan"
 
 #: cmdline/apt-cdrom.cc:93
 msgid "Please insert a Disc in the drive and press enter"
@@ -1112,7 +1113,8 @@ msgstr "Huts egin du zenbat artxibo lortzean."
 #: cmdline/apt-get.cc:2047
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
+msgstr ""
+"%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
 
 #: cmdline/apt-get.cc:2059
 #, c-format
@@ -1135,7 +1137,8 @@ msgstr "Prozesu umeak huts egin du"
 
 #: cmdline/apt-get.cc:2112
 msgid "Must specify at least one package to check builddeps for"
-msgstr "Gutxienez pakete bat zehaztu behar duzu eraikitze-mendekotasunak egiaztatzeko"
+msgstr ""
+"Gutxienez pakete bat zehaztu behar duzu eraikitze-mendekotasunak egiaztatzeko"
 
 #: cmdline/apt-get.cc:2140
 #, c-format
@@ -1152,7 +1155,8 @@ msgstr "%s: ez du eraikitze-mendekotasunik.\n"
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
-msgstr "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
+msgstr ""
+"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
 
 #: cmdline/apt-get.cc:2264
 #, c-format
@@ -1355,7 +1359,8 @@ msgid "or errors caused by missing dependencies. This is OK, only the errors"
 msgstr "edo falta diren mendekotasunen erroreak. Hori ondo dago; mezu honen"
 
 #: dselect/install:103
-msgid "above this message are important. Please fix them and run [I]nstall again"
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"
 msgstr ""
 "aurreko erroreak dira garrantzitsuak. Konpondu eta exekutatu [I]nstall "
 "berriro"
@@ -1611,7 +1616,8 @@ msgstr "Ez da baliozko DEB artxiboa; '%s' kidea falta da"
 #: apt-inst/deb/debfile.cc:52
 #, c-format
 msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
-msgstr "Hau ez da balioz DEB fitxategi bat, ez du ez  '%s' ez '%s' atalik falta du"
+msgstr ""
+"Hau ez da balioz DEB fitxategi bat, ez du ez  '%s' ez '%s' atalik falta du"
 
 #: apt-inst/deb/debfile.cc:112
 #, c-format
@@ -1650,7 +1656,8 @@ msgstr "CD okerra"
 #: methods/cdrom.cc:164
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr "Ezin izan da %s(e)ko CD-ROMa desmuntatu; beharbada erabiltzen ariko da."
+msgstr ""
+"Ezin izan da %s(e)ko CD-ROMa desmuntatu; beharbada erabiltzen ariko da."
 
 #: methods/cdrom.cc:169
 msgid "Disk not found."
@@ -1751,7 +1758,8 @@ msgstr "Ezin izan da socket-a sortu"
 
 #: methods/ftp.cc:698
 msgid "Could not connect data socket, connection timed out"
-msgstr "Ezin izan da datu-socketa konektatu; konexioak denbora-muga gainditu du"
+msgstr ""
+"Ezin izan da datu-socketa konektatu; konexioak denbora-muga gainditu du"
 
 #: methods/ftp.cc:704
 msgid "Could not connect passive socket."
@@ -1845,7 +1853,8 @@ msgstr "Ezin izan da konexioa hasi -> %s:%s (%s)."
 #: methods/connect.cc:93
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora-muga gainditu du"
+msgstr ""
+"Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora-muga gainditu du"
 
 #: methods/connect.cc:108
 #, c-format
@@ -1882,14 +1891,15 @@ msgstr "Ezin da konektatu -> %s %s:"
 #: methods/gpgv.cc:64
 #, c-format
 msgid "Couldn't access keyring: '%s'"
-msgstr "Ezin da gako eraztuna eskuratu: '%s'"
+msgstr "Ezin da eraztuna ebatzi: '%s'"
 
 #: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Acquire::gpgv::Options arguimentu zerrenda luzeegia. Uzten."
 
 #: methods/gpgv.cc:198
-msgid "Internal error: Good signature, but could not determine key fingerprint?!"
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu"
 
 #: methods/gpgv.cc:203
@@ -1899,7 +1909,8 @@ msgstr "Beintza sinadura baliogabe bat aurkitu da."
 #: methods/gpgv.cc:207
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
-msgstr "Ezin da '%s' abiarazi sinadura egiaztatzeko (gnupg instalaturik al dago?)"
+msgstr ""
+"Ezin da %s abiarazi sinadura egiaztatzeko (gnupg instalaturik al dago?)"
 
 #: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
@@ -2103,7 +2114,8 @@ msgstr "%s aukerak argumentu bat behar du."
 #: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "%s aukera: konfigurazio-elementuaren zehaztapenak =<val> eduki behar du."
+msgstr ""
+"%s aukera: konfigurazio-elementuaren zehaztapenak =<val> eduki behar du."
 
 #: apt-pkg/contrib/cmndline.cc:237
 #, c-format
@@ -2154,7 +2166,8 @@ msgstr "Ezin izan da %s blokeo-fitxategia ireki"
 #: apt-pkg/contrib/fileutl.cc:105
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo-fitxategiarentzat"
+msgstr ""
+"Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo-fitxategiarentzat"
 
 #: apt-pkg/contrib/fileutl.cc:109
 #, c-format
@@ -2277,15 +2290,15 @@ msgstr "aukerakoa"
 msgid "extra"
 msgstr "estra"
 
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
 msgid "Building dependency tree"
 msgstr "Dependentzia zuhaitza eraikitzen"
 
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:62
 msgid "Candidate versions"
 msgstr "Hautagaien bertsioak"
 
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:91
 msgid "Dependency generation"
 msgstr "Dependentzi Sormena"
 
@@ -2368,8 +2381,10 @@ msgstr "'%s' motako indize-fitxategirik ez da onartzen"
 
 #: apt-pkg/algorithms.cc:241
 #, c-format
-msgid "The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu."
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu."
 
 #: apt-pkg/algorithms.cc:1059
 msgid ""
@@ -2398,12 +2413,12 @@ msgstr "%spartial artxibo-direktorioa falta da."
 #: apt-pkg/acquire.cc:823
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "%li fitxategi eskuratzen %li  fitxategitik (%s falta da)"
+msgstr "%li fitxategi deskargatzen %li -tik (%s falta da)"
 
 #: apt-pkg/acquire.cc:825
 #, c-format
 msgid "Retrieving file %li of %li"
-msgstr "%li fitxategia eskuratzen %li-tik"
+msgstr "%li fitxategia jasotzen %li-tik"
 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
@@ -2571,7 +2586,8 @@ msgstr ""
 
 #: apt-pkg/acquire-item.cc:848
 #, c-format
-msgid "The package index files are corrupted. No Filename: field for package %s."
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
 "paketearentzat."
@@ -2677,7 +2693,8 @@ msgstr "%i erregistro eta %i okerreko fitxategi grabaturik.\n"
 #: apt-pkg/indexcopy.cc:269
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik.\n"
+msgstr ""
+"%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik.\n"
 
 #: apt-pkg/deb/dpkgpm.cc:358
 #, c-format
@@ -2727,9 +2744,8 @@ msgstr "%s guztiz ezabatzeko prestatzen"
 #: apt-pkg/deb/dpkgpm.cc:379
 #, c-format
 msgid "Completely removed %s"
-msgstr "%s guztiz ezabaturik"
+msgstr "%s guztiz ezabatu da"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Konexioa behar baino lehenago itxi da"
-