merge with the debian tree

apt-pkg/acquire-item.cc

@@ -751,7 +751,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash,
       Local = true;
    
    string compExt = Desc.URI.substr(Desc.URI.size()-3);
-   char *decompProg;
+   const char *decompProg;
    if(compExt == "bz2") 
       decompProg = "bzip2";
    else if(compExt == ".gz") 

apt-pkg/acquire.cc

@@ -619,7 +619,7 @@ bool pkgAcquire::Queue::Startup()
          added other source retry to have cycle maintain a pipeline depth
          on its own. */
       if (Cnf->Pipeline == true)
-	 MaxPipeDepth = 10;
+	 MaxPipeDepth = 1000;
       else
 	 MaxPipeDepth = 1;
    }

apt-pkg/cdrom.cc

@@ -560,10 +560,17 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log)
    }
    if(log) {
       msg.str("");
-      ioprintf(msg, _("Stored label: %s \n"),
-	       Database.Find("CD::"+ident).c_str());
+      ioprintf(msg, _("Stored label: %s\n"),
+      Database.Find("CD::"+ident).c_str());
       log->Update(msg.str());
    }
+
+   // Unmount and finish
+   if (_config->FindB("APT::CDROM::NoMount",false) == false) {
+      log->Update(_("Unmounting CD-ROM...\n"), STEP_LAST);
+      UnmountCdrom(CDROM);
+   }
+
    return true;
 }
 
@@ -668,8 +675,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
    DropRepeats(TransList,"");
    if(log) {
       msg.str("");
-      ioprintf(msg, _("Found %lu package indexes, %lu source indexes, "
-		      "%lu translation indexes and %lu signatures\n"), 
+      ioprintf(msg, _("Found %u package indexes, %u source indexes, "
+		      "%u translation indexes and %u signatures\n"), 
 	       List.size(), SourceList.size(), TransList.size(),
 	       SigList.size());
       log->Update(msg.str(), STEP_SCAN);

apt-pkg/deb/debmetaindex.cc

@@ -224,7 +224,7 @@ class debSLTypeDebian : public pkgSourceList::Type
 	 // This check insures that there will be only one Release file
 	 // queued for all the Packages files and Sources files it
 	 // corresponds to.
-	 if (strcmp((*I)->GetType(), "deb") == 0)
+		if (strcmp((*I)->GetType(), "deb") == 0)
 	 {
 	    debReleaseIndex *Deb = (debReleaseIndex *) (*I);
 	    // This check insures that there will be only one Release file

apt-pkg/deb/debrecords.cc

@@ -51,6 +51,14 @@ string debRecordParser::Name()
    return Section.FindS("Package");
 }
 									/*}}}*/
+// RecordParser::Homepage - Return the package homepage		       	/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+string debRecordParser::Homepage()
+{
+   return Section.FindS("Homepage");
+}
+									/*}}}*/
 // RecordParser::MD5Hash - Return the archive hash			/*{{{*/
 // ---------------------------------------------------------------------
 /* */

apt-pkg/deb/debrecords.h

@@ -44,6 +44,7 @@ class debRecordParser : public pkgRecords::Parser
    virtual string ShortDesc();
    virtual string LongDesc();
    virtual string Name();
+   virtual string Homepage();
 
    virtual void GetRec(const char *&Start,const char *&Stop);
    

apt-pkg/deb/dpkgpm.cc

@@ -45,8 +45,8 @@ using namespace std;
 // ---------------------------------------------------------------------
 /* */
 pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) 
-   : pkgPackageManager(Cache), dpkgbuf_pos(0), PackagesDone(0), 
-     PackagesTotal(0), term_out(NULL)
+   : pkgPackageManager(Cache), dpkgbuf_pos(0),
+     term_out(NULL), PackagesDone(0), PackagesTotal(0)
 {
 }
 									/*}}}*/
@@ -335,7 +335,6 @@ bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf)
 
    return true;
 }
-
 									/*}}}*/
 // DPkgPM::DoStdin - Read stdin and pass to slave pty			/*{{{*/
 // ---------------------------------------------------------------------
@@ -345,7 +344,10 @@ void pkgDPkgPM::DoStdin(int master)
 {
    char input_buf[256] = {0,}; 
    int len = read(0, input_buf, sizeof(input_buf));
-   write(master, input_buf, len);
+   if (len)
+      write(master, input_buf, len);
+   else
+      stdin_is_dev_null = true;
 }
 									/*}}}*/
 // DPkgPM::DoTerminalPty - Read the terminal pty and write log		/*{{{*/
@@ -546,6 +548,27 @@ bool pkgDPkgPM::CloseLog()
    return true;
 }
 
+/*{{{*/
+// This implements a racy version of pselect for those architectures
+// that don't have a working implementation.
+// FIXME: Probably can be removed on Lenny+1
+static int racy_pselect(int nfds, fd_set *readfds, fd_set *writefds,
+   fd_set *exceptfds, const struct timespec *timeout,
+   const sigset_t *sigmask)
+{
+   sigset_t origmask;
+   struct timeval tv;
+   int retval;
+
+   tv.tv_sec = timeout->tv_sec;
+   tv.tv_usec = timeout->tv_nsec/1000;
+
+   sigprocmask(SIG_SETMASK, sigmask, &origmask);
+   retval = select(nfds, readfds, writefds, exceptfds, &tv);
+   sigprocmask(SIG_SETMASK, &origmask, 0);
+   return retval;
+}
+/*}}}*/
 
 // DPkgPM::Go - Run the sequence					/*{{{*/
 // ---------------------------------------------------------------------
@@ -621,6 +644,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
       }
    }   
 
+   stdin_is_dev_null = false;
+
    // create log
    OpenLog();
 
@@ -804,7 +829,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 
 	 /* No Job Control Stop Env is a magic dpkg var that prevents it
 	    from using sigstop */
-	 putenv("DPKG_NO_TSTP=yes");
+	 putenv((char *)"DPKG_NO_TSTP=yes");
 	 execvp(Args[0],(char **)Args);
 	 cerr << "Could not exec dpkg!" << endl;
 	 _exit(100);
@@ -847,10 +872,10 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 	    signal(SIGINT,old_SIGINT);
 	    return _error->Errno("waitpid","Couldn't wait for subprocess");
 	 }
-
 	 // wait for input or output here
 	 FD_ZERO(&rfds);
-	 FD_SET(0, &rfds); 
+	 if (!stdin_is_dev_null)
+	    FD_SET(0, &rfds); 
 	 FD_SET(_dpkgin, &rfds);
 	 if(master >= 0)
 	    FD_SET(master, &rfds);
@@ -858,6 +883,9 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 	 tv.tv_nsec = 0;
 	 select_ret = pselect(max(master, _dpkgin)+1, &rfds, NULL, NULL, 
 			      &tv, &original_sigmask);
+	 if (select_ret < 0 && (errno == EINVAL || errno == ENOSYS))
+	    select_ret = racy_pselect(max(master, _dpkgin)+1, &rfds, NULL,
+				      NULL, &tv, &original_sigmask);
 	 if (select_ret == 0) 
   	    continue;
   	 else if (select_ret < 0 && errno == EINTR)

apt-pkg/deb/dpkgpm.h

@@ -23,6 +23,8 @@ class pkgDPkgPM : public pkgPackageManager
 {
    private:
 
+   bool stdin_is_dev_null;
+
    // the buffer we use for the dpkg status-fd reading
    char dpkgbuf[1024];
    int dpkgbuf_pos;

apt-pkg/indexfile.cc

@@ -113,8 +113,8 @@ string pkgIndexFile::LanguageCode()
      // we have a mapping of the language codes that contains all the language
      // codes that need the country code as well 
      // (like pt_BR, pt_PT, sv_SE, zh_*, en_*)
-     char *need_full_langcode[] = { "pt","sv","zh","en", NULL };
-     for(char **s = need_full_langcode;*s != NULL; s++)
+     const char *need_full_langcode[] = { "pt","sv","zh","en", NULL };
+     for(const char **s = need_full_langcode;*s != NULL; s++)
 	if(lang.find(*s) == 0)
 	   return lang.substr(0,5);
      

apt-pkg/init.cc

@@ -35,7 +35,7 @@ bool pkgInitConfig(Configuration &Cnf)
    // General APT things
    Cnf.Set("APT::Architecture", COMMON_ARCH);
    Cnf.Set("APT::Build-Essential::", "build-essential");
-   Cnf.Set("APT::Install-Recommends", false);
+   Cnf.Set("APT::Install-Recommends", true);
    Cnf.Set("APT::Install-Suggests", false);
    Cnf.Set("Dir","/");
    
@@ -74,6 +74,9 @@ bool pkgInitConfig(Configuration &Cnf)
    Cnf.Set("Dir::Log","var/log/apt");
    Cnf.Set("Dir::Log::Terminal","term.log");
    
+   // Translation
+   Cnf.Set("APT::Acquire::Translation", "environment");
+
    bool Res = true;
    
    // Read an alternate config file
@@ -104,9 +107,7 @@ bool pkgInitConfig(Configuration &Cnf)
       bindtextdomain(textdomain(0),Cnf.FindDir("Dir::Locale").c_str());
    }
 #endif
