* apt-inst/contrib/arfile.cc:

  - support members ending with '/' as well (thanks to Michal Cihr,
    closes: #500988)
* Translations:
  - Galician updated. Closes: #509151
  - Catalan updated. Closes: #509375
  - Vietnamese updated. Closes: #509422
  - Traditional Chinese added. Closes: #510664
* COPYING:
  - Actualized. Removed obsolete Qt section, added GPLv2 clause.
    (Closes: #440049, #509337)

COPYING

@@ -1,142 +1,23 @@
 Apt is copyright 1997, 1998, 1999 Jason Gunthorpe and others.
+Apt is currently developed by APT Development Team <deity@lists.debian.org>.
 
-Apt is licensed under the terms of the GNU General Public License (GPL),
-version 2.0 or later, as published by the Free Software Foundation.  See
-the file COPYING.GPL [included], /usr/share/common-licenses/GPL, or
-<http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version
-of the GNU General Public License.
-
-In addition, prior to November 15th, 2000, apt may be distributed under
-terms identical to the above with the following addition:
-
-Works using apt may link against the GUI library "libqt", copyright by
-Troll Tech AS, Norway, provided that:
-
-1. The version of "libqt" is licensed under the terms of the "Qt Free Edition
-   License" published by Troll Tech AS.  The license terms identified as
-   the Qt Free Edition License below are the only such terms under which
-   distribution of works derived from both apt and "libqt" are permitted;
-
-and
-
-2. The source code of the version of "libqt" used is
-
-   a) Distributed with the binary version;
-
-   or
-
-   b) Downloadable by anyone, without fee, using a publicly-announced
-      URL on the Internet, for a duration of at least three years
-      starting with distribution of the binary version.
-
-On and after November 15th, 2000, the above additional terms lose all
-force, and apt will be licensed only under the terms of the GNU General
-Public License, version 2.0 or later.
-
-      _______________________________________________________________
-
-The following text, up to the text of the Qt Free Edition License, is
-informational and not part of the license terms on apt.
-
-Modifications to apt in either source or compiled form must be licensed
-under the terms of the GNU General Public License, version 2.0 (or later),
-but need not include the above clause permitting usage of the "libqt"
-library under the Qt Free Edition License.  Note that removal of this
-clause will result in software which is not licensed for binary
-redistribution linked against software governed by the Qt Free Edition
-License.  In the event that a version of "libqt" is released that is
-licensed under terms that do not conflict with the GPL, the additional
-clause above is not required to grant permission for distribution of works
-that are derived from both apt and "libqt".
-
-No part of apt is licensed under the Qt Free Edition License.  The terms
-below are provided to help identify the circumstances under which the
-"libqt" library may be used with apt (or a work derived from both).  The
-terms below are copied from the LICENSE file of the qt-1.44 distribution,
-as of November 10th, 1999.
-
-      _______________________________________________________________
-
-                        QT FREE EDITION LICENSE
+License: GPLv2+
 
-Copyright (C) 1992-1999 Troll Tech AS. All rights reserved. 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
 
-This is the license for Qt Free Edition version 1.44; it covers private use,
-use of third-party application programs based on Qt, and development of
-free software for the free software community. 
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-                      COPYRIGHT AND RESTRICTIONS
-
-The Qt toolkit is a product of Troll Tech AS. The Qt Free Edition is limited
-to use with the X Window System. 
-
-You may copy this version of the Qt Free Edition provided that the entire
-archive is distributed unchanged and as a whole, including this notice. 
-
-You may use this version of the Qt Free Edition to compile, link and run
-application programs legally developed by third parties. 
-
-You may use the Qt Free Edition to create application programs
-provided that: 
-
-      You accept this license. 
-      Your software does not require modifications to Qt Free Edition.
-      You satisfy ONE of the following three requirements 
-      EITHER 
-            Users of your software can freely obtain source code for the
-            software, freely modify the source code (possibly with
-            restrictions on copyright notices, attributions and legal
-            responsibility), and freely redistribute original or modified
-            versions of the software. 
-      OR 
-            Your software is distributed under the GNU GENERAL
-            PUBLIC LICENSE, version 2 or later, as defined by the
-            Free Software Foundation. 
-      OR 
-            Your software is distributed under the GNU LIBRARY
-            GENERAL PUBLIC LICENSE, version 2 or later, as
-            defined by the Free Software Foundation. 
-
-If you are paid to develop something with Qt Free Edition or it is a part of
-your job the following conditions also apply: 
-
-      Your software must not require libraries, programs, data or
-      documentation that are not available outside your organization in
-      order to compile or use. 
-      If and when your organization starts using the software, you must
-      notify Troll Tech AS of the following: 
-            Your organization's name and purpose. 
-            The software's name and purpose. 
-            The software's license. 
-            That your organization considers the software to be free
-            software. 
-
-You may also use the Qt Free Edition to create reusable components
-(such as libraries) provided that you accept the terms above, and in
-addition that: 
-
-      Your components' license includes the following text: 
-
-            [Your package] requires the Qt library, which is
-            copyright Troll Tech AS. Freely distributable
-            programs may generally use Qt Free Edition free of
-            charge, see [README.QT] for details. 
-
-      README.QT is distributed along with your components. 
-      Qt Free Edition is not distributed as an integral part of your
-      components. 
-
-                       LIMITATIONS OF LIABILITY
-
-Troll Tech AS makes no obligation under this license to support or
-upgrade Qt Free Edition, or assist in the use of Qt Free Edition. 
-
-In no event shall Troll Tech AS be liable for any lost revenue or profits or
-other direct, indirect, special, incidental or consequential damages, even
-if Troll Tech has been advised of the possibility of such damages. 
+See /usr/share/common-licenses/GPL-2, or
+<http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version
+of the GNU General Public License.
 
