diff options
| -rw-r--r-- | .cvsignore | 4 | ||||
| -rw-r--r-- | apt-pkg/pkgcachegen.cc | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/.cvsignore | 13 | ||||
| -rw-r--r-- | debian/changelog | 104 | ||||
| -rw-r--r-- | doc/.cvsignore | 14 | ||||
| -rw-r--r-- | doc/apt-get.8.xml | 2 | ||||
| -rw-r--r-- | doc/apt.ent | 7 | ||||
| -rw-r--r-- | doc/es/.cvsignore | 14 | ||||
| -rw-r--r-- | doc/fr/.cvsignore | 13 | ||||
| -rw-r--r-- | doc/pt_BR/.cvsignore | 3 | ||||
| -rw-r--r-- | po/ChangeLog | 12 | ||||
| -rw-r--r-- | po/bg.po | 58 | ||||
| -rw-r--r-- | po/fr.po | 2 | ||||
| -rw-r--r-- | po/nb.po | 11 | ||||
| -rw-r--r-- | po/zh_TW.po | 30 |
16 files changed, 126 insertions, 165 deletions
diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index f9bbb8298..000000000 --- a/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -autom4te.cache -aclocal.m4 -configure -build diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index f71547f39..397c19829 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -143,7 +143,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List, // don't add a new description if we have one for the given // md5 && language - for ( ; Desc.end() == false; LastDesc = &Desc->NextDesc, Desc++) + for ( ; Desc.end() == false; Desc++) if (MD5SumValue(Desc.md5()) == CurMd5 && Desc.LanguageCode() == List.DescriptionLanguage()) duplicate=true; diff --git a/configure.in b/configure.in index d8de01565..ed3109563 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.19ubuntu2") +AC_DEFINE_UNQUOTED(VERSION,"0.7.20.2ubuntu1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/.cvsignore b/debian/.cvsignore deleted file mode 100644 index d9f983686..000000000 --- a/debian/.cvsignore +++ /dev/null @@ -1,13 +0,0 @@ -copyright -apt -apt-doc -apt-utils -apt-utils.substvars -apt.substvars -files -libapt-pkg-dev -libapt-pkg-doc -shlibs.local -shlibs.local.apt -shlibs.local.apt-utils -*.debhelper diff --git a/debian/changelog b/debian/changelog index bfbe6be5c..a21c383e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,18 @@ -apt (0.7.19ubuntu3) jaunty; urgency=low +apt (0.7.20.2ubuntu1) jaunty; urgency=low + [ Christian Perrier ] + * Translations: + - bg.po. Closes: #513211 + - zh_TW.po. Closes: #513311 + - nb.po. Closes: #513843 + [ Michael Vogt ] + * merged from the debian-sid branch + * [ABI break] merge support for http redirects, thanks to + Jeff Licquia and Anthony Towns + * [ABI break] use int for the package IDs (thanks to Steve Cotton) * 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) * debian/apt.conf.autoremove: - readd "linux-image" (and friends) to the auto-remove blacklist @@ -22,34 +29,48 @@ apt (0.7.19ubuntu3) jaunty; urgency=low - add new strprintf() function to make i18n strings easier * apt-pkg/dev/debsystem.cc: - add missing apti18n.h header - * [ABI break] merge support for http redirects, thanks to - Jeff Licquia and Anthony Towns - * [ABI break] use int for the package IDs (thanks to Steve Cotton) + [ Dereck Wonnacott ] + * Clarify the --help for 'purge' (LP: #243948) + + [ Ian Weisser ] + * /apt-pkg/deb/debsystem.cc: + - add 'sudo' to the error message to "run 'dpkg --configure -a'" + (LP: #52697) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 16 Dec 2008 06:59:17 +0100 + + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 09 Feb 2009 14:21:05 +0100 + +apt (0.7.20.2) unstable; urgency=medium + + [ Eugene V. Lyubimkin ] + * Urgency set to medium due to RC bug fix. + * doc/apt.ent, apt-get.8.xml: + - Fix invalid XML entities. (Closes: #514402) + + -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Sat, 07 Feb 2009 16:48:21 +0200 + +apt (0.7.20.1) unstable; urgency=low + + [ Michael Vogt ] + * apt-pkg/pkgcachegen.cc: + - fix apt-cache search for localized description + (closes: #512110) + [ Christian Perrier ] * Translations: - - Galician updated. Closes: #509151 - - Catalan updated. Closes: #509375 - - Vietnamese updated. Closes: #509422 - - Traditional Chinese added. Closes: #510664 - - French corrected (remove awful use of first person) - - Finnish updated. Closes: #508449 + - fr.po: fix spelling error to "défectueux". Thanks to Thomas Péteul. - [ Eugene V. Lyubimkin ] - * COPYING: - - Actualized. Removed obsolete Qt section, added GPLv2 clause. - (Closes: #440049, #509337) + -- Michael Vogt <mvo@debian.org> Tue, 20 Jan 2009 09:35:05 +0100 - [ Dereck Wonnacott ] - * Clarify the --help for 'purge' (LP: #243948) +apt (0.7.20) unstable; urgency=low [ Eugene V. Lyubimkin ] - * doc/examples/sources.list: - - Removed obsolete commented non-us deb-src entry, replaced it with - 'deb-src security.debian.org' one. (Closes: #411298) - * apt-pkg/contrib/mmap.cc: - - Added instruction how to work around MMap error in MMap error message. - (Closes: #385674, 436028) + * debian/changelog: + - Fixed place of 'merged install-recommends and install-task branches' + from 0.6.46.1 to 0.7.0. (Closes: #439866) * buildlib/config.{sub,guess}: - Renewed. This fixes lintian errors. * doc/apt.conf.5.xml, debian/apt-transport-https: @@ -59,13 +80,36 @@ apt (0.7.19ubuntu3) jaunty; urgency=low - Mentioned 'APT::Periodic' and 'APT::Archives' groups of options. (Closes: #438559) - Mentioned '/* ... */' comments. (Closes: #507601) + * doc/examples/sources.list: + - Removed obsolete commented non-us deb-src entry, replaced it with + 'deb-src security.debian.org' one. (Closes: #411298) + * apt-pkg/contrib/mmap.cc: + - Added instruction how to work around MMap error in MMap error message. + (Closes: #385674, 436028) + * COPYING: + - Actualized. Removed obsolete Qt section, added GPLv2 clause. + (Closes: #440049, #509337) - [ Ian Weisser ] - * /apt-pkg/deb/debsystem.cc: - - add 'sudo' to the error message to "run 'dpkg --configure -a'" - (LP: #52697) + [ Michael Vogt ] + * add option to "apt-get build-dep" to mark the needed + build-dep packages as automatic installed. + This is controlled via the value of + APT::Get::Build-Dep-Automatic and is set "false" by default. + Thanks to Aaron Haviland, closes: #448743 + * apt-inst/contrib/arfile.cc: + - support members ending with '/' as well (thanks to Michal Cihr, + closes: #500988) - -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 16 Dec 2008 06:59:17 +0100 + [ Christian Perrier ] + * Translations: + - Finnish updated. Closes: #508449 + - Galician updated. Closes: #509151 + - Catalan updated. Closes: #509375 + - Vietnamese updated. Closes: #509422 + - Traditional Chinese added. Closes: #510664 + - French corrected (remove awful use of first person) + + -- Michael Vogt <mvo@debian.org> Mon, 05 Jan 2009 08:59:20 +0100 apt (0.7.19ubuntu1) jaunty; urgency=low diff --git a/doc/.cvsignore b/doc/.cvsignore deleted file mode 100644 index 94d80ad54..000000000 --- a/doc/.cvsignore +++ /dev/null @@ -1,14 +0,0 @@ -apt-cache.8 -apt-get.8 -apt-cdrom.8 -apt.conf.5 -sources.list.5 -apt-config.8 -apt-sortpkgs.1 -apt-ftparchive.1 -manpage.links -manpage.refs -manpage.log -apt_preferences.5 -apt-extracttemplates.1 -vendors.list.5 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 64c3a35e4..26bd0aa68 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -589,8 +589,8 @@ <title>CURRENT AUTHORS</title> <para> &apt-author.team; - &apt-qapage; </para> + &apt-qapage; </refsect1> &manbugs; </refentry> diff --git a/doc/apt.ent b/doc/apt.ent index 6594ba1b3..4cfc00069 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -179,6 +179,13 @@ </author> "> +<!ENTITY apt-author.moconnor " + <author> + <firstname>Mike</firstname> + <surname>O'Connor</surname> + </author> +"> + <!ENTITY apt-author.team " <author> <othername>APT team</othername> diff --git a/doc/es/.cvsignore b/doc/es/.cvsignore deleted file mode 100644 index ce363466a..000000000 --- a/doc/es/.cvsignore +++ /dev/null @@ -1,14 +0,0 @@ -apt-cache.es.8 -apt-get.es.8 -apt-cdrom.es.8 -apt.conf.es.5 -sources.list.es.5 -apt-config.es.8 -apt-sortpkgs.es.1 -apt-ftparchive.es.1 -manpage.links -manpage.refs -manpage.log -apt_preferences.es.5 -apt-extracttemplates.es.1 -vendors.list.es.5 diff --git a/doc/fr/.cvsignore b/doc/fr/.cvsignore deleted file mode 100644 index cfa89623e..000000000 --- a/doc/fr/.cvsignore +++ /dev/null @@ -1,13 +0,0 @@ -apt-cdrom.fr.8 -apt-config.fr.8 -apt-extracttemplates.fr.1 -apt-ftparchive.fr.1 -apt-sortpkgs.fr.1 -apt.conf.fr.5 -apt_preferences.fr.5 -manpage.links -manpage.refs -sources.list.fr.5 -apt-cache.fr.8 -apt-get.fr.8 -vendors.list.fr.5 diff --git a/doc/pt_BR/.cvsignore b/doc/pt_BR/.cvsignore deleted file mode 100644 index 8d11bcc88..000000000 --- a/doc/pt_BR/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -apt_preferences.pt_BR.5 -manpage.links -manpage.refs diff --git a/po/ChangeLog b/po/ChangeLog index 9a5a0016b..591f10b0a 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,15 @@ +2009-02-01 Hans Fredrik Nordhaug <hans@nordhaug.priv.no> + + * nb.po: updated to 539t. + +2009-01-27 Damyan Ivanov <dmn@debian.org> + + * bg.po: updated to 539t. + +2008-12-11 Christian Perrier <bubulle@debian.org> + + * fr.po: fix spelling error to "défectueux" + 2009-01-04 Tetralet <tetralet@gmail.com> * zh_TW.po: Added as 538t1u. @@ -1,18 +1,16 @@ -# translation of apt_po_bg.po to Bulgarian +# translation of apt-all.pot to Bulgarian # Bulgarian translation of apt. # Copyright (C) 2006, 2008 Free Software Foundation, Inc. # This file is distributed under the same license as the apt package. # # Yavor Doganov <yavor@doganov.org>, 2006. -# Damyan Ivanov <dmn@debian.org>, 2008. -# Damyan Ivanov <dam@modsoftsys.com>, 2008. -# Damyan Ivanov <dmn@debiian.org>, 2008. +# Damyan Ivanov <dmn@debian.org>, 2008, 2009. msgid "" msgstr "" -"Project-Id-Version: apt_po_bg\n" +"Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-11-12 22:07+0100\n" -"PO-Revision-Date: 2008-11-12 21:57+0200\n" +"PO-Revision-Date: 2009-01-27 12:41+0200\n" "Last-Translator: Damyan Ivanov <dmn@debian.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "MIME-Version: 1.0\n" @@ -169,43 +167,6 @@ msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s за %s компилиран на %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 GraphVis\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" @@ -264,7 +225,7 @@ msgstr "" " show - Показва запис за пакета\n" " depends - Показва необработена информация за зависимости на пакета\n" " rdepends - Показва информация за обратните зависимости на пакета\n" -" pkgnames - Списък с имената на всички пакети\n" +" pkgnames - Списък с имената на всички пакети, за които има информация\n" " dotty - Генериране на графики на пакети за GraphVis\n" " xvcg - Генериране на графики на пакети за xvcg\n" " policy - Показване на настройките на политиката\n" @@ -2969,12 +2930,3 @@ msgstr "Неуспех при закърпване на файла" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Връзката прекъсна преждевременно" - -#~ 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 "" -#~ "Тъй като сте указали единична операция, твърде е възможно пакета просто\n" -#~ "да не може да бъде инсталиран; в такъв случай би трябвало да се подаде\n" -#~ "доклад за грешка за този пакет." @@ -2541,7 +2541,7 @@ msgstr "" #: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "" -"Impossible de corriger les problèmes, des paquets défecteux sont en mode " +"Impossible de corriger les problèmes, des paquets défectueux sont en mode " "« garder en l'état »." #: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377 @@ -7,14 +7,14 @@ # Axel Bojer <axelb@skolelinux.no>, 2003-2004. # Klaus Ade Johnstad <klaus@skolelinux.no>, 2004. # Bjorn Steensrud <bjornst@powertech.no>, 2004. -# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2003, 2005-2008. +# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2003, 2005-2009. # msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-11-12 22:07+0100\n" -"PO-Revision-Date: 2008-11-17 02:07+0100\n" +"PO-Revision-Date: 2009-02-01 18:26+0100\n" "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n" "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.ui.no>\n" "MIME-Version: 1.0\n" @@ -2896,6 +2896,13 @@ msgid "Connection closed prematurely" msgstr "Forbindelsen ble uventet stengt" #~ msgid "" +#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-" +#~ "Limit. Current value: %lu. (man 5 apt.conf)" +#~ msgstr "" +#~ "Dynamisk MMap gikk tom for minne. k strrelsen p APT::Cache-Limit. " +#~ "Nvrende verdi: %lu. (man 5 apt.conf)" + +#~ 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." diff --git a/po/zh_TW.po b/po/zh_TW.po index 296e58a24..ce7ebc21d 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-11-12 22:07+0100\n" -"PO-Revision-Date: 2009-01-04 12:41+0800\n" +"PO-Revision-Date: 2009-01-28 10:41+0800\n" "Last-Translator: Tetralet <tetralet@gmail.com>\n" "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists." "debian.org>\n" @@ -1458,7 +1458,7 @@ msgstr "找不到雜湊元件！" #: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" -msgstr "在配置轉移資訊時失敗" +msgstr "在配置抽換資訊時失敗" #: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" @@ -1467,12 +1467,12 @@ msgstr "在 AddDiversion 發生了內部錯誤" #: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "試圖改寫轉移資訊，%s -> %s 和 %s/%s" +msgstr "試圖改寫抽換資訊，%s -> %s 和 %s/%s" #: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" -msgstr "重複加入轉移資訊 %s -> %s" +msgstr "重複加入抽換資訊 %s -> %s" #: apt-inst/filelist.cc:549 #, c-format @@ -1502,16 +1502,16 @@ msgstr "解開 %s 超過一次" #: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" -msgstr "路徑 %s 已被轉移" +msgstr "路徑 %s 已被抽換" #: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" -msgstr "此套件試圖寫至轉移後的目標 %s/%s" +msgstr "此套件試圖寫至抽換後的目標 %s/%s" #: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" -msgstr "要進行轉移的路徑過長" +msgstr "要進行抽換的路徑過長" #: apt-inst/extract.cc:240 #, c-format @@ -1610,21 +1610,21 @@ msgstr "內部錯誤，無法取得節點" #: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" -msgstr "讀取轉移檔 %sdiversions 失敗" +msgstr "讀取抽換檔 %sdiversions 失敗" #: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" -msgstr "轉移檔已損壞" +msgstr "抽換檔已損壞" #: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 #: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" -msgstr "在轉移檔中的這一行有誤：%s" +msgstr "在抽換檔中的這一行有誤：%s" #: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" -msgstr "內部錯誤：在新增轉移資料時發生錯誤" +msgstr "內部錯誤：在新增抽換資料時發生錯誤" #: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" @@ -2218,7 +2218,7 @@ msgstr "子程序 %s 傳回錯誤碼 (%u)" #: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" -msgstr "子程序 %s 不預期的結束" +msgstr "子程序 %s 不預期得結束" #: apt-pkg/contrib/fileutl.cc:503 #, c-format @@ -2443,7 +2443,7 @@ msgstr "無法修正問題，您保留 (hold) 了損毀的套件。" msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." -msgstr "有一些索引檔不能下載，它們可能被略過了，或是替而使用舊的索引檔。" +msgstr "有一些索引檔不能下載，它們可能被略過了，或是替而使用原有的索引檔。" #: apt-pkg/acquire.cc:59 #, c-format @@ -2716,7 +2716,7 @@ msgstr "找到了 %zu 個套件索引，%zu 個原始碼索引，%zu 個翻譯 #: apt-pkg/cdrom.cc:715 #, c-format msgid "Found label '%s'\n" -msgstr "發現標籤 '%s'\n" +msgstr "找到標籤 '%s'\n" #: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" @@ -2806,7 +2806,7 @@ msgstr "正在準備設定 %s" #: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format msgid "Processing triggers for %s" -msgstr "正在後續設定 %s" +msgstr "正在進行 %s 的觸發程式" #: apt-pkg/deb/dpkgpm.cc:617 #, c-format |