-   // Translation
-   Cnf.Set("APT::Acquire::Translation", "environment");
-   
+
    return true;
 }
 									/*}}}*/

apt-pkg/init.h

@@ -18,7 +18,7 @@
 
 // See the makefile
 #define APT_PKG_MAJOR 4
-#define APT_PKG_MINOR 5
+#define APT_PKG_MINOR 6
 #define APT_PKG_RELEASE 0
     
 extern const char *pkgVersion;

apt-pkg/makefile

@@ -13,7 +13,7 @@ include ../buildlib/defaults.mak
 # methods/makefile - FIXME
 LIBRARY=apt-pkg
 LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
-MAJOR=4.5
+MAJOR=4.6
 MINOR=0
 SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil
 APT_DOMAIN:=libapt-pkg$(MAJOR)

apt-pkg/pkgrecords.h

@@ -66,6 +66,7 @@ class pkgRecords::Parser
    virtual string ShortDesc() {return string();};
    virtual string LongDesc() {return string();};
    virtual string Name() {return string();};
+   virtual string Homepage() {return string();}
    
    // The record in binary form
    virtual void GetRec(const char *&Start,const char *&Stop) {Start = Stop = 0;};

cmdline/apt-extracttemplates.cc

@@ -249,7 +249,7 @@ string WriteFile(const char *package, const char *prefix, const char *data)
 {
 	char fn[512];
 	static int i;
-        char *tempdir = NULL;
+	const char *tempdir = NULL;
 
         tempdir = getenv("TMPDIR");
         if (tempdir == NULL)

cmdline/apt-get.cc

@@ -2671,6 +2671,7 @@ bool ShowHelp(CommandLine &CmdL)
       "   upgrade - Perform an upgrade\n"
       "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
       "   remove - Remove packages\n"
+      "   autoremove - Remove all automatic unused packages\n"
       "   purge - Remove and purge packages\n"
       "   source - Download source archives\n"
       "   build-dep - Configure build-dependencies for source packages\n"
@@ -2781,6 +2782,7 @@ int main(int argc,const char *argv[])
                                    {"upgrade",&DoUpgrade},
                                    {"install",&DoInstall},
                                    {"remove",&DoInstall},
+                                   {"purge",&DoInstall},
 				   {"autoremove",&DoInstall},
 				   {"purge",&DoInstall},
                                    {"dist-upgrade",&DoDistUpgrade},

cmdline/apt-key

@@ -39,6 +39,8 @@ usage() {
     echo
     echo "  apt-key add <file>          - add the key contained in <file> ('-' for stdin)"
     echo "  apt-key del <keyid>         - remove the key <keyid>"
+    echo "  apt-key export <keyid>      - output the key <keyid>"
+    echo "  apt-key exportall           - output all trusted keys"
     echo "  apt-key update              - update keys using the keyring package"
     echo "  apt-key list                - list keys"
     echo
@@ -75,6 +77,12 @@ case "$command" in
     finger*)
         $GPG --batch --fingerprint
         ;;
+    export)
+        $GPG --armor --export "$1"
+        ;;
+    exportall)
+        $GPG --armor --export
+        ;;
     adv*)
         echo "Executing: $GPG $*"
         $GPG $*

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.7.6ubuntu14.1")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.10ubuntu1")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
@@ -74,6 +74,13 @@ AC_CHECK_HEADER(db.h,
 
 LIBS="$saveLIBS"
 
+AC_CHECK_LIB(curl, curl_easy_init,
+     [AC_CHECK_HEADER(curl/curl.h,
+        curl_ok=yes,
+        curl_ok=no)],
+     AC_MSG_ERROR([failed: I need CURL due https support]),
+)
+
 AC_SUBST(BDBLIB)
 
 dnl Converts the ARCH to be something singular for this general CPU family
@@ -196,7 +203,7 @@ ah_GCC3DEP
 dnl It used to be that the user could select translations and that could get
 dnl passed to the makefiles, but now that can only work if you use special
 dnl gettext approved makefiles, so this feature is unsupported by this.
-ALL_LINGUAS="bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja ko ku nb nl nn pl pt_BR pt ro ru sk sl sv tl uk vi zn_CN zh_TW"
+ALL_LINGUAS="bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja ko ku nb nl nn pl pt_BR pt ro ru sk sl sv th tl uk vi zn_CN zh_TW"
 AM_GNU_GETTEXT(external)
 if test x"$USE_NLS" = "xyes"; then
    AC_DEFINE(USE_NLS)

debian/apt.manpages

@@ -3,6 +3,7 @@ doc/apt-cdrom.8
 doc/apt-config.8
 doc/apt-get.8
 doc/apt-key.8
+doc/apt-mark.8
 doc/apt-secure.8
 doc/apt.8
 doc/apt.conf.5

debian/changelog

@@ -1,10 +1,160 @@
-apt (0.7.6ubuntu15) hardy; urgency=low
+apt (0.7.10ubuntu1) hardy; urgency=low
 
   * methods/mirror.{cc,h}:
     - only update mirror list on IndexFile updates 
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 28 Nov 2007 15:57:18 +0100
 
+apt (0.7.10) UNRELEASED; urgency=low
+
+  * Applied patch from Mike O'Connor <stew@vireo.org> to add a manpage to
+    apt-mark, closes: #430207.
+  * Applied patch from Andrei Popescu <andreimpopescu@gmail.com> to add a
+    note about some frontends in apt.8 manpage, closes: #438545.
+  * Applied patch from Aurelien Jarno <aurel32@debian.org> to avoid CPU
+    getting crazy when /dev/null is redirected to stdin (which breaks
+    buildds), closes: #452858.
+  * Applied patch from Aurelien Jarno <aurel32@debian.org> to fix building
+    with newest dpkg-shlibdeps changing the packaging building order,
+    closes: #452862.
+
+  [ Program translations ]
+    - Basque updated. Closes: #453088
+
+ -- Otavio Salvador <otavio@ossystems.com.br>  Mon, 26 Nov 2007 15:46:33 -0200
+
+apt (0.7.9) unstable; urgency=low
+
+  [ Christian Perrier ]
+  * Add several languages to LINGUAS and, therefore, really ship the relevant
+    translation:
+    Arabic, Dzongkha, Khmer, Marathi, Nepali, Thai
+    Thanks to Theppitak Karoonboonyanan for checking this out. Closes: #448321
+
+  [ Program translations ]
+    - Korean updated. Closes: #448430
+    - Galician updated. Closes: #448497
+    - Swedish updated.
+
+  [ Otavio Salvador ]
+  * Fix configure script to check for CURL library and headers presense.
+  * Applied patch from Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
+    to add backward support for arches that lacks pselect support,
+    closes: #448406.
+  * Umount CD-ROM when calling apt-cdrom ident, except when called with
+    -m, closes: #448521.
+
+ -- Otavio Salvador <otavio@debian.org>  Wed, 31 Oct 2007 13:37:26 -0200
+
+apt (0.7.8) unstable; urgency=low
+
+  * Applied patch from Daniel Leidert <daniel.leidert@wgdd.de> to fix
+    APT::Acquire::Translation "none" support, closes: #437523.
+  * Applied patch from Daniel Burrows <dburrows@debian.org> to add support
+    for the Homepage field (ABI break), closes: #447970.
+  * Applied patch from Frans Pop <elendil@planet.nl> to fix a trailing
+    space after cd label, closes: #448187.
+
+ -- Otavio Salvador <otavio@debian.org>  Fri, 26 Oct 2007 18:20:13 -0200
+
+apt (0.7.7) unstable; urgency=low
+
+  [ Michael Vogt ]
+  * apt-inst/contrib/extracttar.cc:
+    - fix fd leak for zero size files (thanks to Bill Broadley for
+      reporting this bug)
+  * apt-pkg/acquire-item.cc:
+    - remove zero size files on I-M-S hit
+  * methods/https.cc:
+    - only send LastModified if we actually have a file
+    - send range request with if-range 
+    - delete failed downloads
+    - delete zero size I-M-S hits
+  * apt-pkg/deb/dpkgpm.{cc,h}:
+    - merged dpkg-log branch, this lets you specify a 
+      Dir::Log::Terminal file to log dpkg output to
+      (ABI break)
+    - fix parse error when dpkg sends unexpected data
+  * merged apt--sha256 branch to fully support the new
+    sha256 checksums in the Packages and Release files
+    (ABI break)
+  * apt-pkg/pkgcachegen.cc:
+    - increase default mmap size
+  * tests/local-repo:
+    - added local repository testcase
+  * apt-pkg/acquire.cc:
+    - increase MaxPipeDepth for the internal worker<->method
+      communication to 1000 for the debtorrent backend
+  * make apt build with g++ 4.3
+  * fix missing SetExecClose() call when the status-fd is used
+  * debian/apt.cron.daily:
+    - move unattended-upgrade before apt-get autoclean
+  * fix "purge" commandline argument, closes: #133421
+    (thanks to Julien Danjou for the patch)
+  * cmdline/apt-get.cc:
+    - do not change the auto-installed information if a package
+      is reinstalled
+  * apt-pkg/acquire-item.cc:
+    - fix crash in diff acquire code
+  * cmdline/apt-mark:
+    - Fix chmoding after have renamed the extended-states file (LP: #140019)
+      (thanks to Laurent Bigonville)
+  * apt-pkg/depcache.cc:
+    - set "APT::Install-Recommends" to true by default (OMG!)
+  * debian/apt.cron.daily:
+    - only run the cron job if apt-get check succeeds (LP: #131719)
+  
+  [ Program translations ]
+    - French updated
+    - Basque updated. Closes: #436425
+    - Fix the zh_CN translator's name in debian/changelog for 0.7.2
+      Closes: #423272
+    - Vietnamese updated. Closes: #440611
+    - Danish updated. Closes: #441102
+    - Thai added. Closes: #442833
+    - Swedish updated.
+    - Galician updated. Closes: #446626
+
+  [ Otavio Salvador ]
+  * Add hash support to copy method. Thanks Anders Kaseorg by the patch
+    (closes: #436055)
+  * Reset curl options and timestamp between downloaded files. Thanks to
+    Ryan Murray <rmurray@debian.org> for the patch (closes: #437150)
+  * Add support to apt-key to export keys to stdout. Thanks to "Dwayne
+    C. Litzenberger" <dlitz@dlitz.net> for the patch (closes: #441942)
+  * Fix compilation warnings:
+    - apt-pkg/indexfile.cc: conversion from string constant to 'char*';
+    - apt-pkg/acquire-item.cc: likewise;
+    - apt-pkg/cdrom.cc: '%lu' expects 'long unsigned int', but argument
+      has type 'size_t';
+    - apt-pkg/deb/dpkgpm.cc: initialization order and conversion from
+      string constant to 'char*';
+    - methods/gpgv.cc: conversion from string constant to 'char*';
+    - methods/ftp.cc: likewise;
+    - cmdline/apt-extracttemplates.cc: likewise;
+    - apt-pkg/deb/debmetaindex.cc: comparison with string literal results
+      in unspecified behaviour;
+  * cmdline/apt-get.cc: adds 'autoremove' as a valid comment to usage
+    statement of apt-get (closes: #445468).
+  * cmdline/apt-get.cc: really applies Julien Danjou <acid@debian.org>
+    patch to add 'purge' command line argument (closes: #133421).
+
+  [ Ian Jackson ]
+  * dpkg-triggers: Deal properly with new package states.
+
+  [ Colin Watson ]
+  * apt-pkg/contrib/mmap.cc:
+    - don't fail if msync() returns > 0
+ 
+ -- Michael Vogt <mvo@debian.org>  Tue, 23 Oct 2007 14:58:03 +0200
+
+apt (0.7.6) unstable; urgency=low
+
+  * Applied patch from Aurelien Jarno <aurel32@debian.org> to fix wrong
+    directory downloading on non-linux architectures (closes: #435597)
+
+ -- Otavio Salvador <otavio@debian.org>  Wed, 01 Aug 2007 19:49:51 -0300
+
 apt (0.7.6ubuntu14.1) gutsy-proposed; urgency=low
 
   [ Michael Vogt ]
@@ -385,7 +535,7 @@ apt (0.7.2) unstable; urgency=low
     into the debian/sid branch
   * merged from Christian Perrier:
     * mr.po: New Marathi translation  Closes: #416806
-    * zh_CN.po: Updated by Eric Pareja  Closes: #416822
+    * zh_CN.po: Updated by Kov Chai  Closes: #416822
     * tl.po: Updated by Eric Pareja   Closes: #416638
     * gl.po: Updated by Jacobo Tarrio
 	     Closes: #412828

debian/rules

@@ -185,7 +185,7 @@ apt-doc: build-doc
 
 # Build architecture-dependent files here.
 
-binary-arch: apt-transport-https apt libapt-pkg-dev apt-utils
+binary-arch: apt libapt-pkg-dev apt-utils apt-transport-https
 apt: build debian/shlibs.local
 	dh_testdir -p$@
 	dh_testroot -p$@

doc/apt-key.8.xml

@@ -63,6 +63,28 @@
      </listitem>
      </varlistentry>
 
+     <varlistentry><term>export <replaceable>keyid</replaceable></term>
+     <listitem>
+     <para>
+
+        Output the key <replaceable>keyid</replaceable> to standard output.
+
+     </para>
+
+     </listitem>
+     </varlistentry>
+
+     <varlistentry><term>exportall</term>
+     <listitem>
+     <para>
+
+        Output all trusted keys to standard output.
+
+     </para>
+
+     </listitem>
+     </varlistentry>
+
      <varlistentry><term>list</term>
      <listitem>
      <para>

doc/apt-mark.8.xml

@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+   &apt-author.moconnor;
+   &apt-author.team;
+   &apt-email;
+   &apt-product;
+   <!-- The last update date -->
+   <date>2 November 2007</date>
+ </refentryinfo>
+ 
+ <refmeta>
+   <refentrytitle>apt-mark</refentrytitle>
+   <manvolnum>8</manvolnum>
+ </refmeta>
+ 
+ <!-- Man page title -->
+ <refnamediv>
+    <refname>apt-mark</refname>
+    <refpurpose>Utility to sort package index files</refpurpose>
+ </refnamediv>
+
+ <!-- Arguments -->
+ <refsynopsisdiv>
+   <cmdsynopsis>
+      <command>apt-mark</command>
+      <arg><option>-hv</option></arg>
+      <arg><option>-f=<replaceable>FILENAME</replaceable></option></arg>
+      <group choice="req"><arg>markauto</arg><arg>unmarkauto</arg></group>
+      <arg choice="plain" rep="repeat"><replaceable>package</replaceable></arg>
+   </cmdsynopsis>
+ </refsynopsisdiv>
+ 
+ <refsect1><title>Description</title>
+   <para><command>apt-mark</command> will change whether a package has
+   been marked as being automatically installed.
+   </para>
+   <para>
+     When you request that a package is installed, and as a result
+     other packages are installed to satisfy its dependencies, the
+     depedencies are marked as being automatically installed.  Once
+     these automatically installed packages are no longer depended on
+     by any manually installed packages, they will be removed.
+   </para>
+     <variablelist>
+       <varlistentry><term>markauto</term>
+	 <listitem><para><literal>markauto</literal> is used to mark a
+     package as being automatically installed, which will cause the
+     package to be removed when no more manually installed packages
+     depend on this package.
+       </para></listitem>
+       </varlistentry>
+
+       <varlistentry><term>unmarkauto</term>
+	 <listitem><para><literal>unmarkauto</literal> is used to mark a
+     package as being manually installed, which will prevent the
+     package from being automatically removed if no other packages
+     depend on it.
+       </para></listitem>
+       </varlistentry>
+     </variablelist>
+ </refsect1>
+ 
+ <refsect1><title>options</title>
+   
+   <variablelist>
+     <varlistentry><term><option>-f=<filename>FILENAME</filename></option></term><term><option>--file=<filename>FILENAME</filename></option></term>
+     <listitem><para>
+      
+     Read/Write package stats from <filename>FILENAME</filename>
+     instead of the default location, which
+     is <filename>extended_status</filename> in the directory defined
+     by the Configuration Item: <literal>Dir::State</literal>.</para></listitem>
+     </varlistentry>
+   
+     <varlistentry><term><option>-h</option></term>
+     <term><option>--help</option></term>
+     <listitem><para>Show a short usage summary.
+     </para>
+     </listitem>
+     </varlistentry>
+     
+     <varlistentry>
+      <term><option>-v</option></term>
+      <term><option>--version</option></term>
+      <listitem><para>Show the program version.
+     </para>
+     </listitem>
+     </varlistentry>
+
+     
+   </variablelist>
+ </refsect1>
+
+ <refsect1><title>See Also</title>
+   <para>&apt-conf;</para>
+ </refsect1>
+
+ <refsect1><title>Diagnostics</title>
+   <para><command>apt-mark</command> returns zero on normal operation, non-zero on error.</para>
+ </refsect1>
+
+ &manbugs;
+ 
+</refentry>

doc/apt.8

@@ -20,10 +20,12 @@ apt \- Advanced Package Tool
 .SH SYNOPSIS
 .B apt
 .SH DESCRIPTION
-APT is a management system for software packages.  It is still
-under development; the snazzy front ends are not yet available.  In the
-meantime, please see
-.BR apt-get (8).
+APT is a management system for software packages. For normal day to day
+package management there are several frontends available, like
+.BR aptitude (8)
+for the command line or
+.BR synaptic (8)for X-Windows. Some options are only implemented in
+.BR apt-get (8) though.
 .SH OPTIONS
 None.
 .SH FILES

doc/makefile

@@ -15,7 +15,7 @@ include $(DEBIANDOC_H)
 SOURCE = apt-cache.8 apt-get.8 apt-cdrom.8 apt.conf.5 sources.list.5 \
          apt-config.8 apt_preferences.5  \
          apt-sortpkgs.1 apt-ftparchive.1 apt-extracttemplates.1 \
-	 apt-key.8 apt-secure.8
+	 apt-key.8 apt-secure.8 apt-mark.8
 INCLUDES = apt.ent	 
 include $(XML_MANPAGE_H)
 

methods/copy.cc

@@ -13,7 +13,6 @@
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
-#include <apt-pkg/fileutl.h>
 
 #include <sys/stat.h>
 #include <utime.h>
@@ -80,11 +79,12 @@ bool CopyMethod::Fetch(FetchItem *Itm)
       To.OpFail();
       return _error->Errno("utime",_("Failed to set modification time"));
    }
-
+   
    Hashes Hash;
    FileFd Fd(Res.Filename, FileFd::ReadOnly);
    Hash.AddFD(Fd.Fd(), Fd.Size());
    Res.TakeHashes(Hash);
+
    URIDone(Res);
    return true;
 }

methods/ftp.cc

@@ -1101,7 +1101,7 @@ int main(int argc,const char *argv[])
 	 char S[300];
 	 snprintf(S,sizeof(S),"http_proxy=%s",getenv("ftp_proxy"));
 	 putenv(S);
-	 putenv("no_proxy=");
+	 putenv((char *)"no_proxy=");
 	 
 	 // Run the http method
 	 string Path = flNotFile(argv[0]) + "http";

methods/gpgv.cc

@@ -121,9 +121,9 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
       // Redirect the pipe to the status fd (3)
       dup2(fd[1], 3);
 
-      putenv("LANG=");
-      putenv("LC_ALL=");
-      putenv("LC_MESSAGES=");
+      putenv((char *)"LANG=");
+      putenv((char *)"LC_ALL=");
+      putenv((char *)"LC_MESSAGES=");
       execvp(gpgvpath.c_str(), (char **)Args);
              
       exit(111);

methods/makefile

@@ -7,7 +7,7 @@ include ../buildlib/defaults.mak
 BIN := $(BIN)/methods
 
 # FIXME..
-LIB_APT_PKG_MAJOR = 4.5
+LIB_APT_PKG_MAJOR = 4.6
 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
 
 # The file method
@@ -94,9 +94,10 @@ LIB_MAKES = apt-pkg/makefile
 SOURCE = mirror.cc http.cc rfc2553emu.cc connect.cc
 include $(PROGRAM_H)
 
-# SSH and bzip2,lzma method symlinks
+# SSH and bzip2 method symlink
 binary: $(BIN)/ssh $(BIN)/bzip2 $(BIN)/lzma
 veryclean: clean-$(BIN)/ssh clean-$(BIN)/bzip2 clean-$(BIN)/lzma
+
 $(BIN)/ssh:
 	echo "Installing ssh method link"
 	ln -fs rsh $(BIN)/ssh

po/ChangeLog

@@ -1,3 +1,71 @@
+2007-11-27  Piarres Beobide  <pi@beobide.net>
+
+	* eu.po: updated to 536t.
+
+2007-11-01  Christian Perrier  <bubulle@debian.org>
+
+	* *.po: preventive unfuzzy after removal of an extra space
+	  in a message "Stored label: %s\n"
+
+2007-10-30  Peter Karlsson  <peterk@debian.org>
+
+	* sv.po: updated to 536t.
+
+2007-10-29  Jacobo Tarrio  <jtarrio@trasno.net>
+
+	* gl.po: updated to 536t. Closes: #448497
+
+2007-10-29  Sunjae Park  <darehanl@gmail.com>
+
+	* ko.po: Updated to 536t. Closes: #448430
+
+2007-10-28  Christian Perrier  <bubulle@debian.org>
+
+	* Add a bunch of languages that were not listed in LINGUAS:
+	  Arabic, Dzongkha, Khmer, Marathi, Nepali, Thai
+
+2007-10-28  Christian Perrier  <bubulle@debian.org>
+
+	* fr.po: completed to 536t.
+
+2007-10-28  Christian Perrier  <bubulle@debian.org>
+
+	* Update all PO files and apt-all.pot. 536 strings.
+	  Formerly complete PO files are now 532t3f1u
+
+2007-10-14  Jacobo Tarrio  <jtarrio@trasno.net>
+
+	* gl.po: updated to 535t. Closes: #446626
+
+2007-10-12  Peter Karlsson  <peterk@debian.org>
+
+	* sv.po: updated to 535t.
+
+2007-09-17  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: added with 535t. Closes: #442833
+
+2007-09-07  Claus Hindsgaul  <claus.hindsgaul@gmail.com>
+
+	* da.po: completed to 532t3f. Closes: #441102
+
+2007-09-03  Clytie Siddall  <clytie@riverland.net.au>
+
+	* vi.po: completed to 535t. Closes: #440611
+
+2007-08-07  Piarres Beobide  <pi@beobide.net>
+
+	* eu.po: completed to 535t. Closes: #436425
+
+2007-08-04  Christian Perrier  <bubulle@debian.org>
+
+	* fr.po: completed to 535t.
+
+2007-08-04  Christian Perrier  <bubulle@debian.org>
+
+	* Update all PO and the POT. Gives 529t6f for formerly
+	  complete translations
+
 2007-07-11  Piarres Beobide  <pi@beobide.net>
 
 	* eu.po: completed to 532t. Closes: #423766

po/LINGUAS

@@ -1 +1 @@
-bg bs ca cs cy da de el en_GB es eu fi fr gl he hu it ja ko nb nl nn pl pt pt_BR ro ru sk sl sv tl vi zh_CN zh_TW
+ar bg bs ca cs cy da de dz el en_GB es eu fi fr gl he hu it ja km ko ku mr nb ne nl nn pl pt pt_BR ro ru sk sl sv th tl uk vi zh_CN zh_TW

po/apt-all.pot

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 07:19+0200\n"
+"POT-Creation-Date: 2007-10-28 07:55+0100\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"
@@ -156,9 +156,9 @@ msgstr ""
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2588 cmdline/apt-sortpkgs.cc:144
 #, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 
 #: cmdline/apt-cache.cc:1721
@@ -370,87 +370,87 @@ msgstr ""
 msgid "Unable to get a cursor"
 msgstr ""
 
-#: ftparchive/writer.cc:75
+#: ftparchive/writer.cc:76
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:81
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:131
+#: ftparchive/writer.cc:132
 msgid "E: "
 msgstr ""
 
-#: ftparchive/writer.cc:133
+#: ftparchive/writer.cc:134
 msgid "W: "
 msgstr ""
 
-#: ftparchive/writer.cc:140
+#: ftparchive/writer.cc:141
 msgid "E: Errors apply to file "
 msgstr ""
 
-#: ftparchive/writer.cc:157 ftparchive/writer.cc:187
+#: ftparchive/writer.cc:158 ftparchive/writer.cc:188
 #, c-format
 msgid "Failed to resolve %s"
 msgstr ""
 
-#: ftparchive/writer.cc:169
+#: ftparchive/writer.cc:170
 msgid "Tree walking failed"
 msgstr ""
 
-#: ftparchive/writer.cc:194
+#: ftparchive/writer.cc:195
 #, c-format
 msgid "Failed to open %s"
 msgstr ""
 
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:254
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr ""
 
-#: ftparchive/writer.cc:261
+#: ftparchive/writer.cc:262
 #, c-format
 msgid "Failed to readlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:266
 #, c-format
 msgid "Failed to unlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc:272
+#: ftparchive/writer.cc:273
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr ""
 
-#: ftparchive/writer.cc:282
+#: ftparchive/writer.cc:283
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:387
 msgid "Archive had no package field"
 msgstr ""
 
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:609
+#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:439 ftparchive/writer.cc:697
+#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:619
+#: ftparchive/writer.cc:620
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:623
+#: ftparchive/writer.cc:624
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
@@ -554,7 +554,7 @@ msgstr ""
 msgid "Y"
 msgstr ""
 
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
@@ -713,11 +713,11 @@ msgstr ""
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2012 cmdline/apt-get.cc:2045
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2093 cmdline/apt-get.cc:2334
 #: apt-pkg/cachefile.cc:63
 msgid "The list of sources could not be read."
 msgstr ""
@@ -746,7 +746,7 @@ msgstr ""
 msgid "After unpacking %sB disk space will be freed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2188
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr ""
@@ -780,7 +780,7 @@ msgstr ""
 msgid "Do you want to continue [Y/n]? "
 msgstr ""
 
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2231
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""
@@ -789,7 +789,7 @@ msgstr ""
 msgid "Some files failed to download"
 msgstr ""
 
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2240
 msgid "Download complete and in download only mode"
 msgstr ""
 
@@ -915,7 +915,7 @@ msgid ""
 "shouldn't happen. Please file a bug report against apt."
 msgstr ""
 
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1755
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
@@ -927,37 +927,37 @@ msgstr ""
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
 #, c-format
 msgid "Couldn't find task %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1714
 #, c-format
 msgid "%s set to manual installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1727
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1730
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1742
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -965,159 +965,159 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1750
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
 "that package should be filed."
 msgstr ""
 
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1758
 msgid "Broken packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1787
 msgid "The following extra packages will be installed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1876
 msgid "Suggested packages:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1877
 msgid "Recommended packages:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1905
 msgid "Calculating upgrade... "
 msgstr ""
 
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1908 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1913
 msgid "Done"
 msgstr ""
 
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1980 cmdline/apt-get.cc:1988
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2088
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2118 cmdline/apt-get.cc:2352
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2167
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2191
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2196
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2199
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2205
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2236
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2276
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2277
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2294
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2313
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2329
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2357
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2377
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2429
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2482
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2518
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2543
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2557
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2561
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2593
 msgid "Supported modules:"
 msgstr ""
 
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2634
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1132,6 +1132,7 @@ msgid ""
 "   upgrade - Perform an upgrade\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
+"   autoremove - Remove all automatic unused packages\n"
 "   purge - Remove and purge packages\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
@@ -1483,25 +1484,25 @@ msgstr ""
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:48
+#: apt-inst/deb/debfile.cc:50
 #, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
 #, c-format
 msgid "Couldn't change to %s"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
 msgid "Internal error, could not locate member"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
 msgid "Failed to locate a valid control file"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
 msgid "Unparsable control file"
 msgstr ""
 
@@ -1533,12 +1534,12 @@ msgstr ""
 msgid "File not found"
 msgstr ""
 
-#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
+#: methods/copy.cc:43 methods/gpgv.cc:281 methods/gzip.cc:141
 #: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243
 msgid "Failed to stat"
 msgstr ""
 
-#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
+#: methods/copy.cc:80 methods/gpgv.cc:278 methods/gzip.cc:147
 #: methods/rred.cc:240
 msgid "Failed to set modification time"
 msgstr ""
@@ -1599,7 +1600,7 @@ msgstr ""
 msgid "Server closed the connection"
 msgstr ""
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
 msgid "Read error"
 msgstr ""
 
@@ -1611,7 +1612,7 @@ msgstr ""
 msgid "Protocol corruption"
 msgstr ""
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
 msgid "Write error"
 msgstr ""
 
@@ -1857,23 +1858,23 @@ msgstr ""
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:1108
+#: methods/http.cc:1104
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
 msgid "Connection failed"
 msgstr ""
 
-#: methods/http.cc:1216
+#: methods/http.cc:1228
 msgid "Internal error"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:78
+#: apt-pkg/contrib/mmap.cc:80
 msgid "Can't mmap an empty file"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:83
+#: apt-pkg/contrib/mmap.cc:85
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
@@ -1895,7 +1896,7 @@ msgstr ""
 
 #: apt-pkg/contrib/configuration.cc:510
 #, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
 msgstr ""
 
 #: apt-pkg/contrib/configuration.cc:606
@@ -1938,12 +1939,12 @@ msgstr ""
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:152
+#: apt-pkg/contrib/progress.cc:153
 #, c-format
 msgid "%c%s... Error!"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
 #, c-format
 msgid "%c%s... Done"
 msgstr ""
@@ -2008,70 +2009,70 @@ msgstr ""
 msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:80
+#: apt-pkg/contrib/fileutl.cc:82
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:85
+#: apt-pkg/contrib/fileutl.cc:87
 #, c-format
 msgid "Could not open lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:103
+#: apt-pkg/contrib/fileutl.cc:105
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:107
+#: apt-pkg/contrib/fileutl.cc:109
 #, c-format
 msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:375
+#: apt-pkg/contrib/fileutl.cc:377
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:385
+#: apt-pkg/contrib/fileutl.cc:387
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:388
+#: apt-pkg/contrib/fileutl.cc:390
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:390
+#: apt-pkg/contrib/fileutl.cc:392
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:434
+#: apt-pkg/contrib/fileutl.cc:436
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:490
+#: apt-pkg/contrib/fileutl.cc:492
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:520
+#: apt-pkg/contrib/fileutl.cc:522
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:597
 msgid "Problem closing the file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:601
+#: apt-pkg/contrib/fileutl.cc:603
 msgid "Problem unlinking the file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:612
+#: apt-pkg/contrib/fileutl.cc:614
 msgid "Problem syncing the file"
 msgstr ""
 
@@ -2148,28 +2149,28 @@ msgstr ""
 msgid "extra"
 msgstr ""
 
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
 msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
 msgid "Candidate versions"
 msgstr ""
 
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
 msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
 msgid "Reading state information"
 msgstr ""
 
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr ""
 
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr ""
@@ -2253,13 +2254,13 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1103
+#: apt-pkg/algorithms.cc:1105
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1105
+#: apt-pkg/algorithms.cc:1107
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
@@ -2295,17 +2296,17 @@ msgstr ""
 msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:398
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
@@ -2437,36 +2438,39 @@ msgstr ""
 msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
 msgid "MD5Sum mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1399
+msgid "Hash Sum mismatch"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1091
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1204
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1263
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1304
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1391
 msgid "Size mismatch"
 msgstr ""
 
@@ -2488,7 +2492,7 @@ msgstr ""
 
 #: apt-pkg/cdrom.cc:563
 #, c-format
-msgid "Stored label: %s \n"
+msgid "Stored label: %s\n"
 msgstr ""
 
 #: apt-pkg/cdrom.cc:583
@@ -2516,7 +2520,7 @@ msgstr ""
 #: apt-pkg/cdrom.cc:671
 #, c-format
 msgid ""
-"Found %i package indexes, %i source indexes, %i translation indexes and %i "
+"Found %u package indexes, %u source indexes, %u translation indexes and %u "
 "signatures\n"
 msgstr ""
 
@@ -2552,76 +2556,91 @@ msgstr ""
 msgid "Unmounting CD-ROM...\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:510
+#, c-format
+msgid "Directory '%s' missing"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:572
 #, c-format
 msgid "Preparing %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:573
 #, c-format
 msgid "Unpacking %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:578
 #, c-format
 msgid "Preparing to configure %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:579
 #, c-format
 msgid "Configuring %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:581 apt-pkg/deb/dpkgpm.cc:582
+#, c-format
+msgid "Processing triggers for %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:584
 #, c-format
 msgid "Installed %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:589 apt-pkg/deb/dpkgpm.cc:591
+#: apt-pkg/deb/dpkgpm.cc:592
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:594
 #, c-format
 msgid "Removing %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:595
 #, c-format
 msgid "Removed %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:600
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:601
 #, c-format
 msgid "Completely removed %s"
 msgstr ""
 
+#: apt-pkg/deb/dpkgpm.cc:749
+msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+msgstr ""
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr ""

po/gl.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
-"PO-Revision-Date: 2007-06-18 15:26+0200\n"
+"POT-Creation-Date: 2007-10-28 07:55+0100\n"
+"PO-Revision-Date: 2007-10-29 14:02+0000\n"
 "Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
 "MIME-Version: 1.0\n"
@@ -157,10 +157,10 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2588 cmdline/apt-sortpkgs.cc:144
 #, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
-msgstr "%s %s para %s %s compilado en %s %s\n"
+msgid "%s %s for %s compiled on %s %s\n"
+msgstr "%s %s para %s compilado en %s %s\n"
 
 #: cmdline/apt-cache.cc:1721
 msgid ""
@@ -478,87 +478,87 @@ msgstr "O arquivo non ten un rexistro de control"
 msgid "Unable to get a cursor"
 msgstr "Non se puido obter un cursor"
 
-#: ftparchive/writer.cc:75
+#: ftparchive/writer.cc:76
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "A: Non se puido ler o directorio %s\n"
 
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:81
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "A: Non se atopou %s\n"
 
-#: ftparchive/writer.cc:131
+#: ftparchive/writer.cc:132
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:133
+#: ftparchive/writer.cc:134
 msgid "W: "
 msgstr "A: "
 
-#: ftparchive/writer.cc:140
+#: ftparchive/writer.cc:141
 msgid "E: Errors apply to file "
 msgstr "E: Os erros aplícanse ao ficheiro "
 
-#: ftparchive/writer.cc:157 ftparchive/writer.cc:187
+#: ftparchive/writer.cc:158 ftparchive/writer.cc:188
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Non se puido resolver %s"
 
-#: ftparchive/writer.cc:169
+#: ftparchive/writer.cc:170
 msgid "Tree walking failed"
 msgstr "O percorrido da árbore fallou"
 
-#: ftparchive/writer.cc:194
+#: ftparchive/writer.cc:195
 #, c-format
 msgid "Failed to open %s"
 msgstr "Non se puido abrir %s"
 
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:254
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DesLig %s [%s]\n"
 
-#: ftparchive/writer.cc:261
+#: ftparchive/writer.cc:262
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Non se puido ler a ligazón %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:266
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Non se puido borrar %s"
 
-#: ftparchive/writer.cc:272
+#: ftparchive/writer.cc:273
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Non se puido ligar %s con %s"
 
-#: ftparchive/writer.cc:282
+#: ftparchive/writer.cc:283
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Alcanzouse o límite de desligado de %sB.\n"
 
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:387
 msgid "Archive had no package field"
 msgstr "O arquivo non tiña un campo Package"
 
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:609
+#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s non ten unha entrada de \"override\"\n"
 
-#: ftparchive/writer.cc:439 ftparchive/writer.cc:697
+#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  O mantedor de %s é %s, non %s\n"
 
-#: ftparchive/writer.cc:619
+#: ftparchive/writer.cc:620
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s non ten unha entrada de \"override\" de código fonte\n"
 
-#: ftparchive/writer.cc:623
+#: ftparchive/writer.cc:624
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s tampouco ten unha entrada de \"override\" de binarios\n"
@@ -662,7 +662,7 @@ msgstr "Non se puido cambiar o nome de %s a %s"
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Erro na compilación da expresión regular - %s"
@@ -823,11 +823,11 @@ msgstr "Hai que eliminar paquetes pero a eliminación está desactivada."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erro interno, a ordeación non rematou"
 
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2012 cmdline/apt-get.cc:2045
 msgid "Unable to lock the download directory"
 msgstr "Non se puido bloquear o directorio de descargas"
 
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2093 cmdline/apt-get.cc:2334
 #: apt-pkg/cachefile.cc:63
 msgid "The list of sources could not be read."
 msgstr "Non se puido ler a lista de orixes."
@@ -857,7 +857,7 @@ msgstr "Despois de desempaquetar hanse ocupar %sB de disco adicionais.\n"
 msgid "After unpacking %sB disk space will be freed.\n"
 msgstr "Despois de desempaquetar hanse liberar %sB de disco.\n"
 
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2188
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Non se puido determinar o espazo libre en %s"
@@ -894,7 +894,7 @@ msgstr "Abortar."
 msgid "Do you want to continue [Y/n]? "
 msgstr "¿Quere continuar [S/n]? "
 
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2231
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Non se puido obter %s  %s\n"
@@ -903,7 +903,7 @@ msgstr "Non se puido obter %s  %s\n"
 msgid "Some files failed to download"
 msgstr "Non se puido descargar algúns ficheiros"
 
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2240
 msgid "Download complete and in download only mode"
 msgstr "Completouse a descarga no modo de só descargas"
 
@@ -1043,7 +1043,7 @@ msgstr ""
 "Hum, semella que o autoeliminadir destruiu algo, o que non debería\n"
 "ter ocorrido. Envíe un informe de erro sobre apt."
 
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1755
 msgid "The following information may help to resolve the situation:"
 msgstr "A seguinte información pode axudar a resolver a situación:"
 
@@ -1055,31 +1055,31 @@ msgstr "Erro interno, o autoeliminador rompeu cousas"
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erro interno, AllUpgrade rompeu cousas"
 
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Non se puido atopar a tarefa %s"
 
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Non se puido atopar o paquete %s"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Nota, escóllese %s para a expresión regular \"%s\"\n"
 
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1714
 #, c-format
 msgid "%s set to manual installed.\n"
 msgstr "%s cambiado a instalado manualmente.\n"
 
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1727
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Pode querer executar \"apt-get -f install\" corrixir isto:"
 
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1730
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1087,7 +1087,7 @@ msgstr ""
 "Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou "
 "especifique unha solución)."
 
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1742
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1098,7 +1098,7 @@ msgstr ""
 "unha situación imposible ou, se emprega a distribución inestable, que\n"
 "algúns paquetes solicitados aínda non se crearon ou moveron de Incoming."
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1750
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1107,118 +1107,118 @@ msgstr ""
 "Xa que só solicitou unha soa operación, é bastante probable que o\n"
 "paquete non sea instalable e que se deba informar dun erro no paquete."
 
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1758
 msgid "Broken packages"
 msgstr "Paquetes rotos"
 
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1787
 msgid "The following extra packages will be installed:"
 msgstr "Hanse instalar os seguintes paquetes extra:"
 
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1876
 msgid "Suggested packages:"
 msgstr "Paquetes suxiridos:"
 
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1877
 msgid "Recommended packages:"
 msgstr "Paquetes recomendados:"
 
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1905
 msgid "Calculating upgrade... "
 msgstr "A calcular a actualización... "
 
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1908 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Fallou"
 
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1913
 msgid "Done"
 msgstr "Rematado"
 
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1980 cmdline/apt-get.cc:1988
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Erro interno, o resolvedor interno rompeu cousas"
 
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2088
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Ten que especificar alomenos un paquete para lle descargar o código fonte"
 
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2118 cmdline/apt-get.cc:2352
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Non se puido atopar un paquete fonte para %s"
 
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2167
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Omítese o ficheiro xa descargado \"%s\"\n"
 
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2191
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Non hai espazo libre de abondo en %s"
 
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2196
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Hai que recibir %sB/%sB de arquivos de fonte.\n"
 
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2199
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Hai que recibir %sB de arquivos de fonte.\n"
 
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2205
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter fonte %s\n"
 
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2236
 msgid "Failed to fetch some archives."
 msgstr "Non se puido recibir algúns arquivos."
 
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n"
 
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2276
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Fallou a orde de desempaquetamento \"%s\".\n"
 
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2277
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Comprobe que o paquete \"dpkg-dev\" estea instalado.\n"
 
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2294
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Fallou a codificación de %s.\n"
 
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2313
 msgid "Child process failed"
 msgstr "O proceso fillo fallou"
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2329
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Ten que especificar alomenos un paquete para lle comprobar as dependencias "
 "de compilación"
 
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2357
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Non se puido obter a información de dependencias de compilación de %s"
 
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2377
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s non ten dependencias de compilación.\n"
 
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2429
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1227,7 +1227,7 @@ msgstr ""
 "A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar "
 "o paquete %s"
 
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2482
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1236,32 +1236,32 @@ msgstr ""
 "A dependencia \"%s\" de %s non se pode satisfacer porque ningunha versión "
 "dispoñible do paquete %s satisfai os requirimentos de versión"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2518
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Non se puido satisfacer a dependencia \"%s\" de %s: O paquete instalado %s é "
 "novo de máis"
 
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2543
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Non se puido satisfacer a dependencia \"%s\" de %s: %s"
 
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2557
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Non se puideron satisfacer as dependencias de compilación de %s."
 
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2561
 msgid "Failed to process build dependencies"
 msgstr "Non se puido procesar as dependencias de compilación"
 
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2593
 msgid "Supported modules:"
 msgstr "Módulos soportados:"
 
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2634
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1276,6 +1276,7 @@ msgid ""
 "   upgrade - Perform an upgrade\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
+"   autoremove - Remove all automatic unused packages\n"
 "   purge - Remove and purge packages\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
@@ -1317,6 +1318,8 @@ msgstr ""
 "   install - Instala novos paquetes (o paquete chámase libc6, non libc6."
 "deb)\n"
 "   remove - Elimina paquetes\n"
+"   autoremove - Elimina os paquetes instalados automaticamente pero non "
+"usados\n"
 "   purge - Elimina e purga paquetes\n"
 "   source - Descarga arquivos de código fonte\n"
 "   build-dep - Configura as dependencias de compilación dos paquetes fonte\n"
@@ -1331,7 +1334,7 @@ msgstr ""
 "  -q  Saída que se pode rexistrar - sen indicador de progreso\n"
 "  -qq Sen saída agás polos erros\n"
 "  -d  Só descarga - NON instala nin desempaqueta os arquivos\n"
-"  -s  No-act. Realiza unha simulación de ordeamento\n"
+"  -s  Non actuar. Realiza unha simulación de ordeamento\n"
 "  -y  Supón unha resposta afirmativa a tódalas preguntas sen amosalas\n"
 "  -f  Tenta continuar se a comprobación de integridade falla\n"
 "  -m  Tenta continuar se non se poden localizar os arquivos\n"
@@ -1687,25 +1690,26 @@ msgstr "Erro ao analizar o MD5. Desprazamento %lu"
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Este non é un arquivo DEB válido, falla o membro \"%s\""
 
-#: apt-inst/deb/debfile.cc:48
+#: apt-inst/deb/debfile.cc:50
 #, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
-msgstr "Este non é un arquivo DEB válido, non ten un membro \"%s\" ou \"%s\""
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
+msgstr ""
+"Este non é un arquivo DEB válido, non ten un membro \"%s\", \"%s\" ou \"%s\""
 
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Non se puido cambiar a %s"
 
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
 msgid "Internal error, could not locate member"
 msgstr "Erro interno, non se puido atopar un membro"
 
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
 msgid "Failed to locate a valid control file"
 msgstr "Non se puido atopar un ficheiro de control válido"
 
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
 msgid "Unparsable control file"
 msgstr "Ficheiro de control non analizable"
 
@@ -1739,12 +1743,12 @@ msgstr "Non se atopou o disco"
 msgid "File not found"
 msgstr "Non se atopou o ficheiro"
 
-#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
+#: methods/copy.cc:43 methods/gpgv.cc:281 methods/gzip.cc:141
 #: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243
 msgid "Failed to stat"
 msgstr "Non se atopou"
 
-#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
+#: methods/copy.cc:80 methods/gpgv.cc:278 methods/gzip.cc:147
 #: methods/rred.cc:240
 msgid "Failed to set modification time"
 msgstr "Non se puido estabrecer a hora de modificación"
@@ -1807,7 +1811,7 @@ msgstr "Tempo esgotado para a conexión"
 msgid "Server closed the connection"
 msgstr "O servidor pechou a conexión"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Erro de lectura"
 
@@ -1819,7 +1823,7 @@ msgstr "Unha resposta desbordou o buffer."
 msgid "Protocol corruption"
 msgstr "Corrupción do protocolo"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Erro de escritura"
 
@@ -2073,23 +2077,23 @@ msgstr "Erro ao ler do servidor. O extremo remoto pechou a conexión"
 msgid "Error reading from server"
 msgstr "Erro ao ler do servidor"
 
-#: methods/http.cc:1108
+#: methods/http.cc:1104
 msgid "Bad header data"
 msgstr "Datos da cabeceira incorrectos"
 
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
 msgid "Connection failed"
 msgstr "A conexión fallou"
 
-#: methods/http.cc:1216
+#: methods/http.cc:1228
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: apt-pkg/contrib/mmap.cc:78
+#: apt-pkg/contrib/mmap.cc:80
 msgid "Can't mmap an empty file"
 msgstr "Non se pode facer mmap sobre un ficheiro baleiro"
 
-#: apt-pkg/contrib/mmap.cc:83
+#: apt-pkg/contrib/mmap.cc:85
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Non se puido facer mmap de %lu bytes"
@@ -2111,8 +2115,8 @@ msgstr "A abrir o ficheiro de configuración %s"
 
 #: apt-pkg/contrib/configuration.cc:510
 #, c-format
-msgid "Line %d too long (max %lu)"
-msgstr "Liña %d longa de máis (máximo %lu)"
+msgid "Line %d too long (max %u)"
+msgstr "Liña %d longa de máis (máximo %u)"
 
 #: apt-pkg/contrib/configuration.cc:606
 #, c-format
@@ -2154,12 +2158,12 @@ msgstr "Erro de sintaxe %s:%u: Non se soporta a directiva \"%s\""
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Erro de sintaxe %s:%u: Lixo extra á fin da liña"
 
-#: apt-pkg/contrib/progress.cc:152
+#: apt-pkg/contrib/progress.cc:153
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... ¡Erro!"
 
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Rematado"
@@ -2225,70 +2229,70 @@ msgstr "Non se pode cambiar a %s"
 msgid "Failed to stat the cdrom"
 msgstr "Non se puido analizar o CD-ROM"
 
-#: apt-pkg/contrib/fileutl.cc:80
+#: apt-pkg/contrib/fileutl.cc:82
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Non se empregan bloqueos para o ficheiro de bloqueo de só lectura %s"
 
-#: apt-pkg/contrib/fileutl.cc:85
+#: apt-pkg/contrib/fileutl.cc:87
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Non se puido abrir o ficheiro de bloqueo %s"
 
-#: apt-pkg/contrib/fileutl.cc:103
+#: apt-pkg/contrib/fileutl.cc:105
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Non se empregan bloqueos para o ficheiro de bloqueo montado por NFS %s"
 
-#: apt-pkg/contrib/fileutl.cc:107
+#: apt-pkg/contrib/fileutl.cc:109
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Non se puido obter o bloqueo %s"
 
-#: apt-pkg/contrib/fileutl.cc:375
+#: apt-pkg/contrib/fileutl.cc:377
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Agardouse por %s pero non estaba alí"
 
-#: apt-pkg/contrib/fileutl.cc:385
+#: apt-pkg/contrib/fileutl.cc:387
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "O subproceso %s recibiu un fallo de segmento."
 
-#: apt-pkg/contrib/fileutl.cc:388
+#: apt-pkg/contrib/fileutl.cc:390
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "O subproceso %s devolveu un código de erro (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:390
+#: apt-pkg/contrib/fileutl.cc:392
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "O subproceso %s saíu de xeito inesperado"
 
-#: apt-pkg/contrib/fileutl.cc:434
+#: apt-pkg/contrib/fileutl.cc:436
 #, c-format
 msgid "Could not open file %s"
 msgstr "Non se puido abrir o ficheiro %s"
 
-#: apt-pkg/contrib/fileutl.cc:490
+#: apt-pkg/contrib/fileutl.cc:492
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "lectura, aínda hai %lu para ler pero non queda ningún"
 
-#: apt-pkg/contrib/fileutl.cc:520
+#: apt-pkg/contrib/fileutl.cc:522
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "escritura, aínda hai %lu para escribir pero non se puido"
 
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:597
 msgid "Problem closing the file"
 msgstr "Problema ao pechar o ficheiro"
 
-#: apt-pkg/contrib/fileutl.cc:601
+#: apt-pkg/contrib/fileutl.cc:603
 msgid "Problem unlinking the file"
 msgstr "Problema ao borrar o ficheiro"
 
-#: apt-pkg/contrib/fileutl.cc:612
+#: apt-pkg/contrib/fileutl.cc:614
 msgid "Problem syncing the file"
 msgstr "Problema ao sincronizar o ficheiro"
 
@@ -2365,28 +2369,28 @@ msgstr "opcional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
 msgid "Building dependency tree"
 msgstr "A construír a árbore de dependencias"
 
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
 msgid "Candidate versions"
 msgstr "Versións candidatas"
 
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
 msgid "Dependency generation"
 msgstr "Xeración de dependencias"
 
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
 msgid "Reading state information"
 msgstr "A ler a información do estado"
 
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Non se puido abrir o ficheiro de estado %s"
 
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Non se puido gravar o ficheiro de estado temporal %s"
@@ -2474,7 +2478,7 @@ msgid ""
 msgstr ""
 "O paquete %s ten que se reinstalar, pero non se pode atopar o seu arquivo."
 
-#: apt-pkg/algorithms.cc:1103
+#: apt-pkg/algorithms.cc:1105
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2482,7 +2486,7 @@ msgstr ""
 "Erro, pkgProblemResolver::Resolve xerou interrupcións, pode estar causado "
 "por paquetes retidos."
 
-#: apt-pkg/algorithms.cc:1105
+#: apt-pkg/algorithms.cc:1107
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Non se poden resolver os problemas, ten retidos paquetes rotos."
 
@@ -2518,17 +2522,17 @@ msgstr "Non se puido atopar o controlador de métodos %s."
 msgid "Method %s did not start correctly"
 msgstr "O método %s non se iniciou correctamente"
 
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:398
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Introduza o disco etiquetado: \"%s\" na unidade \"%s\" e prema Intro."
 
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "O sistema de empaquetamento \"%s\" non está soportado"
 
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Non se puido determinar un tipo de sistema de empaquetamento axeitado"
 
@@ -2664,17 +2668,20 @@ msgstr "Erro de E/S ao gravar a caché de fontes"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "fallou o cambio de nome, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
 msgid "MD5Sum mismatch"
 msgstr "Os MD5Sum non coinciden"
 
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1399
+msgid "Hash Sum mismatch"
+msgstr "Os \"hashes\" non coinciden"
+
+#: apt-pkg/acquire-item.cc:1091
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Non hai unha clave pública dispoñible para os seguintes IDs de clave:\n"
 
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1204
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2683,7 +2690,7 @@ msgstr ""
 "Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
 "ten que arranxar este paquete a man. (Falla a arquitectura)"
 
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1263
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2692,7 +2699,7 @@ msgstr ""
 "Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
 "ten que arranxar este paquete a man."
 
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1304
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2700,7 +2707,7 @@ msgstr ""
 "Os ficheiros de índices de paquetes están corrompidos. Non hai un campo "
 "Filename: para o paquete %s."
 
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1391
 msgid "Size mismatch"
 msgstr "Os tamaños non coinciden"
 
@@ -2724,7 +2731,7 @@ msgstr "A identificar.. "
 
 #: apt-pkg/cdrom.cc:563
 #, c-format
-msgid "Stored label: %s \n"
+msgid "Stored label: %s\n"
 msgstr "Etiqueta armacenada: %s \n"
 
 #: apt-pkg/cdrom.cc:583
@@ -2752,11 +2759,11 @@ msgstr "A buscar os ficheiros de índices no disco..\n"
 #: apt-pkg/cdrom.cc:671
 #, c-format
 msgid ""
-"Found %i package indexes, %i source indexes, %i translation indexes and %i "
+"Found %u package indexes, %u source indexes, %u translation indexes and %u "
 "signatures\n"
 msgstr ""
-"Atopáronse %i índices de paquetes, %i índices de fontes, %i índices de "
-"traducións e %i sinaturas\n"
+"Atopáronse %u índices de paquetes, %u índices de fontes, %u índices de "
+"traducións e %u sinaturas\n"
 
 #: apt-pkg/cdrom.cc:708
 #, c-format
@@ -2792,78 +2799,95 @@ msgstr "As entradas da lista de fontes deste disco son:\n"
 msgid "Unmounting CD-ROM...\n"
 msgstr "A desmontar o CD-ROM...\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Graváronse %i rexistros.\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Graváronse %i rexistros con %i ficheiros que fallan.\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Graváronse %i rexistros con %i ficheiros que non coinciden\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "Graváronse %i rexistros con %i ficheiros que fallan e %i ficheiros que non "
 "coinciden\n"
 
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:510
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "O directorio \"%s\" falla"
+
+#: apt-pkg/deb/dpkgpm.cc:572
 #, c-format
 msgid "Preparing %s"
 msgstr "A preparar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:573
 #, c-format
 msgid "Unpacking %s"
 msgstr "A desempaquetar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:578
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "A se preparar para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:579
 #, c-format
 msgid "Configuring %s"
 msgstr "A configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:581 apt-pkg/deb/dpkgpm.cc:582
+#, c-format
+msgid "Processing triggers for %s"
+msgstr "A procesar os disparadores de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:584
 #, c-format
 msgid "Installed %s"
 msgstr "Instalouse %s"
 
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:589 apt-pkg/deb/dpkgpm.cc:591
+#: apt-pkg/deb/dpkgpm.cc:592
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "A se preparar para a eliminación de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:594
 #, c-format
 msgid "Removing %s"
 msgstr "A eliminar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:595
 #, c-format
 msgid "Removed %s"
 msgstr "Eliminouse %s"
 
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:600
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "A se preparar para eliminar %s completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:601
 #, c-format
 msgid "Completely removed %s"
 msgstr "Eliminouse %s completamente"
 
+#: apt-pkg/deb/dpkgpm.cc:749
+msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+msgstr ""
+"Non se puido escribir no rexistro, a chamada a openpty() fallou (¿/dev/pts "
+"non estaba montado?)\n"
+
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr "Non se puido parchear o ficheiro"
@@ -2872,6 +2896,9 @@ msgstr "Non se puido parchear o ficheiro"
 msgid "Connection closed prematurely"
 msgstr "A conexión pechouse prematuramente"
 
+#~ msgid "openpty failed\n"
+#~ msgstr "Fallou a chamada a openpty\n"
+
 #~ msgid "File date has changed %s"
 #~ msgstr "A data do ficheiro cambiou %s"