-QT FREE EDITION IS PROVIDED AS IS WITH NO WARRANTY OF ANY KIND,
-INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE.
-      _______________________________________________________________

apt-inst/contrib/arfile.cc

@@ -111,7 +111,7 @@ bool ARArchive::LoadHeaders()
       else
       {
 	 unsigned int I = sizeof(Head.Name) - 1;
-	 for (; Head.Name[I] == ' '; I--);
+	 for (; Head.Name[I] == ' ' || Head.Name[I] == '/'; I--);
 	 Memb->Name = string(Head.Name,I+1);
       }
 

debian/changelog

@@ -1,9 +1,25 @@
 apt (0.7.19ubuntu3) jaunty; urgency=low
 
+  [ Michael Vogt ]
   * apt-pkg/contrib/strutl.cc:
     - fix TimeToStr i18n (LP: #289807)
+  * apt-inst/contrib/arfile.cc:
+    - support members ending with '/' as well (thanks to Michal Cihr,
+      closes: #500988)
+
+  [ Christian Perrier ]
+  * Translations:
+    - Galician updated. Closes: #509151
+    - Catalan updated. Closes: #509375
+    - Vietnamese updated. Closes: #509422
+    - Traditional Chinese added. Closes: #510664
 
- --
+  [ Eugene V. Lyubimkin ]  
+  * COPYING:
+    - Actualized. Removed obsolete Qt section, added GPLv2 clause.
+      (Closes: #440049, #509337)
+
+ -- Michael Vogt <mvo@debian.org>  Mon, 05 Jan 2009 08:59:20 +0100
 
 apt (0.7.19ubuntu2) jaunty; urgency=low
 
@@ -45,7 +61,6 @@ apt (0.7.19ubuntu2) jaunty; urgency=low
       (Closes: #438559)
     - Mentioned '/* ... */' comments. (Closes: #507601)
 
-
   [ Ian Weisser ]
   * /apt-pkg/deb/debsystem.cc:
     - add 'sudo' to the error message to "run 'dpkg --configure -a'"
@@ -75,7 +90,6 @@ apt (0.7.19) unstable; urgency=low
       is a request to install only one package and it is not installable.
       (Closes: #419521)
 
-
   [ Michael Vogt ]
   * doc/makefile:
     - add examples/apt-https-method-example.conf

po/ChangeLog

@@ -1,3 +1,19 @@
+2009-01-04  Tetralet  <tetralet@gmail.com>
+
+	* zh_TW.po: Added as 538t1u.
+
+2008-12-22  Clytie Siddall  <clytie@riverland.net.au>
+
+	* vi.po: updated to 539t.
+
+2008-12-22  Jordi Mallach  <jordi@debian.org>
+
+	* ca.po: updated to 539t.
+
+2008-12-19  Marcelino Villarino  <mvillarino@gmail.com>
+
+	* gl.po: updated to 539t.
+
 2008-12-12  Tapio Lehtonen  <tale@debian.org>
 
 	* fi.po: updated to 539t.

po/ca.po

@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.7.19\n"
+"Project-Id-Version: apt 0.7.20\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-11-13 08:00+0100\n"
+"PO-Revision-Date: 2008-12-21 20:24+0100\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -2925,6 +2925,28 @@ msgstr "No s'ha pogut aplicar el pedaç al fitxer"
 msgid "Connection closed prematurely"
 msgstr "La connexió s'ha tancat prematurament"
 
+#~ msgid ""
+#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
+#~ "Limit. Current value: %lu. (man 5 apt.conf)"
+#~ msgstr ""
+#~ "No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-"
+#~ "Limit. Valor actual: %lu. (man 5 apt.conf)"
+
+#~ msgid "Release file expired, ignoring %s (valid until %s)"
+#~ msgstr "El fitxer Release ha caducat, s'està ignorant %s (vàlid fins a %s)"
+
+#~ msgid "Conflicting distribution: %s (expected %s but got %s)"
+#~ msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)"
+
+#~ msgid "Unable to parse Release file %s"
+#~ msgstr "No es pot analitzar el fitxer Release %s"
+
+#~ msgid "No sections in Release file %s"
+#~ msgstr "No hi ha seccions al fitxer Release %s"
+
+#~ msgid "No Hash entry in Release file %s"
+#~ msgstr "No hi ha una entrada Hash al fitxer Release %s"
+
 #~ 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"

po/gl.po

@@ -1,18 +1,22 @@
+# translation of apt_po_gl.po to galician
 # Galician translation of apt
 # This file is put in the public domain.
-# Jacobo Tarrío <jtarrio@debian.org>, 2005, 2007, 2008.
 #
+# Jacobo Tarrío <jtarrio@debian.org>, 2005, 2007, 2008.
+# mvillarino <mvillarino@users.sourceforge.net>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt_po_gl\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-07-28 22:28+0100\n"
-"Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
-"Language-Team: Galician <proxecto@trasno.net>\n"
+"PO-Revision-Date: 2008-12-17 22:44+0100\n"
+"Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
+"Language-Team: galician <proxecto@trasno.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: cmdline/apt-cache.cc:143
 #, c-format
@@ -163,43 +167,6 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado o %s %s\n"
 
 #: cmdline/apt-cache.cc:1721
-#, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| "       apt-cache [options] add file1 [file2 ...]\n"
-#| "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| "   add - Add a package file to the source cache\n"
-#| "   gencaches - Build both the package and source cache\n"
-#| "   showpkg - Show some general information for a single package\n"
-#| "   showsrc - Show source records\n"
-#| "   stats - Show some basic statistics\n"
-#| "   dump - Show the entire file in a terse form\n"
-#| "   dumpavail - Print an available file to stdout\n"
-#| "   unmet - Show unmet dependencies\n"
-#| "   search - Search the package list for a regex pattern\n"
-#| "   show - Show a readable record for the package\n"
-#| "   depends - Show raw dependency information for a package\n"
-#| "   rdepends - Show reverse dependency information for a package\n"
-#| "   pkgnames - List the names of all packages\n"
-#| "   dotty - Generate package graphs for GraphViz\n"
-#| "   xvcg - Generate package graphs for xvcg\n"
-#| "   policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| "  -h   This help text.\n"
-#| "  -p=? The package cache.\n"
-#| "  -s=? The source cache.\n"
-#| "  -q   Disable progress indicator.\n"
-#| "  -i   Show only important deps for the unmet command.\n"
-#| "  -c=? Read this configuration file\n"
-#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -2110,9 +2077,8 @@ msgid "Error reading from server"
 msgstr "Erro ao ler do servidor"
 
 #: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
-#, fuzzy
 msgid "Failed to truncate file"
-msgstr "Non se puido gravar o ficheiro %s"
+msgstr "Non se puido truncar o ficheiro"
 
 #: methods/http.cc:1105
 msgid "Bad header data"
@@ -2137,7 +2103,7 @@ msgstr "Non se puido facer mmap de %lu bytes"
 
 #: apt-pkg/contrib/mmap.cc:213
 msgid "Dynamic MMap ran out of room"
-msgstr ""
+msgstr "O MMap Dinámico esgotou o espazo"
 
 #: apt-pkg/contrib/strutl.cc:1014
 #, c-format
@@ -2950,56 +2916,3 @@ msgstr "Non se puido parchear o ficheiro"
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "A conexión pechouse prematuramente"
-
-#~ 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 ""
-#~ "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."
-
-#~ msgid "Line %d too long (max %lu)"
-#~ msgstr "Liña %d longa de máis (máximo %lu)"
-
-#, fuzzy
-#~ msgid "Line %d too long (max %d)"
-#~ msgstr "Liña %d longa de máis (máximo %u)"
-
-#, fuzzy
-#~ msgid "Error occured while processing %s (NewFileDesc1)"
-#~ msgstr "Ocorreu un erro ao procesar %s (NewFileDesc1)"
-
-#, fuzzy
-#~ msgid "Error occured while processing %s (NewFileDesc2)"
-#~ msgstr "Ocorreu un erro ao procesar %s (NewFileDesc2)"
-
-#, fuzzy
-#~ msgid "Stored label: %s \n"
-#~ msgstr "Etiqueta armacenada: %s \n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
-#~ "i signatures\n"
-#~ msgstr ""
-#~ "Atopáronse %u índices de paquetes, %u índices de fontes, %u índices de "
-#~ "traducións e %u sinaturas\n"
-
-#~ msgid "openpty failed\n"
-#~ msgstr "Fallou a chamada a openpty\n"
-
-#~ msgid "File date has changed %s"
-#~ msgstr "A data do ficheiro cambiou %s"
-
-#~ msgid "Reading file list"
-#~ msgstr "A ler a lista de paquetes"
-
-#~ msgid "Could not execute "
-#~ msgstr "Non se puido executar "
-
-#~ msgid "Preparing for remove with config %s"
-#~ msgstr "A se preparar para a eliminación con config %s"
-
-#~ msgid "Removed with config %s"
-#~ msgstr "Eliminouse con config %s"

po/vi.po

@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: apt 0.7.14\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-09-05 17:03+0930\n"
+"PO-Revision-Date: 2008-12-22 19:04+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.7b3\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: cmdline/apt-cache.cc:143
 #, c-format
@@ -166,43 +166,6 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s cho %s được biên dịch trên %s %s\n"
 
 #: cmdline/apt-cache.cc:1721
-#, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| "       apt-cache [options] add file1 [file2 ...]\n"
-#| "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| "   add - Add a package file to the source cache\n"
-#| "   gencaches - Build both the package and source cache\n"
-#| "   showpkg - Show some general information for a single package\n"
-#| "   showsrc - Show source records\n"
-#| "   stats - Show some basic statistics\n"
-#| "   dump - Show the entire file in a terse form\n"
-#| "   dumpavail - Print an available file to stdout\n"
-#| "   unmet - Show unmet dependencies\n"
-#| "   search - Search the package list for a regex pattern\n"
-#| "   show - Show a readable record for the package\n"
-#| "   depends - Show raw dependency information for a package\n"
-#| "   rdepends - Show reverse dependency information for a package\n"
-#| "   pkgnames - List the names of all packages\n"
-#| "   dotty - Generate package graphs for GraphViz\n"
-#| "   xvcg - Generate package graphs for xvcg\n"
-#| "   policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| "  -h   This help text.\n"
-#| "  -p=? The package cache.\n"
-#| "  -s=? The source cache.\n"
-#| "  -q   Disable progress indicator.\n"
-#| "  -i   Show only important deps for the unmet command.\n"
-#| "  -c=? Read this configuration file\n"
-#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -240,7 +203,7 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
-"Cách sử dụng: apt-cache [tùy_chọn...] lệnh\n"
+"Sử dụng: apt-cache [tùy_chọn...] lệnh\n"
 "       apt-cache [tùy_chọn...] add tập_tin1 [tập_tin2 ...]\n"
 "       apt-cache [tùy_chọn...] showpkg gói1 [gói2 ...]\n"
 "       apt-cache [tùy_chọn...] showsrc gói1 [gói2 ...]\n"
@@ -280,7 +243,7 @@ msgstr ""
 "\t\t\tcho lệnh chưa thực hiện.\n"
 "  -c=? \t\tĐọc tập tin _cấu hình_ này\n"
 "  -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n"
-"Để tìm thông tin thêm thì bạn hãy xem hai trang « man » (hướng dẫn)\n"
+"Để tìm thông tin thêm, xem hai trang « man » (hướng dẫn)\n"
 "\t\t\tapt-cache(8) và apt.conf(5).\n"
 
 #: cmdline/apt-cdrom.cc:78
@@ -2138,9 +2101,8 @@ msgid "Error reading from server"
 msgstr "Gặp lỗi khi đọc từ máy phục vụ"
 
 #: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
-#, fuzzy
 msgid "Failed to truncate file"
-msgstr "Việc ghi tập tin %s bị lỗi"
+msgstr "Lỗi cắt ngắn tập tin"
 
 #: methods/http.cc:1105
 msgid "Bad header data"
@@ -2165,7 +2127,7 @@ msgstr "Không thể tạo mmap (ảnh xạ bộ nhớ) kích cỡ %lu byte"
 
 #: apt-pkg/contrib/mmap.cc:213
 msgid "Dynamic MMap ran out of room"
-msgstr ""
+msgstr "Hết chỗ tạo sơ đồ bộ nhớ động (Dynamic MMap)"
 
 #: apt-pkg/contrib/strutl.cc:1014
 #, c-format