From 195685f96ff84370722026c33b6f864b3746db28 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 23 Aug 2010 10:16:30 +0200 Subject: * po/pt_BR.po: - updated, thanks to Sergio Cipolla --- debian/changelog | 2 + po/pt_BR.po | 190 +++++++++++++++++++++++++------------------------------ 2 files changed, 89 insertions(+), 103 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3906c485..94eebdf2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ python-apt (0.7.97) UNRELEASED; urgency=low - add binding for the "dump()" method to configruation objects * apt/debfile.py: - fix crash in DscFile handling and add regression test + * po/pt_BR.po: + - updated, thanks to Sergio Cipolla -- Julian Andres Klode Fri, 23 Jul 2010 16:14:39 +0200 diff --git a/po/pt_BR.po b/po/pt_BR.po index acbd62ea..7f95b222 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-07-19 15:59+0200\n" -"PO-Revision-Date: 2006-10-21 01:31+0000\n" -"Last-Translator: Rafael Proença \n" +"PO-Revision-Date: 2010-08-19 17:13-0300\n" +"Last-Translator: Sérgio Cipolla \n" "Language-Team: Ubuntu-BR \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,75 +24,63 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Ubuntu.info.in:13 -#, fuzzy msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 9.10 'Karmic Koala'" #. Description #: ../data/templates/Ubuntu.info.in:31 -#, fuzzy msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "Cdrom com Ubuntu 4.10 'Warty Warthog'" +msgstr "CD-ROM com o Ubuntu 9.10 'Karmic Koala'" #. Description #: ../data/templates/Ubuntu.info.in:74 -#, fuzzy msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 9.04 'Jaunty Jackalope'" #. Description #: ../data/templates/Ubuntu.info.in:92 -#, fuzzy msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "Cdrom com Ubuntu 4.10 'Warty Warthog'" +msgstr "CD-ROM com o Ubuntu 9.04 'Jaunty Jackalope'" #. Description #: ../data/templates/Ubuntu.info.in:135 -#, fuzzy msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 8.10 'Intrepid Ibex'" #. Description #: ../data/templates/Ubuntu.info.in:153 -#, fuzzy msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "Cdrom com o Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "CD-ROM com o Ubuntu 8.10 'Intrepid Ibex'" #. Description #: ../data/templates/Ubuntu.info.in:197 -#, fuzzy msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 8.04 'Hardy Heron'" #. Description #: ../data/templates/Ubuntu.info.in:215 -#, fuzzy msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "Cdrom com o Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "CD-ROM com o Ubuntu 8.04 'Hardy Heron'" #. Description #: ../data/templates/Ubuntu.info.in:252 -#, fuzzy msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "Atualizações de segurança do Ubuntu 5.04" +msgstr "Ubuntu 7.10 'Gutsy Gibbon'" #. Description #: ../data/templates/Ubuntu.info.in:270 -#, fuzzy msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "Cdrom com o Ubuntu 5.10 'Breezy Badger'" +msgstr "CD-ROM com o Ubuntu 7.10 'Gutsy Gibbon'" #. Description #: ../data/templates/Ubuntu.info.in:305 -#, fuzzy msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "Atualizações de segurança do Ubuntu 5.04" +msgstr "Ubuntu 7.04 'Feisty Fawn'" #. Description #: ../data/templates/Ubuntu.info.in:323 -#, fuzzy msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "Cdrom com o Ubuntu 5.10 'Breezy Badger'" +msgstr "CD-ROM com o Ubuntu 7.04 'Feisty Fawn'" #. Description #: ../data/templates/Ubuntu.info.in:357 @@ -101,19 +89,18 @@ msgstr "Ubuntu 6.10 'Edgy Eft'" #. CompDescription #: ../data/templates/Ubuntu.info.in:362 -#, fuzzy msgid "Community-maintained" msgstr "Mantido pela comunidade" #. CompDescription #: ../data/templates/Ubuntu.info.in:368 msgid "Restricted software" -msgstr "Software restrito" +msgstr "Aplicativos restritos" #. Description #: ../data/templates/Ubuntu.info.in:375 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "Cdrom com Ubuntu 6.10 'Edgy Eft'" +msgstr "CD-ROM com o Ubuntu 6.10 'Edgy Eft'" #. Description #: ../data/templates/Ubuntu.info.in:409 @@ -122,51 +109,48 @@ msgstr "Ubuntu 6.06 LTS 'Dapper Drake'" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:412 -#, fuzzy msgid "Canonical-supported Open Source software" -msgstr "Programa de Código Aberto mantido pela Canonical" +msgstr "Aplicativo de Código Aberto suportado pela Canonical" #. CompDescription #: ../data/templates/Ubuntu.info.in:414 -#, fuzzy msgid "Community-maintained (universe)" -msgstr "Mantido pela Comunidade (Universe)" +msgstr "Mantido pela comunidade (universe)" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:415 -#, fuzzy msgid "Community-maintained Open Source software" -msgstr "Programa de Código Aberto mantido pela Comunidade" +msgstr "Aplicativo de Código Aberto mantido pela comunidade" #. CompDescription #: ../data/templates/Ubuntu.info.in:417 msgid "Non-free drivers" -msgstr "Drivers Não-livres" +msgstr "Drivers não-livres" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:418 msgid "Proprietary drivers for devices" -msgstr "Controladores proprietários para dispositivos" +msgstr "Drivers proprietários para dispositivos" #. CompDescription #: ../data/templates/Ubuntu.info.in:420 msgid "Restricted software (Multiverse)" -msgstr "Programas restritos (Multiverse)" +msgstr "Aplicativos restritos (multiverse)" #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:421 msgid "Software restricted by copyright or legal issues" -msgstr "Software restrito por copyright ou problemas legais" +msgstr "Aplicativos restritos por copyright ou questões legais" #. Description #: ../data/templates/Ubuntu.info.in:427 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "Cdrom com o Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "CD-ROM com o Ubuntu 6.06 LTS 'Dapper Drake'" #. Description #: ../data/templates/Ubuntu.info.in:439 msgid "Important security updates" -msgstr "Principais Atualizações de Segurança" +msgstr "Atualizações de segurança importantes" #. Description #: ../data/templates/Ubuntu.info.in:444 @@ -175,15 +159,13 @@ msgstr "Atualizações recomendadas" #. Description #: ../data/templates/Ubuntu.info.in:449 -#, fuzzy msgid "Pre-released updates" -msgstr "Atualizações sugeridas" +msgstr "Atualizações de pré-lançamento" #. Description #: ../data/templates/Ubuntu.info.in:454 -#, fuzzy msgid "Unsupported updates" -msgstr "Atualizações \"Backport\"" +msgstr "Atualizações não suportadas" #. Description #: ../data/templates/Ubuntu.info.in:461 @@ -193,7 +175,7 @@ msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description #: ../data/templates/Ubuntu.info.in:475 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "Cdrom com o Ubuntu 5.10 'Breezy Badger'" +msgstr "CD-ROM com o Ubuntu 5.10 'Breezy Badger'" #. Description #: ../data/templates/Ubuntu.info.in:487 @@ -218,12 +200,13 @@ msgstr "Ubuntu 5.04 'Hoary Hedgehog'" #. Description #: ../data/templates/Ubuntu.info.in:518 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" -msgstr "Cdrom com o Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "CD-ROM com o Ubuntu 5.04 'Hoary Hedgehog'" #. CompDescription -#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148 +#: ../data/templates/Ubuntu.info.in:521 +#: ../data/templates/Debian.info.in:148 msgid "Officially supported" -msgstr "Suportadas oficialmente" +msgstr "Suportados oficialmente" #. Description #: ../data/templates/Ubuntu.info.in:530 @@ -247,24 +230,23 @@ msgstr "Ubuntu 4.10 'Warty Warthog'" #. CompDescription #: ../data/templates/Ubuntu.info.in:552 -#, fuzzy msgid "Community-maintained (Universe)" -msgstr "Mantido pela comunidade (Universo)" +msgstr "Mantido pela comunidade (universe)" #. CompDescription #: ../data/templates/Ubuntu.info.in:554 msgid "Non-free (Multiverse)" -msgstr "Não-livres (Multiverso)" +msgstr "Não-livres (multiverse)" #. Description #: ../data/templates/Ubuntu.info.in:560 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "Cdrom com Ubuntu 4.10 'Warty Warthog'" +msgstr "CD-ROM com o Ubuntu 4.10 'Warty Warthog'" #. CompDescription #: ../data/templates/Ubuntu.info.in:563 msgid "No longer officially supported" -msgstr "Não é mais suportado oficialmente" +msgstr "Não mais suportado oficialmente" #. CompDescription #: ../data/templates/Ubuntu.info.in:565 @@ -294,27 +276,23 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description #: ../data/templates/Debian.info.in:8 -#, fuzzy msgid "Debian 6.0 'Squeeze' " -msgstr "Debian 3.1 \"Sarge\"" +msgstr "Debian 6.0 'Squeeze' " #. Description #: ../data/templates/Debian.info.in:33 -#, fuzzy msgid "Debian 5.0 'Lenny' " -msgstr "Debian 3.1 \"Sarge\"" +msgstr "Debian 5.0 'Lenny' " #. Description #: ../data/templates/Debian.info.in:58 -#, fuzzy msgid "Debian 4.0 'Etch'" -msgstr "Debian 3.1 \"Sarge\"" +msgstr "Debian 4.0 'Etch'" #. Description #: ../data/templates/Debian.info.in:83 -#, fuzzy msgid "Debian 3.1 'Sarge'" -msgstr "Debian 3.1 \"Sarge\"" +msgstr "Debian 3.1 'Sarge'" #. Description #: ../data/templates/Debian.info.in:94 @@ -323,47 +301,46 @@ msgstr "Atualizações sugeridas" #. Description #: ../data/templates/Debian.info.in:101 -#, fuzzy msgid "Security updates" -msgstr "Principais Atualizações de Segurança" +msgstr "Atualizações de segurança" #. Description #: ../data/templates/Debian.info.in:108 msgid "Debian current stable release" -msgstr "" +msgstr "Atual versão estável do Debian" #. Description #: ../data/templates/Debian.info.in:121 -#, fuzzy msgid "Debian testing" -msgstr "Debian \"Etch\" (testing)" +msgstr "Debian testing" #. Description #: ../data/templates/Debian.info.in:146 -#, fuzzy msgid "Debian 'Sid' (unstable)" -msgstr "Debian \"Sid\" (unstable)" +msgstr "Debian 'Sid' (unstable)" #. CompDescription #: ../data/templates/Debian.info.in:150 msgid "DFSG-compatible Software with Non-Free Dependencies" -msgstr "Programa compatível com a DFSG mas com dependências não-livres" +msgstr "Aplicativos compatíveis com a DFSG mas com dependências não-livres" #. CompDescription #: ../data/templates/Debian.info.in:152 msgid "Non-DFSG-compatible Software" -msgstr "Programas não compatíveis com a DFSG" +msgstr "Aplicativos não compatíveis com a DFSG" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:208 ../aptsources/distro.py:423 +#: ../aptsources/distro.py:208 +#: ../aptsources/distro.py:423 #, python-format msgid "Server for %s" -msgstr "Servidor no(a) %s" +msgstr "Servidor - %s" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:226 ../aptsources/distro.py:232 +#: ../aptsources/distro.py:226 +#: ../aptsources/distro.py:232 #: ../aptsources/distro.py:248 msgid "Main server" msgstr "Servidor principal" @@ -388,20 +365,20 @@ msgid "Details" msgstr "Detalhes" #: ../apt/progress/gtk2.py:367 -#, fuzzy msgid "Starting..." -msgstr "Configurações" +msgstr "Iniciando..." #: ../apt/progress/gtk2.py:373 msgid "Complete" -msgstr "" +msgstr "Completo" #: ../apt/package.py:301 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." -msgstr "" +msgstr "Unicode inválido na descrição de '%s' (%s). Por favor, relate o erro." -#: ../apt/package.py:937 ../apt/package.py:1043 +#: ../apt/package.py:937 +#: ../apt/package.py:1043 msgid "The list of changes is not available" msgstr "A lista de alterações não está disponível" @@ -413,88 +390,91 @@ msgid "" "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "until the changes become available or try again later." msgstr "" +"A lista de alterações ainda não está disponível.\n" +"\n" +"Por favor, utilize http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" +"até que as alterações estejam disponíveis ou tente novamente mais tarde." #: ../apt/package.py:1053 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -"Falha ao baixar a lista de mudanças. \n" -"Por favor verifique sua conexão internet." +"Falha ao baixar a lista de alterações. \n" +"Por favor verifique sua conexão com a Internet." #: ../apt/debfile.py:56 #, python-format msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "" +msgstr "Este não é um arquivo DEB válido, membro '%s' faltando" #: ../apt/debfile.py:81 #, python-format msgid "List of files for '%s'could not be read" -msgstr "" +msgstr "A lista de arquivos de '%s' não pôde ser lida" #: ../apt/debfile.py:149 #, python-format msgid "Dependency is not satisfiable: %s\n" -msgstr "" +msgstr "A dependência não é contentável: %s\n" #: ../apt/debfile.py:173 #, python-format msgid "Conflicts with the installed package '%s'" -msgstr "" +msgstr "Conflita com o pacote instalado '%s'" #: ../apt/debfile.py:319 #, python-format msgid "Wrong architecture '%s'" -msgstr "" +msgstr "Arquitetura incorreta '%s'" #. the deb is older than the installed #: ../apt/debfile.py:325 msgid "A later version is already installed" -msgstr "" +msgstr "Uma versão mais atual já está instalada" #: ../apt/debfile.py:345 msgid "Failed to satisfy all dependencies (broken cache)" -msgstr "" +msgstr "Falha na satisfação de todas as dependências (cache quebrado)" #: ../apt/debfile.py:376 -#, fuzzy, python-format +#, python-format msgid "Cannot install '%s'" -msgstr "Não foi possível instalar '%s'" +msgstr "Incapaz de instalar '%s'" #: ../apt/debfile.py:484 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" -msgstr "" +msgstr "Instalar Dependências-Construtivas para o pacote fonte '%s' que constrói %s\n" #: ../apt/debfile.py:494 -#, fuzzy msgid "An essential package would be removed" -msgstr "Um pacote essencial teria que ser removido" +msgstr "Um pacote essencial teria de ser removido" #: ../apt/progress/text.py:81 #, python-format msgid "%c%s... Done" -msgstr "" +msgstr "%c%s... Feito" #: ../apt/progress/text.py:118 msgid "Hit " -msgstr "" +msgstr "Atingido" #: ../apt/progress/text.py:126 msgid "Ign " -msgstr "" +msgstr "Ignorado" #: ../apt/progress/text.py:128 msgid "Err " -msgstr "" +msgstr "Erro" #: ../apt/progress/text.py:138 msgid "Get:" -msgstr "" +msgstr "Obter:" #: ../apt/progress/text.py:198 msgid " [Working]" -msgstr "" +msgstr " [Trabalhando]" #: ../apt/progress/text.py:208 #, python-format @@ -503,21 +483,25 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" +"Mudança de mídia: por favor, insira o disco de nome\n" +"'%s'\n" +"no drive '%s' e tecle Enter\n" #. Trick for getting a translation from apt #: ../apt/progress/text.py:216 #, python-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" +msgstr "Obtidos %sB em %s (%sB/s)\n" #: ../apt/progress/text.py:229 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" +msgstr "Por favor, forneça um nome para este disco, como 'Debian 2.1r1 Disco 1'" #: ../apt/progress/text.py:241 msgid "Please insert a Disc in the drive and press enter" -msgstr "" +msgstr "Por favor, insira um disco no drive e tecle Enter" #: ../apt/cache.py:96 msgid "Building data structures" -msgstr "" +msgstr "Construindo estruturas de dados" + -- cgit v1.2.3 From 4ed69e597c387b379629ea3dc40e54e6a8a78b8a Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 26 Aug 2010 12:17:17 +0200 Subject: * debian/control: - Adapt to new Python 3 handling (Closes: #593042) --- debian/changelog | 2 ++ debian/control | 15 +++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 94eebdf2..68789fce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ python-apt (0.7.97) UNRELEASED; urgency=low - Bind pkgAcquire::Item::StatTransientNetworkError (Closes: #589010) * doc/library/apt_pkg.rst: - Document Configuration.dump(). + * debian/control: + - Adapt to new Python 3 handling (Closes: #593042) [ Michael Vogt ] * python/configuration.cc: diff --git a/debian/control b/debian/control index a3decb78..ca293f40 100644 --- a/debian/control +++ b/debian/control @@ -4,16 +4,15 @@ Priority: standard Maintainer: APT Development Team Uploaders: Michael Vogt , Julian Andres Klode Standards-Version: 3.8.4 -XS-Python-Version: 2.5, 2.6, 3.1 +XS-Python-Version: >= 2.5 +X-Python3-Version: >= 3.1 Build-Depends: apt-utils, debhelper (>= 7.3.5), libapt-pkg-dev (>= 0.7.22~), - python2.5-dbg, - python2.5-dev, - python2.6-dev, - python2.6-dbg, - python3.1-dev, - python3.1-dbg, + python-all-dev, + python-all-dbg, + python3-all-dev (>= 3.1.2-6~), + python3-all-dbg (>= 3.1.2-6~), python-central (>= 0.5), python-distutils-extra (>= 2.0), python-sphinx (>= 0.5) @@ -25,7 +24,7 @@ Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} Recommends: lsb-release, iso-codes, python2.6 Breaks: debdelta (<< 0.28~), packagekit-backend-apt (<= 0.4.8-0ubuntu4) -Provides: ${python:Provides} +Provides: python3-apt, ${python:Provides} Suggests: python-apt-dbg, python-gtk2, python-vte, python-apt-doc XB-Python-Version: ${python:Versions} Description: Python interface to libapt-pkg -- cgit v1.2.3 From 32a6c32adb02ec4036ebc11890d795679ed0eadc Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 26 Aug 2010 12:19:10 +0200 Subject: Build-depend on APT >= 0.8 to get gzip compression enabled (optional, can be reverted for backports) --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 68789fce..380e66cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ python-apt (0.7.97) UNRELEASED; urgency=low - Document Configuration.dump(). * debian/control: - Adapt to new Python 3 handling (Closes: #593042) + - Build-depend on APT >= 0.8 to get gzip compression enabled (optional, + can be reverted for backports) [ Michael Vogt ] * python/configuration.cc: diff --git a/debian/control b/debian/control index ca293f40..2d3d1b70 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ XS-Python-Version: >= 2.5 X-Python3-Version: >= 3.1 Build-Depends: apt-utils, debhelper (>= 7.3.5), - libapt-pkg-dev (>= 0.7.22~), + libapt-pkg-dev (>= 0.8), python-all-dev, python-all-dbg, python3-all-dev (>= 3.1.2-6~), -- cgit v1.2.3 From 58675fd6d67c11fde570cac02031a7eecf9916d5 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 26 Aug 2010 12:23:09 +0200 Subject: * Merge translation updates: - pt_BR.po by Sérgio Cipolla (Closes: #593754) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 380e66cb..5669642b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,7 +22,7 @@ python-apt (0.7.97) UNRELEASED; urgency=low * apt/debfile.py: - fix crash in DscFile handling and add regression test * po/pt_BR.po: - - updated, thanks to Sergio Cipolla + - updated, thanks to Sergio Cipolla (Closes: #593754) -- Julian Andres Klode Fri, 23 Jul 2010 16:14:39 +0200 -- cgit v1.2.3 From a3d187201040910d662bc7d469d946034f4d3d75 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 26 Aug 2010 12:32:48 +0200 Subject: Set Standards-Version to 3.9.1 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5669642b..7190f63d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ python-apt (0.7.97) UNRELEASED; urgency=low - Adapt to new Python 3 handling (Closes: #593042) - Build-depend on APT >= 0.8 to get gzip compression enabled (optional, can be reverted for backports) + - Set Standards-Version to 3.9.1 [ Michael Vogt ] * python/configuration.cc: diff --git a/debian/control b/debian/control index 2d3d1b70..842f32fb 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: python Priority: standard Maintainer: APT Development Team Uploaders: Michael Vogt , Julian Andres Klode -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 XS-Python-Version: >= 2.5 X-Python3-Version: >= 3.1 Build-Depends: apt-utils, -- cgit v1.2.3 From 0b0ab7a7f24f2d95e68c1e94e27feef7bc0fd13c Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 26 Aug 2010 12:32:54 +0200 Subject: Upload to unstable --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7190f63d..068cf379 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.7.97) UNRELEASED; urgency=low +python-apt (0.7.97) unstable; urgency=low [ Julian Andres Klode ] * python/tag.cc: @@ -25,7 +25,7 @@ python-apt (0.7.97) UNRELEASED; urgency=low * po/pt_BR.po: - updated, thanks to Sergio Cipolla (Closes: #593754) - -- Julian Andres Klode Fri, 23 Jul 2010 16:14:39 +0200 + -- Julian Andres Klode Thu, 26 Aug 2010 12:32:54 +0200 python-apt (0.7.96.1) unstable; urgency=low -- cgit v1.2.3 From 1da80475cabf37da411aff8983d427773cfc0a80 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 26 Aug 2010 14:08:02 +0200 Subject: * tests/test_apt_cache.py: - Do not insert ".." into sys.path, fixes FTBFS --- debian/changelog | 7 +++++++ tests/test_apt_cache.py | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 068cf379..1c9598fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-apt (0.7.97.1) unstable; urgency=low + + * tests/test_apt_cache.py: + - Do not insert ".." into sys.path, fixes FTBFS + + -- Julian Andres Klode Thu, 26 Aug 2010 14:08:01 +0200 + python-apt (0.7.97) unstable; urgency=low [ Julian Andres Klode ] diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py index a43e92d2..81d64bc6 100644 --- a/tests/test_apt_cache.py +++ b/tests/test_apt_cache.py @@ -10,8 +10,9 @@ import os import tempfile import unittest +from test_all import get_library_dir import sys -sys.path.insert(0, "..") +sys.path.insert(0, get_library_dir()) import apt import apt_pkg -- cgit v1.2.3 From 8cd715add7f85fb67cc30e42449d83a2ef7cf0bd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 27 Aug 2010 11:22:47 +0200 Subject: * apt/debfile.py: - add missing init for _installed_conflicts (LP: #618597) --- apt/debfile.py | 1 + debian/changelog | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/apt/debfile.py b/apt/debfile.py index 33f0f04d..9bf27da3 100644 --- a/apt/debfile.py +++ b/apt/debfile.py @@ -598,6 +598,7 @@ class DscSrcPackage(DebPackage): self.filename = filename self._depends = [] self._conflicts = [] + self._installed_conflicts = set() self.pkgname = "" self.binaries = [] if self.filename is not None: diff --git a/debian/changelog b/debian/changelog index 1c9598fb..6f3ea91e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +python-apt (0.7.97.2) UNRELEASED; urgency=low + + [ Michael Vogt ] + * apt/debfile.py: + - add missing init for _installed_conflicts (LP: #618597) + + -- Michael Vogt Fri, 27 Aug 2010 11:22:23 +0200 + python-apt (0.7.97.1) unstable; urgency=low * tests/test_apt_cache.py: -- cgit v1.2.3 From e88fffd39adb23b6cfa35205e29741be37c4232f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 31 Aug 2010 17:07:16 +0200 Subject: python/cache.cc: revert docstring change --- python/cache.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/python/cache.cc b/python/cache.cc index e87d73d4..cd51fcc3 100644 --- a/python/cache.cc +++ b/python/cache.cc @@ -573,8 +573,9 @@ static PyGetSetDef PackageGetSet[] = { {"rev_depends_list",PackageGetRevDependsList,0, "An apt_pkg.DependencyList object of all reverse dependencies."}, {"provides_list",PackageGetProvidesList,0, - "Ignore it, it does nothing. You want to use\n" - "apt_pkg.Version.provides_list instead."}, + "A list of all packages providing this package. The list contains\n" + "tuples in the format (providesname, providesver, version)\n" + "where 'version' is an apt_pkg.Version object."}, {"selected_state",PackageGetSelectedState,0, "The state of the selection, which can be compared against the constants\n" "SELSTATE_DEINSTALL, SELSTATE_HOLD, SELSTATE_INSTALL, SELSTATE_PURGE,\n" -- cgit v1.2.3 From e381c072e22a8117f1310997a328dc0d4ffeab8d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 31 Aug 2010 17:13:59 +0200 Subject: debian/changelog: add missing changelog entry --- debian/changelog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5e16f349..616404e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ python-apt (0.7.97.2) UNRELEASED; urgency=low [ Michael Vogt ] + * python/acquire.cc: + - return long long when calling TotalNeeded(), FetchNeeded() and + PartialPresent() from pkgAcquire(). This follows the change + in libapt. * apt/debfile.py: - add missing init for _installed_conflicts (LP: #618597) * add "provides" property to the apt.Version objects -- cgit v1.2.3 From 33bbf9482fe486aab915768fc74609d303c1e1f9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 31 Aug 2010 17:19:27 +0200 Subject: tests/test_apt_cache.py: add test for provides_list --- tests/test_apt_cache.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py index 44b95cab..d6a2cbd4 100644 --- a/tests/test_apt_cache.py +++ b/tests/test_apt_cache.py @@ -62,7 +62,20 @@ class TestAptCache(unittest.TestCase): include_nonvirtual=True) self.assertTrue(len(l), 1) self.assertTrue("mail-transport-agent" in cache["postfix"].candidate.provides) - + + def test_low_level_pkg_provides(self): + # low level cache provides list of the pkg + cache = apt_pkg.Cache() + l = cache["mail-transport-agent"].provides_list + # arbitrary number, just needs to be higher enough + self.assertTrue(len(l), 5) + for (providesname, providesver, version) in l: + self.assertEqual(providesname, "mail-transport-agent") + if version.parent_pkg.name == "postfix": + break + else: + self.assertNotReached() + def test_dpkg_journal_dirty(self): # backup old value -- cgit v1.2.3 From b410a7e17e3a255127ef054b9a867354face49f3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 Sep 2010 10:54:12 +0200 Subject: fix a bunch of python3.1 releated test failures --- tests/test_apt_cache.py | 4 ++-- tests/test_aptsources.py | 4 ++-- tests/test_debfile.py | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py index e020b2e5..efa73a4f 100644 --- a/tests/test_apt_cache.py +++ b/tests/test_apt_cache.py @@ -106,10 +106,10 @@ class TestAptCache(unittest.TestCase): def test_apt_update(self): rootdir = "./data/tmp" if os.path.exists(rootdir): - shutil.rmtree(rootdir) + shutil.rmtree(rootdir) try: os.makedirs(os.path.join(rootdir, "var/lib/apt/lists/partial")) - except OSError, e: + except OSError: pass state_dir = os.path.join(rootdir, "var/lib/apt") lists_dir = os.path.join(rootdir, "var/lib/apt/lists") diff --git a/tests/test_aptsources.py b/tests/test_aptsources.py index 3ef20f64..e56761f3 100644 --- a/tests/test_aptsources.py +++ b/tests/test_aptsources.py @@ -18,8 +18,8 @@ class TestAptSources(unittest.TestCase): apt_pkg.config.set("APT::Architecture", "i386") apt_pkg.config.set("Dir::Etc", os.getcwd()) apt_pkg.config.set("Dir::Etc::sourceparts", "/xxx") - if os.path.exists("../build/data/templates"): - self.templates = os.path.abspath("../build/data/templates") + if os.path.exists("./build/data/templates"): + self.templates = os.path.abspath("./build/data/templates") else: self.templates = "/usr/share/python-apt/templates/" diff --git a/tests/test_debfile.py b/tests/test_debfile.py index 571c2ec9..759639c4 100644 --- a/tests/test_debfile.py +++ b/tests/test_debfile.py @@ -85,6 +85,11 @@ class TestDebfilee(unittest.TestCase): "Samuel Lidén Borell ") def testContent(self): + # no python-debian for python3 yet, so fail gracefully + try: + import debian + except ImportError: + return # normal deb = apt.debfile.DebPackage(cache=self.cache) deb.open(os.path.join("data", "test_debs", "gdebi-test11.deb")) -- cgit v1.2.3 From ec2fa33ed76e14e14d9c7d78f008147c6e10475c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 28 Sep 2010 16:18:38 +0200 Subject: releasing version 0.7.98 --- debian/changelog | 4 ++-- tests/test_aptsources.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d5a3e31f..b78a58af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.7.98) UNRELEASED; urgency=low +python-apt (0.7.98) unstable; urgency=low [ Michael Vogt ] * python/acquire.cc: @@ -38,7 +38,7 @@ python-apt (0.7.98) UNRELEASED; urgency=low * apt/debfile: - don't fail if we conflict with the pkgs we are reinstalling - -- Michael Vogt Fri, 27 Aug 2010 11:22:23 +0200 + -- Michael Vogt Tue, 28 Sep 2010 15:47:51 +0200 python-apt (0.7.97.1) unstable; urgency=low diff --git a/tests/test_aptsources.py b/tests/test_aptsources.py index e56761f3..331df935 100644 --- a/tests/test_aptsources.py +++ b/tests/test_aptsources.py @@ -20,6 +20,8 @@ class TestAptSources(unittest.TestCase): apt_pkg.config.set("Dir::Etc::sourceparts", "/xxx") if os.path.exists("./build/data/templates"): self.templates = os.path.abspath("./build/data/templates") + elif os.path.exists("../build/data/templates"): + self.templates = os.path.abspath("../build/data/templates") else: self.templates = "/usr/share/python-apt/templates/" -- cgit v1.2.3