[apt-proxy-devel] r709 - in trunk: apt_proxy debian debian/po doc/po
Xavier Lüthi
xluthi at alioth.debian.org
Fri Dec 11 14:04:15 UTC 2009
Author: xluthi
Date: Fri Dec 11 14:04:13 2009
New Revision: 709
Log:
Result of svn merge for releases 1.9.36.{3,3+nmu1,3+nmu2,4}.
Added:
trunk/debian/config
- copied unchanged from r708, branches/1.9.36/debian/config
trunk/debian/pycompat
- copied unchanged from r708, branches/1.9.36/debian/pycompat
Deleted:
trunk/debian/lintian-overrides
trunk/debian/preinst
Modified:
trunk/apt_proxy/cache.py
trunk/debian/changelog
trunk/debian/compat
trunk/debian/control
trunk/debian/copyright
trunk/debian/dirs
trunk/debian/init.d
trunk/debian/install
trunk/debian/po/ca.po
trunk/debian/po/cs.po
trunk/debian/po/da.po
trunk/debian/po/de.po
trunk/debian/po/es.po
trunk/debian/po/fr.po
trunk/debian/po/ja.po
trunk/debian/po/nl.po
trunk/debian/po/pt.po
trunk/debian/po/pt_BR.po
trunk/debian/po/sv.po
trunk/debian/po/templates.pot
trunk/debian/po/vi.po
trunk/debian/postinst
trunk/debian/postrm
trunk/debian/prerm
trunk/debian/rules
trunk/debian/templates
trunk/doc/po/apt-proxy.pot
Modified: trunk/apt_proxy/cache.py
==============================================================================
--- trunk/apt_proxy/cache.py Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/apt_proxy/cache.py Fri Dec 11 14:04:13 2009 (r709)
@@ -532,7 +532,7 @@
FileType(r"(?:^|/)Packages.gz$", "text/plain", 1, decompressor=clients.GzUncompressClient),
FileType(r"(?:^|/)Packages.bz2$", "text/plain", 1, decompressor=clients.Bz2UncompressClient),
- FileType(r"(?:^|/)(?:Packages|Release(?:\.gpg)?|Sources|(?:Contents|Translation)-[a-z0-9]+)"
+ FileType(r"(?:^|/)(?:Packages|Release(?:\.gpg)?|Sources|(?:Contents|Translation)-[A-Za-z0-9_]+)"
r"(?:\.(?:gz|bz2))?$",
"text/plain", 1),
FileType(r"(?:^|/)(?:Packages|Sources|Contents-[a-z0-9]+)\.diff/Index$",
Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/debian/changelog Fri Dec 11 14:04:13 2009 (r709)
@@ -13,6 +13,59 @@
-- Chris Halls <halls at debian.org> Fri, 31 Aug 2007 18:09:07 +0100
+apt-proxy (1.9.36.4) unstable; urgency=low
+
+ * Fix a first bunch of lintian warnings:
+ + "set -e" added to all maintainer script to stop execution on error.
+ + unused lintian.overrides removed.
+ + debian/control:
+ - ${misc:Depends} added for binary package.
+ - remove -1 at python version on Build-Depends.
+ - Homepage tag added.
+ + debian/compat: debhelper compatibility set to 7 (no change needed).
+ + debian/postinst: remove absolute path before apt-proxy-v1tov2 (line 50).
+ + debian/postinst: deprecated chmod syntax updated( line 67).
+ + debian/templates: removed dot at end of note description + rewording.
+ + debian/init.d: Default-Stop runlevel 0 & 6 added.
+ + debian/config: added to handle debconf note (removed from postinst)
+ + debian/preinst: removed, code merged into debian/config.
+ + debian/pycompat: added and set to 2.
+ * debian/control: Homepage set to the alioth page of the project.
+ * Added myself to the uploader list.
+
+ -- Xavier Lüthi <xluthi at debian.org> Fri, 11 Dec 2009 11:31:02 +0100
+
+apt-proxy (1.9.36.3+nmu2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix name pattern to accept uppercase characters
+ Patch by Folkert van Heusden
+ Closes: 503923
+
+ -- Anibal Monsalve Salazar <anibal at debian.org> Sun, 22 Nov 2009 08:15:59 +1100
+
+apt-proxy (1.9.36.3+nmu1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Change regexp for translated package description files to accept '_'
+ (Closes: #484331). Patch by Yuri Kozlov <kozlov.y at gmail.com>.
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sat, 28 Jun 2008 18:31:31 +0000
+
+apt-proxy (1.9.36.3) unstable; urgency=low
+
+ * apt-proxy-import: Do not crash with verbose (-v) or debug (-d) options,
+ thanks Xavier Luthi for the patch (Closes: #476278)
+ * Add ftp.gnuab.org repository to available repositories, thanks Chris Lamb
+ (Closes: #416072)
+ * Update French translation, thanks Sylvain Archenault (Closes: #473878)
+ * Update Russian debconf templates, thanks Yuriy Talakan (Closes: #416344)
+ * Fix problems in debian/control found by Lintian:
+ - Move po-debconf to Build-Depends because it is needed during clean
+ - debhelper was declared in both Build-Depends and Build-Depends-Indep
+
+ -- Chris Halls <halls at debian.org> Tue, 29 Apr 2008 09:27:15 +0100
+
apt-proxy (1.9.36.2) unstable; urgency=low
* fix FTBFS: po4a fails. Thanks to Miguel Gea Milvaques for the partial
Modified: trunk/debian/compat
==============================================================================
--- trunk/debian/compat Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/debian/compat Fri Dec 11 14:04:13 2009 (r709)
@@ -1 +1 @@
-4
+7
Copied: trunk/debian/config (from r708, branches/1.9.36/debian/config)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/debian/config Fri Dec 11 14:04:13 2009 (r709, copy of r708, branches/1.9.36/debian/config)
@@ -0,0 +1,36 @@
+#! /bin/sh
+set -e
+
+OLDVERSION=$2
+
+# source debconf library
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+case "$1" in
+ configure)
+ if dpkg --compare-versions "$OLDVERSION" lt-nl 1.9; then
+ db_input high apt-proxy/upgrading-v2 || true
+ db_go
+ fi
+
+ if [ -e /etc/apt-proxy/apt-proxy-v2.conf ]; then
+ db_fset apt-proxy/upgrading-v2 had_v2_conf true
+ else
+ db_fset apt-proxy/upgrading-v2 had_v2_conf false
+ fi
+
+
+ ;;
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ ;;
+esac
+
+db_stop
+
+#DEBHELPER#
+
+exit 0
Modified: trunk/debian/control
==============================================================================
--- trunk/debian/control Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/debian/control Fri Dec 11 14:04:13 2009 (r709)
@@ -2,15 +2,16 @@
Section: admin
Priority: extra
Maintainer: Chris Halls <halls at debian.org>
-Uploaders: Otavio Salvador <otavio at debian.org>
-Standards-Version: 3.7.2
+Uploaders: Otavio Salvador <otavio at debian.org>, Xavier Lüthi <xluthi at debian.org>
+Standards-Version: 3.8.3
+Homepage: http://alioth.debian.org/projects/apt-proxy/
XS-Python-Version: current
-Build-Depends: debhelper
-Build-Depends-Indep: debhelper (>= 4.1.13), po-debconf, help2man, python-twisted-web (>= 0.6), python (>= 2.3.5-1), python-apt, po4a (>= 0.18.1), python-central (>= 0.5)
+Build-Depends: debhelper (>= 7), po-debconf
+Build-Depends-Indep: help2man, python-twisted-web (>= 0.6), python (>= 2.3.5), python-apt, po4a (>= 0.18.1), python-central (>= 0.5)
Package: apt-proxy
Architecture: all
-Depends: debconf (>= 0.5.00) | debconf-2.0, ${python:Depends}, python-twisted-web (>= 0.6), python-apt (>= 0.5.8), bzip2, logrotate, adduser
+Depends: ${misc:Depends},debconf (>= 0.5.00) | debconf-2.0, ${python:Depends}, python-twisted-web (>= 0.6), python-apt (>= 0.5.8), bzip2, logrotate, adduser
Conflicts: apt-proxy-v2 (<= 1.9.5)
Replaces: apt-proxy-v2 (<= 1.9.5)
Suggests: rsync
@@ -26,9 +27,6 @@
is configurable. You can also import the contents of
your apt cache into the archive using apt-proxy-import.
.
- For more information, see the apt-proxy homepage at
- http://apt-proxy.sourceforge.net
- .
The suggested packages are needed for the following
features: rsync for rsyncd backends, and
dpkg-dev for apt-proxy-import.
Modified: trunk/debian/copyright
==============================================================================
--- trunk/debian/copyright Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/debian/copyright Fri Dec 11 14:04:13 2009 (r709)
@@ -1,12 +1,32 @@
This is the Debian GNU/Linux packaged version of apt-proxy
-Version 2 was written by Manuel Estrada Sainz. The original version was by
-Rusty Russel. The package is maintained by Chris Halls
+Upstream Authors:
+ Manuel Estrada Sainz <ranty at debian.org>
+ Chris Halls <halls at debian.org>
The project homepage is at
- http://sourceforge.net/projects/apt-proxy
+ http://alioth.debian.org/projects/apt-proxy
-This software is released under the terms of the GNU General Public License.
+Files: *
+Copyright: © 2002 Manuel Estrada Sainz <ranty at debian.org>
+ © 2002-2008 Chris Halls <halls at debian.org>
+License: LGPL-2.1
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of version 2.1 of the GNU Lesser
+ General Public License as published by the Free Software
+ Foundation.
+
+Files: debian/*
+Copyright: © 2002-2005 Otavio Salvador <otavio at debian.org>
+ © 2002-2008 Chris Halls <halls at debian.org>
+ © 2009 Xavier Lüthi <xluthi at debian.org>
+License: GPL-2+
+ The Debian packaging is licensed under the terms of the GNU
+ General Public License as published by the Free Software
+ Fundation; either version 2 of the License, or (at your option)
+ any later version.
On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL.
+version 2 can be found in `/usr/share/common-licenses/GPL-2'. The
+complete text of the GNU Lesser General Public License version 2.1 can
+be found in `/usr/share/common-licenses/LGPL-2.1'.
Modified: trunk/debian/dirs
==============================================================================
--- trunk/debian/dirs Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/debian/dirs Fri Dec 11 14:04:13 2009 (r709)
@@ -1,7 +1,6 @@
etc/default
etc/init.d
usr/share/doc/apt-proxy
-usr/share/lintian/overrides/apt-proxy/
usr/sbin
var/cache/apt-proxy
var/lib/apt-proxy
Modified: trunk/debian/init.d
==============================================================================
--- trunk/debian/init.d Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/debian/init.d Fri Dec 11 14:04:13 2009 (r709)
@@ -4,7 +4,7 @@
# Required-Start: $remote_fs
# Required-Stop: $remote_fs
# Default-Start: 2 3 4 5
-# Default-Stop: 1
+# Default-Stop: 0 1 6
# Short-Description: Debian archive proxy and partial mirror builder
### END INIT INFO
Modified: trunk/debian/install
==============================================================================
--- trunk/debian/install Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/debian/install Fri Dec 11 14:04:13 2009 (r709)
@@ -4,4 +4,3 @@
bin/apt-proxy-v1tov2 usr/sbin
apt_proxy/*.py usr/lib/python2.3/site-packages/apt_proxy
apt_proxy/twisted_compat/*.py usr/lib/python2.3/site-packages/apt_proxy/twisted_compat
-debian/lintian-overrides usr/share/lintian/overrides/apt-proxy/
\ No newline at end of file
Modified: trunk/debian/po/ca.po
==============================================================================
--- trunk/debian/po/ca.po Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/debian/po/ca.po Fri Dec 11 14:04:13 2009 (r709)
@@ -14,8 +14,8 @@
msgid ""
msgstr ""
"Project-Id-Version: ca\n"
-"Report-Msgid-Bugs-To: halls at debian.org\n"
-"POT-Creation-Date: 2006-08-14 12:59+0100\n"
+"Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
+"POT-Creation-Date: 2009-12-08 22:51+0100\n"
"PO-Revision-Date: 2005-10-16 13:41+0200\n"
"Last-Translator: Miguel Gea Milvaques <debian at miguelgea.com>\n"
"Language-Team: catalan <dl10n-catalan at lists.debian.org>\n"
@@ -27,7 +27,7 @@
#. Type: note
#. Description
#: ../templates:1001
-msgid "Upgrading from pre-v1.9 packages."
+msgid "Upgrading from pre-v1.9 packages"
msgstr "Actualitzant des del paquet pre-v1.9."
#. Type: note
@@ -52,10 +52,17 @@
#. Type: note
#. Description
#: ../templates:1001
-msgid ""
-"I will build /etc/apt-proxy/apt-proxy-v2.conf based on your old settings if "
-"you didn't already have such file. In any case, a backup file will be "
-"written to /etc/apt-proxy/apt-proxy-v2.conf.backup"
+#, fuzzy
+#| msgid ""
+#| "I will build /etc/apt-proxy/apt-proxy-v2.conf based on your old settings "
+#| "if you didn't already have such file. In any case, a backup file will be "
+#| "written to /etc/apt-proxy/apt-proxy-v2.conf.backup"
+msgid ""
+"The file /etc/apt-proxy/apt-proxy-v2.conf will be built based on your old "
+"settings if you didn't already have such file. In any case, a backup file "
+"will be written to /etc/apt-proxy/apt-proxy-v2.conf.backup. In case of "
+"issue, the upgrading script dumps some warnings to /var/log/apt-proxy-v1tov2."
+"log. You should read those warnings and revise your configuration if needed."
msgstr ""
"Es construirà /etc/apt-proxy/apt-proxy-v2.conf basant-se en els parà metres "
"antics si no teniu encara aquest fitxer. En aquest cas, es farà una còpia de "
@@ -69,28 +76,23 @@
msgstr ""
"Hi ha altres qüestions documentades a /usr/share/doc/apt-proxy/UPGRADING"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "Upgrading issues"
-msgstr "Questions d'actualització"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The upgrading script dumped some warnings and they have been mailed to "
-"root at localhost."
-msgstr ""
-"El guió d'actualització ha volcat alguns avisos i s'enviaran per correu "
-"aroot at localhost."
+#~ msgid "Upgrading issues"
+#~ msgstr "Questions d'actualització"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
-"revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
-msgstr ""
-"HaurÃeu de llegir aquestos avisos i /usr/share/doc/apt-proxy/UPGRADING i "
-"revisar la vostra configuració (/etc/apt-proxy/apt-proxy-v2.conf)"
+#~ msgid ""
+#~ "The upgrading script dumped some warnings and they have been mailed to "
+#~ "root at localhost."
+#~ msgstr ""
+#~ "El guió d'actualització ha volcat alguns avisos i s'enviaran per correu "
+#~ "aroot at localhost."
+
+#, fuzzy
+#~| msgid ""
+#~| "You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING "
+#~| "and revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
+#~ msgid ""
+#~ "You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
+#~ "revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)."
+#~ msgstr ""
+#~ "HaurÃeu de llegir aquestos avisos i /usr/share/doc/apt-proxy/UPGRADING i "
+#~ "revisar la vostra configuració (/etc/apt-proxy/apt-proxy-v2.conf)"
Modified: trunk/debian/po/cs.po
==============================================================================
--- trunk/debian/po/cs.po Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/debian/po/cs.po Fri Dec 11 14:04:13 2009 (r709)
@@ -14,8 +14,8 @@
msgid ""
msgstr ""
"Project-Id-Version: apt-proxy\n"
-"Report-Msgid-Bugs-To: halls at debian.org\n"
-"POT-Creation-Date: 2006-08-14 12:59+0100\n"
+"Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
+"POT-Creation-Date: 2009-12-08 22:51+0100\n"
"PO-Revision-Date: 2005-10-23 11:25+0200\n"
"Last-Translator: Jan Outrata <outrataj at upcase.inf.upol.cz>\n"
"Language-Team: Czech <debian-l10n-czech at debian.org>\n"
@@ -26,7 +26,7 @@
#. Type: note
#. Description
#: ../templates:1001
-msgid "Upgrading from pre-v1.9 packages."
+msgid "Upgrading from pre-v1.9 packages"
msgstr "Aktualizace z pre-v1.9 balíèkù."
#. Type: note
@@ -49,10 +49,17 @@
#. Type: note
#. Description
#: ../templates:1001
-msgid ""
-"I will build /etc/apt-proxy/apt-proxy-v2.conf based on your old settings if "
-"you didn't already have such file. In any case, a backup file will be "
-"written to /etc/apt-proxy/apt-proxy-v2.conf.backup"
+#, fuzzy
+#| msgid ""
+#| "I will build /etc/apt-proxy/apt-proxy-v2.conf based on your old settings "
+#| "if you didn't already have such file. In any case, a backup file will be "
+#| "written to /etc/apt-proxy/apt-proxy-v2.conf.backup"
+msgid ""
+"The file /etc/apt-proxy/apt-proxy-v2.conf will be built based on your old "
+"settings if you didn't already have such file. In any case, a backup file "
+"will be written to /etc/apt-proxy/apt-proxy-v2.conf.backup. In case of "
+"issue, the upgrading script dumps some warnings to /var/log/apt-proxy-v1tov2."
+"log. You should read those warnings and revise your configuration if needed."
msgstr ""
"Vytvoøím /etc/apt-proxy/apt-proxy-v2.conf na základì va¹ich starých "
"nastaveních, pokud ji¾ takový soubor nemáte. V ka¾dém pøípadì bude zapsán "
@@ -66,28 +73,23 @@
msgstr ""
"V /usr/share/doc/apt-proxy/UPGRADING jsou dokumentovány je¹tì dal¹í problémy."
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "Upgrading issues"
-msgstr "Problémy aktualizace"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The upgrading script dumped some warnings and they have been mailed to "
-"root at localhost."
-msgstr ""
-"Aktualizaèní skript vyprodukoval nìjaká varování, která byla zaslána mailem "
-"na root at localhost."
+#~ msgid "Upgrading issues"
+#~ msgstr "Problémy aktualizace"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
-"revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
-msgstr ""
-"Mìli byste si tato varování a /usr/share/doc/apt-proxy/UPGRADING pøeèíst a "
-"zkontrolovat va¹i konfiguraci (/etc/apt-proxy/apt-proxy-v2.conf)"
+#~ msgid ""
+#~ "The upgrading script dumped some warnings and they have been mailed to "
+#~ "root at localhost."
+#~ msgstr ""
+#~ "Aktualizaèní skript vyprodukoval nìjaká varování, která byla zaslána "
+#~ "mailem na root at localhost."
+
+#, fuzzy
+#~| msgid ""
+#~| "You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING "
+#~| "and revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
+#~ msgid ""
+#~ "You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
+#~ "revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)."
+#~ msgstr ""
+#~ "Mìli byste si tato varování a /usr/share/doc/apt-proxy/UPGRADING pøeèíst "
+#~ "a zkontrolovat va¹i konfiguraci (/etc/apt-proxy/apt-proxy-v2.conf)"
Modified: trunk/debian/po/da.po
==============================================================================
--- trunk/debian/po/da.po Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/debian/po/da.po Fri Dec 11 14:04:13 2009 (r709)
@@ -14,8 +14,8 @@
msgid ""
msgstr ""
"Project-Id-Version: apt-proxy 1.9.18\n"
-"Report-Msgid-Bugs-To: halls at debian.org\n"
-"POT-Creation-Date: 2006-08-14 12:59+0100\n"
+"Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
+"POT-Creation-Date: 2009-12-08 22:51+0100\n"
"PO-Revision-Date: 2005-11-21 07:09+0200\n"
"Last-Translator: Morten Brix Pedersen <morten at wtf.dk>\n"
"Language-Team: Danish <dansk at klid.dk>\n"
@@ -26,8 +26,8 @@
#. Type: note
#. Description
#: ../templates:1001
-msgid "Upgrading from pre-v1.9 packages."
-msgstr "Opgraderer fra præ-v1.9 pakker."
+msgid "Upgrading from pre-v1.9 packages"
+msgstr "Opgraderer fra præ-v1.9 pakker"
#. Type: note
#. Description
@@ -51,10 +51,17 @@
#. Type: note
#. Description
#: ../templates:1001
-msgid ""
-"I will build /etc/apt-proxy/apt-proxy-v2.conf based on your old settings if "
-"you didn't already have such file. In any case, a backup file will be "
-"written to /etc/apt-proxy/apt-proxy-v2.conf.backup"
+#, fuzzy
+#| msgid ""
+#| "I will build /etc/apt-proxy/apt-proxy-v2.conf based on your old settings "
+#| "if you didn't already have such file. In any case, a backup file will be "
+#| "written to /etc/apt-proxy/apt-proxy-v2.conf.backup"
+msgid ""
+"The file /etc/apt-proxy/apt-proxy-v2.conf will be built based on your old "
+"settings if you didn't already have such file. In any case, a backup file "
+"will be written to /etc/apt-proxy/apt-proxy-v2.conf.backup. In case of "
+"issue, the upgrading script dumps some warnings to /var/log/apt-proxy-v1tov2."
+"log. You should read those warnings and revise your configuration if needed."
msgstr ""
"Jeg vil bygge /etc/apt-proxy/apt-proxy-v2.conf baseret på dine gamle "
"indstillinger hvis du ikke allerede har en sådan fil. I hvert tilfælde, vil "
@@ -69,28 +76,23 @@
"Der er også andre ting du skal være opmærksom på, se /usr/share/doc/apt-"
"proxy/UPGRADING"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "Upgrading issues"
-msgstr "Opgraderingsproblemer"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The upgrading script dumped some warnings and they have been mailed to "
-"root at localhost."
-msgstr ""
-"Opgraderingsskriptet havde nogle advarsler, og de er blevet sendt med post "
-"til root at localhost."
+#~ msgid "Upgrading issues"
+#~ msgstr "Opgraderingsproblemer"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
-"revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
-msgstr ""
-"Du bør læse disse advarsler og /usr/share/doc/apt-proxy/UPGRADING, og rette "
-"din opsætningsfil til (/etc/apt-proxy/apt-proxy-v2.conf)"
+#~ msgid ""
+#~ "The upgrading script dumped some warnings and they have been mailed to "
+#~ "root at localhost."
+#~ msgstr ""
+#~ "Opgraderingsskriptet havde nogle advarsler, og de er blevet sendt med "
+#~ "post til root at localhost."
+
+#, fuzzy
+#~| msgid ""
+#~| "You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING "
+#~| "and revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
+#~ msgid ""
+#~ "You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
+#~ "revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)."
+#~ msgstr ""
+#~ "Du bør læse disse advarsler og /usr/share/doc/apt-proxy/UPGRADING, og "
+#~ "rette din opsætningsfil til (/etc/apt-proxy/apt-proxy-v2.conf)"
Modified: trunk/debian/po/de.po
==============================================================================
--- trunk/debian/po/de.po Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/debian/po/de.po Fri Dec 11 14:04:13 2009 (r709)
@@ -14,8 +14,8 @@
msgid ""
msgstr ""
"Project-Id-Version: apt-proxy 1.9.32\n"
-"Report-Msgid-Bugs-To: halls at debian.org\n"
-"POT-Creation-Date: 2006-08-14 12:59+0100\n"
+"Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
+"POT-Creation-Date: 2009-12-08 22:51+0100\n"
"PO-Revision-Date: 2006-01-23 18:15+0100\n"
"Last-Translator: Johannes Starosta <feedback-an-johannes at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -26,8 +26,8 @@
#. Type: note
#. Description
#: ../templates:1001
-msgid "Upgrading from pre-v1.9 packages."
-msgstr "Aktualisierung eines Pakets in einer Version vor 1.9."
+msgid "Upgrading from pre-v1.9 packages"
+msgstr "Aktualisierung eines Pakets in einer Version vor 1.9"
#. Type: note
#. Description
@@ -52,10 +52,17 @@
#. Type: note
#. Description
#: ../templates:1001
-msgid ""
-"I will build /etc/apt-proxy/apt-proxy-v2.conf based on your old settings if "
-"you didn't already have such file. In any case, a backup file will be "
-"written to /etc/apt-proxy/apt-proxy-v2.conf.backup"
+#, fuzzy
+#| msgid ""
+#| "I will build /etc/apt-proxy/apt-proxy-v2.conf based on your old settings "
+#| "if you didn't already have such file. In any case, a backup file will be "
+#| "written to /etc/apt-proxy/apt-proxy-v2.conf.backup"
+msgid ""
+"The file /etc/apt-proxy/apt-proxy-v2.conf will be built based on your old "
+"settings if you didn't already have such file. In any case, a backup file "
+"will be written to /etc/apt-proxy/apt-proxy-v2.conf.backup. In case of "
+"issue, the upgrading script dumps some warnings to /var/log/apt-proxy-v1tov2."
+"log. You should read those warnings and revise your configuration if needed."
msgstr ""
"Die Datei /etc/apt-proxy/apt-proxy-v2.conf wird aufgrund Ihrer alten "
"Einstellungen erstellt, falls diese Datei nicht bereits vorhanden ist. Es "
@@ -71,29 +78,24 @@
"Ein paar andere Probleme werden in /usr/share/doc/apt-proxy/UPGRADING "
"beschrieben."
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "Upgrading issues"
-msgstr "Probleme bei der Aktualisierung"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The upgrading script dumped some warnings and they have been mailed to "
-"root at localhost."
-msgstr ""
-"Die Warnungen des Aktualisierungsskripts wurden per E-Mail an "
-"\"root at localhost\" geschickt."
+#~ msgid "Upgrading issues"
+#~ msgstr "Probleme bei der Aktualisierung"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
-"revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
-msgstr ""
-"Sie sollten diese Fehlermeldungen und /usr/share/doc/apt-proxy/UPGRADING "
-"lesen und Ihre Konfigurationsdatei (/etc/apt-proxy/apt-proxy-v2.conf) "
-"nochmal überprüfen."
+#~ msgid ""
+#~ "The upgrading script dumped some warnings and they have been mailed to "
+#~ "root at localhost."
+#~ msgstr ""
+#~ "Die Warnungen des Aktualisierungsskripts wurden per E-Mail an "
+#~ "\"root at localhost\" geschickt."
+
+#, fuzzy
+#~| msgid ""
+#~| "You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING "
+#~| "and revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
+#~ msgid ""
+#~ "You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
+#~ "revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)."
+#~ msgstr ""
+#~ "Sie sollten diese Fehlermeldungen und /usr/share/doc/apt-proxy/UPGRADING "
+#~ "lesen und Ihre Konfigurationsdatei (/etc/apt-proxy/apt-proxy-v2.conf) "
+#~ "nochmal überprüfen."
Modified: trunk/debian/po/es.po
==============================================================================
--- trunk/debian/po/es.po Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/debian/po/es.po Fri Dec 11 14:04:13 2009 (r709)
@@ -27,8 +27,8 @@
msgid ""
msgstr ""
"Project-Id-Version: apt-proxy\n"
-"Report-Msgid-Bugs-To: halls at debian.org\n"
-"POT-Creation-Date: 2006-08-14 12:59+0100\n"
+"Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
+"POT-Creation-Date: 2009-12-08 22:51+0100\n"
"PO-Revision-Date: 2005-10-04 17:40+0100\n"
"Last-Translator: César Gómez MartÃn <cesar.gomez at gmail.com>\n"
"Language-Team: Debian l10n spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -42,8 +42,8 @@
#. Type: note
#. Description
#: ../templates:1001
-msgid "Upgrading from pre-v1.9 packages."
-msgstr "Actualizando a partir de los paquetes pre-v1.9."
+msgid "Upgrading from pre-v1.9 packages"
+msgstr "Actualizando a partir de los paquetes pre-v1.9"
#. Type: note
#. Description
@@ -70,9 +70,11 @@
#: ../templates:1001
#, fuzzy
msgid ""
-"I will build /etc/apt-proxy/apt-proxy-v2.conf based on your old settings if "
-"you didn't already have such file. In any case, a backup file will be "
-"written to /etc/apt-proxy/apt-proxy-v2.conf.backup"
+"The file /etc/apt-proxy/apt-proxy-v2.conf will be built based on your old "
+"settings if you didn't already have such file. In any case, a backup file "
+"will be written to /etc/apt-proxy/apt-proxy-v2.conf.backup. In case of "
+"issue, the upgrading script dumps some warnings to /var/log/apt-proxy-v1tov2."
+"log. You should read those warnings and revise your configuration if needed."
msgstr ""
"Si aun no lo tiene, se construirá el fichero /etc/apt-proxy/apt-proxy-v2."
"conf en base a sus antiguas configuraciones. En cualquier caso, se guardará "
@@ -87,28 +89,24 @@
msgstr ""
"También hay otros temas documentados en /usr/share/doc/apt-proxy/UPGRADING"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "Upgrading issues"
-msgstr "Cuestiones sobre la actualización"
+#~ msgid "Upgrading issues"
+#~ msgstr "Cuestiones sobre la actualización"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The upgrading script dumped some warnings and they have been mailed to "
-"root at localhost."
-msgstr ""
-"El guión de actualización desechó algunas advertencias que se han enviado a "
-"la dirección root at localhost."
+#~ msgid ""
+#~ "The upgrading script dumped some warnings and they have been mailed to "
+#~ "root at localhost."
+#~ msgstr ""
+#~ "El guión de actualización desechó algunas advertencias que se han enviado "
+#~ "a la dirección root at localhost."
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
-"revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
-msgstr ""
-"DeberÃa leer esas advertencias y /usr/share/doc/apt-proxy/UPGRADING. También "
-"deberÃa revisar su configuración (/etc/apt-proxy/apt-proxy-v2.conf)."
+#, fuzzy
+#~| msgid ""
+#~| "You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING "
+#~| "and revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
+#~ msgid ""
+#~ "You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
+#~ "revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)."
+#~ msgstr ""
+#~ "DeberÃa leer esas advertencias y /usr/share/doc/apt-proxy/UPGRADING. "
+#~ "También deberÃa revisar su configuración (/etc/apt-proxy/apt-proxy-v2."
+#~ "conf)."
Modified: trunk/debian/po/fr.po
==============================================================================
--- trunk/debian/po/fr.po Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/debian/po/fr.po Fri Dec 11 14:04:13 2009 (r709)
@@ -13,8 +13,8 @@
msgid ""
msgstr ""
"Project-Id-Version: apt-proxy_1.9.32\n"
-"Report-Msgid-Bugs-To: halls at debian.org\n"
-"POT-Creation-Date: 2006-08-14 12:59+0100\n"
+"Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
+"POT-Creation-Date: 2009-12-08 22:51+0100\n"
"PO-Revision-Date: 2005-09-16 20:40+0200\n"
"Last-Translator: Olivier Trichet <olivier.trichet at freesurf.fr>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -26,7 +26,7 @@
#. Type: note
#. Description
#: ../templates:1001
-msgid "Upgrading from pre-v1.9 packages."
+msgid "Upgrading from pre-v1.9 packages"
msgstr "Mise à niveau depuis une version antérieure à 1.9"
#. Type: note
@@ -51,10 +51,17 @@
#. Type: note
#. Description
#: ../templates:1001
-msgid ""
-"I will build /etc/apt-proxy/apt-proxy-v2.conf based on your old settings if "
-"you didn't already have such file. In any case, a backup file will be "
-"written to /etc/apt-proxy/apt-proxy-v2.conf.backup"
+#, fuzzy
+#| msgid ""
+#| "I will build /etc/apt-proxy/apt-proxy-v2.conf based on your old settings "
+#| "if you didn't already have such file. In any case, a backup file will be "
+#| "written to /etc/apt-proxy/apt-proxy-v2.conf.backup"
+msgid ""
+"The file /etc/apt-proxy/apt-proxy-v2.conf will be built based on your old "
+"settings if you didn't already have such file. In any case, a backup file "
+"will be written to /etc/apt-proxy/apt-proxy-v2.conf.backup. In case of "
+"issue, the upgrading script dumps some warnings to /var/log/apt-proxy-v1tov2."
+"log. You should read those warnings and revise your configuration if needed."
msgstr ""
"Le fichier de configuration /etc/apt-proxy/apt-proxy-v2.conf va être "
"construit à partir de votre ancien fichier de configuration, s'il existe. "
@@ -70,29 +77,24 @@
"D'autres problèmes liés à cette mise à niveau sont documentés dans /usr/"
"share/doc/apt-proxy/UPGRADING."
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "Upgrading issues"
-msgstr "Problèmes lors de la mise à niveau"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The upgrading script dumped some warnings and they have been mailed to "
-"root at localhost."
-msgstr ""
-"Le script de mise à niveau a émis des messages d'avertissements. Ils ont été "
-"envoyés par courriel à root at localhost."
+#~ msgid "Upgrading issues"
+#~ msgstr "Problèmes lors de la mise à niveau"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
-"revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
-msgstr ""
-"Il est recommandé de lire ces avertissements ainsi que le fichier /usr/share/"
-"doc/apt-proxy/UPGRADING et d'adapter la configuration qui se trouve dans le "
-"fichier /etc/apt-proxy/apt-proxy-v2.conf."
+#~ msgid ""
+#~ "The upgrading script dumped some warnings and they have been mailed to "
+#~ "root at localhost."
+#~ msgstr ""
+#~ "Le script de mise à niveau a émis des messages d'avertissements. Ils ont "
+#~ "été envoyés par courriel à root at localhost."
+
+#, fuzzy
+#~| msgid ""
+#~| "You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING "
+#~| "and revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
+#~ msgid ""
+#~ "You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
+#~ "revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)."
+#~ msgstr ""
+#~ "Il est recommandé de lire ces avertissements ainsi que le fichier /usr/"
+#~ "share/doc/apt-proxy/UPGRADING et d'adapter la configuration qui se trouve "
+#~ "dans le fichier /etc/apt-proxy/apt-proxy-v2.conf."
Modified: trunk/debian/po/ja.po
==============================================================================
--- trunk/debian/po/ja.po Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/debian/po/ja.po Fri Dec 11 14:04:13 2009 (r709)
@@ -15,8 +15,8 @@
msgid ""
msgstr ""
"Project-Id-Version: apt-proxy 1.9.17\n"
-"Report-Msgid-Bugs-To: halls at debian.org\n"
-"POT-Creation-Date: 2006-08-14 12:59+0100\n"
+"Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
+"POT-Creation-Date: 2009-12-08 22:51+0100\n"
"PO-Revision-Date: 2006-10-15 13:52+0900\n"
"Last-Translator: Hideki Yamane (Debian-JP) <henrich at debian.or.jp>\n"
"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -27,7 +27,7 @@
#. Type: note
#. Description
#: ../templates:1001
-msgid "Upgrading from pre-v1.9 packages."
+msgid "Upgrading from pre-v1.9 packages"
msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ 1.9 以å‰ã®ãƒ‘ッケージã‹ã‚‰ã®ã‚¢ãƒƒãƒ—グレードã«ã¤ã„ã¦"
#. Type: note
@@ -51,10 +51,17 @@
#. Type: note
#. Description
#: ../templates:1001
-msgid ""
-"I will build /etc/apt-proxy/apt-proxy-v2.conf based on your old settings if "
-"you didn't already have such file. In any case, a backup file will be "
-"written to /etc/apt-proxy/apt-proxy-v2.conf.backup"
+#, fuzzy
+#| msgid ""
+#| "I will build /etc/apt-proxy/apt-proxy-v2.conf based on your old settings "
+#| "if you didn't already have such file. In any case, a backup file will be "
+#| "written to /etc/apt-proxy/apt-proxy-v2.conf.backup"
+msgid ""
+"The file /etc/apt-proxy/apt-proxy-v2.conf will be built based on your old "
+"settings if you didn't already have such file. In any case, a backup file "
+"will be written to /etc/apt-proxy/apt-proxy-v2.conf.backup. In case of "
+"issue, the upgrading script dumps some warnings to /var/log/apt-proxy-v1tov2."
+"log. You should read those warnings and revise your configuration if needed."
msgstr ""
"ã¾ã ファイルãŒå˜åœ¨ã—ãªã„å ´åˆã€ä»¥å‰ã®è¨å®šã‚’元㫠/etc/apt-proxy/apt-proxy-v2."
"conf を作æˆã—ã¾ã™ã€‚ã„ãšã‚Œã«ã›ã‚ˆã€ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ファイル㌠/etc/apt-proxy/apt-"
@@ -67,28 +74,23 @@
"There are also other issues documented in /usr/share/doc/apt-proxy/UPGRADING"
msgstr "/usr/share/doc/apt-proxy/UPGRADING ã«è¨˜è¼‰ã•ã‚Œã¦ã„ã‚‹ä»–ã®äº‹æŸ„ã«ã¤ã„ã¦"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "Upgrading issues"
-msgstr "アップグレードã«ã¤ã„ã¦"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The upgrading script dumped some warnings and they have been mailed to "
-"root at localhost."
-msgstr ""
-"アップグレードã®ã‚¹ã‚¯ãƒªãƒ—トã¯è¦å‘Šã‚’å¹¾ã¤ã‹å‡ºåŠ›ã—ã€root at localhost å®›ã«é€ä¿¡ã—ã¾ã—"
-"ãŸã€‚"
+#~ msgid "Upgrading issues"
+#~ msgstr "アップグレードã«ã¤ã„ã¦"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
-"revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
-msgstr ""
-"ã“れらã®è¦å‘Šã¨ /usr/share/doc/apt-proxy/UPGRADING ã‚’èªã‚“ã§ã€è¨å®š (/etc/apt-"
-"proxy/apt-proxy-v2.conf) を見直ã™å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
+#~ msgid ""
+#~ "The upgrading script dumped some warnings and they have been mailed to "
+#~ "root at localhost."
+#~ msgstr ""
+#~ "アップグレードã®ã‚¹ã‚¯ãƒªãƒ—トã¯è¦å‘Šã‚’å¹¾ã¤ã‹å‡ºåŠ›ã—ã€root at localhost å®›ã«é€ä¿¡ã—"
+#~ "ã¾ã—ãŸã€‚"
+
+#, fuzzy
+#~| msgid ""
+#~| "You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING "
+#~| "and revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
+#~ msgid ""
+#~ "You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
+#~ "revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)."
+#~ msgstr ""
+#~ "ã“れらã®è¦å‘Šã¨ /usr/share/doc/apt-proxy/UPGRADING ã‚’èªã‚“ã§ã€è¨å®š (/etc/"
+#~ "apt-proxy/apt-proxy-v2.conf) を見直ã™å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
Modified: trunk/debian/po/nl.po
==============================================================================
--- trunk/debian/po/nl.po Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/debian/po/nl.po Fri Dec 11 14:04:13 2009 (r709)
@@ -14,8 +14,8 @@
msgid ""
msgstr ""
"Project-Id-Version: apt-proxy\n"
-"Report-Msgid-Bugs-To: halls at debian.org\n"
-"POT-Creation-Date: 2006-08-14 12:59+0100\n"
+"Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
+"POT-Creation-Date: 2009-12-08 22:51+0100\n"
"PO-Revision-Date: 2006-03-10 14:00+0100\n"
"Last-Translator: Bart Cornelis <cobaco at linux.be>\n"
"Language-Team: debian-l10n-duth <debian-l10n-dutch at lists.debian.org>\n"
@@ -26,8 +26,8 @@
#. Type: note
#. Description
#: ../templates:1001
-msgid "Upgrading from pre-v1.9 packages."
-msgstr "Er wordt opgewaardeerd van pre-v1.9 pakketten."
+msgid "Upgrading from pre-v1.9 packages"
+msgstr "Er wordt opgewaardeerd van pre-v1.9 pakketten"
#. Type: note
#. Description
@@ -50,10 +50,17 @@
#. Type: note
#. Description
#: ../templates:1001
-msgid ""
-"I will build /etc/apt-proxy/apt-proxy-v2.conf based on your old settings if "
-"you didn't already have such file. In any case, a backup file will be "
-"written to /etc/apt-proxy/apt-proxy-v2.conf.backup"
+#, fuzzy
+#| msgid ""
+#| "I will build /etc/apt-proxy/apt-proxy-v2.conf based on your old settings "
+#| "if you didn't already have such file. In any case, a backup file will be "
+#| "written to /etc/apt-proxy/apt-proxy-v2.conf.backup"
+msgid ""
+"The file /etc/apt-proxy/apt-proxy-v2.conf will be built based on your old "
+"settings if you didn't already have such file. In any case, a backup file "
+"will be written to /etc/apt-proxy/apt-proxy-v2.conf.backup. In case of "
+"issue, the upgrading script dumps some warnings to /var/log/apt-proxy-v1tov2."
+"log. You should read those warnings and revise your configuration if needed."
msgstr ""
"Wanneer /etc/apt-proxy/apt-proxy-v2.conf nog niet bestaat wordt deze "
"opgebouwd aan de hand van uw oude instellingen. Er wordt altijd een "
@@ -67,29 +74,24 @@
msgstr ""
"Er zijn verdere issues gedocumenteerd in /usr/share/doc/apt-proxy/UPGRADING"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "Upgrading issues"
-msgstr "Opwaarderingsissues"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The upgrading script dumped some warnings and they have been mailed to "
-"root at localhost."
-msgstr ""
-"Het opwaarderingsscript gaf enkele waarschuwingen; deze zijn naar "
-"root at localhost gemaild."
+#~ msgid "Upgrading issues"
+#~ msgstr "Opwaarderingsissues"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
-"revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
-msgstr ""
-"U kunt deze waarschuwingen en /usr/share/doc/apt-proxy/UPGRADING best "
-"nalezen en vervolgens uw configuratie herzien (/etc/apt-prox/apt-proxy-v2."
-"conf)"
+#~ msgid ""
+#~ "The upgrading script dumped some warnings and they have been mailed to "
+#~ "root at localhost."
+#~ msgstr ""
+#~ "Het opwaarderingsscript gaf enkele waarschuwingen; deze zijn naar "
+#~ "root at localhost gemaild."
+
+#, fuzzy
+#~| msgid ""
+#~| "You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING "
+#~| "and revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
+#~ msgid ""
+#~ "You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
+#~ "revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)."
+#~ msgstr ""
+#~ "U kunt deze waarschuwingen en /usr/share/doc/apt-proxy/UPGRADING best "
+#~ "nalezen en vervolgens uw configuratie herzien (/etc/apt-prox/apt-proxy-v2."
+#~ "conf)"
Modified: trunk/debian/po/pt.po
==============================================================================
--- trunk/debian/po/pt.po Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/debian/po/pt.po Fri Dec 11 14:04:13 2009 (r709)
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: apt-proxy 1.9.32\n"
-"Report-Msgid-Bugs-To: halls at debian.org\n"
-"POT-Creation-Date: 2006-08-14 12:59+0100\n"
+"Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
+"POT-Creation-Date: 2009-12-08 22:51+0100\n"
"PO-Revision-Date: 2005-09-25 20:48+0100\n"
"Last-Translator: Rui Branco <ruipb at netcabo.pt>\n"
"Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -18,8 +18,8 @@
#. Type: note
#. Description
#: ../templates:1001
-msgid "Upgrading from pre-v1.9 packages."
-msgstr "A actualizar a partir de pacotes pre-v1.9."
+msgid "Upgrading from pre-v1.9 packages"
+msgstr "A actualizar a partir de pacotes pre-v1.9"
#. Type: note
#. Description
@@ -44,10 +44,17 @@
#. Type: note
#. Description
#: ../templates:1001
-msgid ""
-"I will build /etc/apt-proxy/apt-proxy-v2.conf based on your old settings if "
-"you didn't already have such file. In any case, a backup file will be "
-"written to /etc/apt-proxy/apt-proxy-v2.conf.backup"
+#, fuzzy
+#| msgid ""
+#| "I will build /etc/apt-proxy/apt-proxy-v2.conf based on your old settings "
+#| "if you didn't already have such file. In any case, a backup file will be "
+#| "written to /etc/apt-proxy/apt-proxy-v2.conf.backup"
+msgid ""
+"The file /etc/apt-proxy/apt-proxy-v2.conf will be built based on your old "
+"settings if you didn't already have such file. In any case, a backup file "
+"will be written to /etc/apt-proxy/apt-proxy-v2.conf.backup. In case of "
+"issue, the upgrading script dumps some warnings to /var/log/apt-proxy-v1tov2."
+"log. You should read those warnings and revise your configuration if needed."
msgstr ""
"O /etc/apt-proxy/apt-proxy-v2.conf será criado tendo como base as "
"suasantigas configurações se ainda não tiver este ficheiro. Em todo o caso, "
@@ -62,28 +69,23 @@
"Existem também outras informações documentadas em /usr/share/doc/apt-proxy/"
"UPGRADING"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "Upgrading issues"
-msgstr "Informações sobre a actualização"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The upgrading script dumped some warnings and they have been mailed to "
-"root at localhost."
-msgstr ""
-"O scrip' de actualização originou alguns avisos, foram enviadospara "
-"root at localhost."
+#~ msgid "Upgrading issues"
+#~ msgstr "Informações sobre a actualização"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
-"revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
-msgstr ""
-"Deverá ler esses avisos e/usr/share/doc/apt-proxy/UPGRADING e rever a sua "
-"configuração (/etc/apt-proxy/apt-proxy-v2.conf)"
+#~ msgid ""
+#~ "The upgrading script dumped some warnings and they have been mailed to "
+#~ "root at localhost."
+#~ msgstr ""
+#~ "O scrip' de actualização originou alguns avisos, foram enviadospara "
+#~ "root at localhost."
+
+#, fuzzy
+#~| msgid ""
+#~| "You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING "
+#~| "and revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
+#~ msgid ""
+#~ "You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
+#~ "revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)."
+#~ msgstr ""
+#~ "Deverá ler esses avisos e/usr/share/doc/apt-proxy/UPGRADING e rever a sua "
+#~ "configuração (/etc/apt-proxy/apt-proxy-v2.conf)"
Modified: trunk/debian/po/pt_BR.po
==============================================================================
--- trunk/debian/po/pt_BR.po Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/debian/po/pt_BR.po Fri Dec 11 14:04:13 2009 (r709)
@@ -14,8 +14,8 @@
msgid ""
msgstr ""
"Project-Id-Version: apt-proxy\n"
-"Report-Msgid-Bugs-To: halls at debian.org\n"
-"POT-Creation-Date: 2006-08-14 12:59+0100\n"
+"Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
+"POT-Creation-Date: 2009-12-08 22:51+0100\n"
"PO-Revision-Date: 2005-08-18 12:22-0300\n"
"Last-Translator: André Luís Lopes <andrelop at debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
@@ -26,8 +26,8 @@
#. Type: note
#. Description
#: ../templates:1001
-msgid "Upgrading from pre-v1.9 packages."
-msgstr "Atualizando a partir de pacotes anteriores à versão 1.9."
+msgid "Upgrading from pre-v1.9 packages"
+msgstr "Atualizando a partir de pacotes anteriores à versão 1.9"
#. Type: note
#. Description
@@ -52,10 +52,17 @@
#. Type: note
#. Description
#: ../templates:1001
-msgid ""
-"I will build /etc/apt-proxy/apt-proxy-v2.conf based on your old settings if "
-"you didn't already have such file. In any case, a backup file will be "
-"written to /etc/apt-proxy/apt-proxy-v2.conf.backup"
+#, fuzzy
+#| msgid ""
+#| "I will build /etc/apt-proxy/apt-proxy-v2.conf based on your old settings "
+#| "if you didn't already have such file. In any case, a backup file will be "
+#| "written to /etc/apt-proxy/apt-proxy-v2.conf.backup"
+msgid ""
+"The file /etc/apt-proxy/apt-proxy-v2.conf will be built based on your old "
+"settings if you didn't already have such file. In any case, a backup file "
+"will be written to /etc/apt-proxy/apt-proxy-v2.conf.backup. In case of "
+"issue, the upgrading script dumps some warnings to /var/log/apt-proxy-v1tov2."
+"log. You should read those warnings and revise your configuration if needed."
msgstr ""
"Eu irei constuir o arquivo /etc/apt-proxy/apt-proxy-v2.conf com base em suas "
"configurações antigas caso você ainda não o tenha. De qualquer forma, um "
@@ -70,28 +77,24 @@
"Também existem outros problemas documentados no arquivo /usr/share/doc/apt-"
"proxy/UPGRADING."
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "Upgrading issues"
-msgstr "Problemas de atualização"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The upgrading script dumped some warnings and they have been mailed to "
-"root at localhost."
-msgstr ""
-"O script de atualização gerou alguns avisos e os mesmos foram enviados à "
-"você por e-mail no endereço root at localhost."
+#~ msgid "Upgrading issues"
+#~ msgstr "Problemas de atualização"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
-"revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
-msgstr ""
-"Você deverá ler tais avisos, bem como o arquivo /usr/share/doc/apt-proxy/"
-"UPGRADING, e revisar sua configuração (em /etc/apt-proxy/apt-proxy-v2.conf)"
+#~ msgid ""
+#~ "The upgrading script dumped some warnings and they have been mailed to "
+#~ "root at localhost."
+#~ msgstr ""
+#~ "O script de atualização gerou alguns avisos e os mesmos foram enviados à "
+#~ "você por e-mail no endereço root at localhost."
+
+#, fuzzy
+#~| msgid ""
+#~| "You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING "
+#~| "and revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
+#~ msgid ""
+#~ "You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
+#~ "revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)."
+#~ msgstr ""
+#~ "Você deverá ler tais avisos, bem como o arquivo /usr/share/doc/apt-proxy/"
+#~ "UPGRADING, e revisar sua configuração (em /etc/apt-proxy/apt-proxy-v2."
+#~ "conf)"
Modified: trunk/debian/po/sv.po
==============================================================================
--- trunk/debian/po/sv.po Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/debian/po/sv.po Fri Dec 11 14:04:13 2009 (r709)
@@ -8,13 +8,13 @@
# or http://www.debian.org/intl/l10n/po-debconf/README-trans
# Developers do not need to manually edit POT or PO files.
# , fuzzy
-#
-#
+#
+#
msgid ""
msgstr ""
"Project-Id-Version: apt-proxy 1.9.32\n"
-"Report-Msgid-Bugs-To: halls at debian.org\n"
-"POT-Creation-Date: 2006-08-14 12:59+0100\n"
+"Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
+"POT-Creation-Date: 2009-12-08 22:51+0100\n"
"PO-Revision-Date: 2005-10-04 22:03+0200\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <sv at li.org>\n"
@@ -25,8 +25,8 @@
#. Type: note
#. Description
#: ../templates:1001
-msgid "Upgrading from pre-v1.9 packages."
-msgstr "Uppgraderar från före-v1.9-paket."
+msgid "Upgrading from pre-v1.9 packages"
+msgstr "Uppgraderar från före-v1.9-paket"
#. Type: note
#. Description
@@ -49,10 +49,17 @@
#. Type: note
#. Description
#: ../templates:1001
-msgid ""
-"I will build /etc/apt-proxy/apt-proxy-v2.conf based on your old settings if "
-"you didn't already have such file. In any case, a backup file will be "
-"written to /etc/apt-proxy/apt-proxy-v2.conf.backup"
+#, fuzzy
+#| msgid ""
+#| "I will build /etc/apt-proxy/apt-proxy-v2.conf based on your old settings "
+#| "if you didn't already have such file. In any case, a backup file will be "
+#| "written to /etc/apt-proxy/apt-proxy-v2.conf.backup"
+msgid ""
+"The file /etc/apt-proxy/apt-proxy-v2.conf will be built based on your old "
+"settings if you didn't already have such file. In any case, a backup file "
+"will be written to /etc/apt-proxy/apt-proxy-v2.conf.backup. In case of "
+"issue, the upgrading script dumps some warnings to /var/log/apt-proxy-v1tov2."
+"log. You should read those warnings and revise your configuration if needed."
msgstr ""
"Jag kommer att bygga /etc/apt-proxy/apt-proxy-v2.conf baserat på dina gamla "
"inställningar om du inte redan har en sådan fil. I vilket fall som helst så "
@@ -67,28 +74,23 @@
"Det finns också andra problem dokumenterade i /usr/share/doc/apt-proxy/"
"UPGRADING"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "Upgrading issues"
-msgstr "Uppgraderingsproblem"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The upgrading script dumped some warnings and they have been mailed to "
-"root at localhost."
-msgstr ""
-"Uppgraderingsskriptet har dumpat några varningar och de har e-postats till "
-"root at localhost."
+#~ msgid "Upgrading issues"
+#~ msgstr "Uppgraderingsproblem"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
-"revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
-msgstr ""
-"Du bör läsa dessa varningar och /usr/share/doc/apt-proxy/UPGRADING och "
-"omarbeta din konfiguration (/etc/apt-proxy/apt-proxy-v2.conf)"
+#~ msgid ""
+#~ "The upgrading script dumped some warnings and they have been mailed to "
+#~ "root at localhost."
+#~ msgstr ""
+#~ "Uppgraderingsskriptet har dumpat några varningar och de har e-postats "
+#~ "till root at localhost."
+
+#, fuzzy
+#~| msgid ""
+#~| "You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING "
+#~| "and revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
+#~ msgid ""
+#~ "You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
+#~ "revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)."
+#~ msgstr ""
+#~ "Du bör läsa dessa varningar och /usr/share/doc/apt-proxy/UPGRADING och "
+#~ "omarbeta din konfiguration (/etc/apt-proxy/apt-proxy-v2.conf)"
Modified: trunk/debian/po/templates.pot
==============================================================================
--- trunk/debian/po/templates.pot Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/debian/po/templates.pot Fri Dec 11 14:04:13 2009 (r709)
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: halls at debian.org\n"
-"POT-Creation-Date: 2006-08-14 12:59+0100\n"
+"Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
+"POT-Creation-Date: 2009-12-08 22:51+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -19,7 +19,7 @@
#. Type: note
#. Description
#: ../templates:1001
-msgid "Upgrading from pre-v1.9 packages."
+msgid "Upgrading from pre-v1.9 packages"
msgstr ""
#. Type: note
@@ -41,9 +41,11 @@
#. Description
#: ../templates:1001
msgid ""
-"I will build /etc/apt-proxy/apt-proxy-v2.conf based on your old settings if "
-"you didn't already have such file. In any case, a backup file will be "
-"written to /etc/apt-proxy/apt-proxy-v2.conf.backup"
+"The file /etc/apt-proxy/apt-proxy-v2.conf will be built based on your old "
+"settings if you didn't already have such file. In any case, a backup file "
+"will be written to /etc/apt-proxy/apt-proxy-v2.conf.backup. In case of "
+"issue, the upgrading script dumps some warnings to /var/log/apt-proxy-v1tov2."
+"log. You should read those warnings and revise your configuration if needed."
msgstr ""
#. Type: note
@@ -52,25 +54,3 @@
msgid ""
"There are also other issues documented in /usr/share/doc/apt-proxy/UPGRADING"
msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "Upgrading issues"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The upgrading script dumped some warnings and they have been mailed to "
-"root at localhost."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
-"revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
-msgstr ""
Modified: trunk/debian/po/vi.po
==============================================================================
--- trunk/debian/po/vi.po Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/debian/po/vi.po Fri Dec 11 14:04:13 2009 (r709)
@@ -1,12 +1,12 @@
# Vietnamese Translation for apt-proxy.
# Copyright © 2005 Free Software Foundation, Inc.
# Clytie Siddall <clytie at riverland.net.au>, 2005.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: apt-proxy 1.9.30\n"
-"Report-Msgid-Bugs-To: halls at debian.org\n"
-"POT-Creation-Date: 2006-08-14 12:59+0100\n"
+"Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
+"POT-Creation-Date: 2009-12-08 22:51+0100\n"
"PO-Revision-Date: 2005-06-12 12:04+0930\n"
"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
"Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
@@ -18,8 +18,8 @@
#. Type: note
#. Description
#: ../templates:1001
-msgid "Upgrading from pre-v1.9 packages."
-msgstr "Cáºp nhât từ các gói tin trÆ°á»›c phiên bản 1.9."
+msgid "Upgrading from pre-v1.9 packages"
+msgstr "Cáºp nhât từ các gói tin trÆ°á»›c phiên bản 1.9"
#. Type: note
#. Description
@@ -43,9 +43,11 @@
#: ../templates:1001
#, fuzzy
msgid ""
-"I will build /etc/apt-proxy/apt-proxy-v2.conf based on your old settings if "
-"you didn't already have such file. In any case, a backup file will be "
-"written to /etc/apt-proxy/apt-proxy-v2.conf.backup"
+"The file /etc/apt-proxy/apt-proxy-v2.conf will be built based on your old "
+"settings if you didn't already have such file. In any case, a backup file "
+"will be written to /etc/apt-proxy/apt-proxy-v2.conf.backup. In case of "
+"issue, the upgrading script dumps some warnings to /var/log/apt-proxy-v1tov2."
+"log. You should read those warnings and revise your configuration if needed."
msgstr ""
"Sẽ xây dụng «/etc/apt-proxy/apt-proxy-v2.conf» Ä‘á»±a và o các thiết láºp cÅ© của "
"bạn nếu bạn chÆ°a có táºp tin nhÆ° váºy. Trong bất cứ trÆ°á»ng hợp nà o, sẽ ghi má»™t "
@@ -60,28 +62,23 @@
"Cũng có một số vấn đỠkhác được diễn tả trong tà i liệu «/usr/share/doc/apt-"
"proxy/UPGRADING» (cáºp nháºt)"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "Upgrading issues"
-msgstr "Vấn Ä‘á» cáºp nháºt"
+#~ msgid "Upgrading issues"
+#~ msgstr "Vấn Ä‘á» cáºp nháºt"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The upgrading script dumped some warnings and they have been mailed to "
-"root at localhost."
-msgstr ""
-"Táºp lệnh cáºp nháºt đã đổ má»™t số cảnh báo mà được gởi cho «root at localhost»."
+#~ msgid ""
+#~ "The upgrading script dumped some warnings and they have been mailed to "
+#~ "root at localhost."
+#~ msgstr ""
+#~ "Táºp lệnh cáºp nháºt đã đổ má»™t số cảnh báo mà được gởi cho «root at localhost»."
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
-"revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
-msgstr ""
-"Bạn hãy Ä‘á»c những cảnh báo ấy và tà i liệu «/usr/share/doc/apt-proxy/"
-"UPGRADING» và cÅ©ng sá»a đổi cấu hình của bạn («/etc/apt-proxy/apt-proxy-v2."
-"conf»)."
+#, fuzzy
+#~| msgid ""
+#~| "You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING "
+#~| "and revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
+#~ msgid ""
+#~ "You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
+#~ "revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)."
+#~ msgstr ""
+#~ "Bạn hãy Ä‘á»c những cảnh báo ấy và tà i liệu «/usr/share/doc/apt-proxy/"
+#~ "UPGRADING» và cÅ©ng sá»a đổi cấu hình của bạn («/etc/apt-proxy/apt-proxy-v2."
+#~ "conf»)."
Modified: trunk/debian/postinst
==============================================================================
--- trunk/debian/postinst Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/debian/postinst Fri Dec 11 14:04:13 2009 (r709)
@@ -1,4 +1,5 @@
#! /bin/sh
+set -e
NAME=apt-proxy
APTPROXY_USER=aptproxy
@@ -35,9 +36,6 @@
echo "Disabling inetd's apt-proxy v1 line."
update-inetd --comment-chars "#<apt-proxy-v2># " --disable 9999
fi
- db_fset $NAME/upgrading-v2 seen false || true
- db_input medium $NAME/upgrading-v2 || true
- db_go
fi
if
dpkg --compare-versions "$PREV" lt-nl 1.9 && ( ! $had_v2_conf ) \
@@ -46,7 +44,7 @@
echo Customising configuration file based on old settings.
cp -a --backup=numbered /etc/apt-proxy/apt-proxy-v2.conf \
/etc/apt-proxy/apt-proxy-v2.conf.backup
- OUTPUT=$(/usr/sbin/apt-proxy-v1tov2 /etc/apt-proxy/apt-proxy.conf \
+ OUTPUT=$(apt-proxy-v1tov2 /etc/apt-proxy/apt-proxy.conf \
/etc/apt-proxy/apt-proxy-v2.conf.backup\
2>&1 \
> /etc/apt-proxy/apt-proxy-v2.conf )
@@ -54,17 +52,12 @@
chown aptproxy:adm /var/log/apt-proxy-v1tov2.log
chmod 640 /var/log/apt-proxy-v1tov2.log
echo "The log of conversion was save in /var/log/apt-proxy-v1tov2.log."
- if [ -n "$OUTPUT" ]; then
- db_fset $NAME/upgrading-v2-result seen false
- db_input high $NAME/upgrading-v2-result || true
- db_go
- fi
fi
# Older versions got database permissions wrong #288829
if dpkg --compare-versions "$PREV" lt-nl 1.9.27; then
if [ -d /var/cache/apt-proxy/.apt-proxy ]; then
echo "Fixing database owner."
- chown -R aptproxy.nogroup /var/cache/apt-proxy/.apt-proxy
+ chown -R aptproxy:nogroup /var/cache/apt-proxy/.apt-proxy
fi
fi
;;
Modified: trunk/debian/postrm
==============================================================================
--- trunk/debian/postrm Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/debian/postrm Fri Dec 11 14:04:13 2009 (r709)
@@ -1,4 +1,5 @@
#!/bin/sh
+set -e
#DEBHELPER#
Modified: trunk/debian/prerm
==============================================================================
--- trunk/debian/prerm Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/debian/prerm Fri Dec 11 14:04:13 2009 (r709)
@@ -1,4 +1,5 @@
#!/bin/sh
+set -e
#DEBHELPER#
Copied: trunk/debian/pycompat (from r708, branches/1.9.36/debian/pycompat)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/debian/pycompat Fri Dec 11 14:04:13 2009 (r709, copy of r708, branches/1.9.36/debian/pycompat)
@@ -0,0 +1 @@
+2
Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/debian/rules Fri Dec 11 14:04:13 2009 (r709)
@@ -25,7 +25,7 @@
install-stamp: build-stamp
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
dh_install
dh_installdebconf
@@ -37,7 +37,7 @@
dh_pycentral
dh_python
dh_installinit
-
+
#install -g root -o root -m 755 \
# apt-proxy debian/apt-proxy/usr/sbin/apt-proxy
#install -g root -o root -m 755 \
@@ -48,7 +48,11 @@
# Temporary rename to apt-proxy.conf to make it easier to
# upgrade/downgrade between v1 and v2.
mv $(PKGDIR)/etc/apt-proxy/apt-proxy.conf $(PKGDIR)/etc/apt-proxy/apt-proxy-v2.conf
-
+
+ # lintian overrides
+ # install -m 755 -d $(PKGDIR)/usr/share/lintian/overrides
+ # install -m 644 debian/apt-proxy.lintian.overrides $(PKGDIR)/usr/share/lintian/overrides/apt-proxy
+
touch install-stamp
binary-arch: build install
Modified: trunk/debian/templates
==============================================================================
--- trunk/debian/templates Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/debian/templates Fri Dec 11 14:04:13 2009 (r709)
@@ -1,24 +1,19 @@
Template: apt-proxy/upgrading-v2
Type: note
-_Description: Upgrading from pre-v1.9 packages.
+_Description: Upgrading from pre-v1.9 packages
You seem to be upgrading from a version of apt-proxy previous to v1.9.
.
apt-proxy has been rewritten in python and the new configuration file
format is incompatible with previous version. Hopefully you will like the
new format better :)
.
- I will build /etc/apt-proxy/apt-proxy-v2.conf based on your old settings
- if you didn't already have such file. In any case, a backup file will be
- written to /etc/apt-proxy/apt-proxy-v2.conf.backup
+ The file /etc/apt-proxy/apt-proxy-v2.conf will be built based on your
+ old settings if you didn't already have such file. In any case, a
+ backup file will be written to
+ /etc/apt-proxy/apt-proxy-v2.conf.backup. In case of issue, the
+ upgrading script dumps some warnings to
+ /var/log/apt-proxy-v1tov2.log. You should read those warnings and
+ revise your configuration if needed.
.
There are also other issues documented in
/usr/share/doc/apt-proxy/UPGRADING
-
-Template: apt-proxy/upgrading-v2-result
-Type: note
-_Description: Upgrading issues
- The upgrading script dumped some warnings and they have been mailed to
- root at localhost.
- .
- You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and
- revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)
Modified: trunk/doc/po/apt-proxy.pot
==============================================================================
--- trunk/doc/po/apt-proxy.pot Fri Dec 11 13:09:48 2009 (r708)
+++ trunk/doc/po/apt-proxy.pot Fri Dec 11 14:04:13 2009 (r709)
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-03-25 12:15+0000\n"
+"POT-Creation-Date: 2009-12-04 15:19+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -15,47 +15,47 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING"
-# type: TH
+#. type: TH
#: doc/apt-proxy.8:2 doc/apt-proxy.8:2 doc/apt-proxy.conf.5:2
#, no-wrap
msgid "apt-proxy"
msgstr ""
-# type: TH
+#. type: TH
#: doc/apt-proxy.8:2
#, no-wrap
msgid "15 Jul 2005"
msgstr ""
-# type: SH
+#. type: SH
#: doc/apt-proxy.8:3
#, no-wrap
msgid "Name"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.8:5
msgid "apt-proxy - A proxy for saving bandwidth to Debian servers"
msgstr ""
-# type: SH
+#. type: SH
#: doc/apt-proxy.8:5 doc/apt-proxy-import.8:5 doc/apt-proxy-v1tov2.8:4
#, no-wrap
msgid "SYNOPSIS"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.8:8
msgid "B<apt-proxy> I<[options] [logfile]>"
msgstr ""
-# type: SH
+#. type: SH
#: doc/apt-proxy.8:10 doc/apt-proxy.conf.5:6 doc/apt-proxy-import.8:8 doc/apt-proxy-v1tov2.8:8
#, no-wrap
msgid "DESCRIPTION"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.8:15
msgid ""
"B<apt-proxy> is a python program designed to be run as an stand alone server "
@@ -64,35 +64,35 @@
"server(s)\\&. apt-proxy listens by default on port 9999\\&."
msgstr ""
-# type: TP
+#. type: TP
#: doc/apt-proxy.8:16 doc/apt-proxy-import.8:27
#, no-wrap
msgid "B<-h>, B<--help>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.8:19
msgid "Display usage information\\&."
msgstr ""
-# type: TP
+#. type: TP
#: doc/apt-proxy.8:19 doc/apt-proxy-import.8:30
#, no-wrap
msgid "B<-c>, B<--config-file=>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.8:22
msgid "Configuration file. This defaults to /etc/apt-proxy/apt-proxy-v2\\&.conf"
msgstr ""
-# type: SH
+#. type: SH
#: doc/apt-proxy.8:23
#, no-wrap
msgid "CLIENT CONFIGURATION"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.8:27
msgid ""
"Once B<apt-proxy> is configured on a host SERVER, users then edit their "
@@ -100,7 +100,7 @@
"to serve clients), like so:"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.8:31
#, no-wrap
msgid ""
@@ -108,13 +108,13 @@
"deb-src http://SERVER:9999/debian stable main contrib non-free\n"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.8:33
#, no-wrap
msgid "deb http://aptproxy:9999/security stable/updates main contrib non-free\n"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.8:39
msgid ""
"What path should be specified after the server name and port number depends "
@@ -123,7 +123,7 @@
"below\\&."
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.8:43
msgid ""
"Note that you can also use the nicknames `unstable', `frozen' etc, but "
@@ -131,26 +131,26 @@
"symbolic or the code name and stick with it."
msgstr ""
-# type: SH
+#. type: SH
#: doc/apt-proxy.8:44
#, no-wrap
msgid "SERVER CONFIGURATION"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.8:48
msgid ""
"See B<apt-proxy.conf>(5) for details of how to set up apt-proxy to use "
"backends near to you."
msgstr ""
-# type: SH
+#. type: SH
#: doc/apt-proxy.8:49
#, no-wrap
msgid "CARE AND FEEDING OF MIRRORS"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.8:55
msgid ""
"B<apt-proxy> reduces the bandwidth requirements of Debian mirrors by "
@@ -159,35 +159,35 @@
"users request it from the proxy."
msgstr ""
-# type: SH
+#. type: SH
#: doc/apt-proxy.8:56 doc/apt-proxy.conf.5:208 doc/apt-proxy-import.8:61 doc/apt-proxy-v1tov2.8:18
#, no-wrap
msgid "FILES"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.8:60
msgid "/etc/apt-proxy/apt-proxy\\&.conf or /etc/apt-proxy/apt-proxy-v2\\&.conf"
msgstr ""
-# type: SH
+#. type: SH
#: doc/apt-proxy.8:61 doc/apt-proxy.conf.5:212 doc/apt-proxy-import.8:72 doc/apt-proxy-v1tov2.8:24
#, no-wrap
msgid "SEE ALSO"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.8:65
msgid "B<apt-proxy.conf>(5),B<apt-proxy-import>(8)"
msgstr ""
-# type: SH
+#. type: SH
#: doc/apt-proxy.8:68 doc/apt-proxy.conf.5:221 doc/apt-proxy-import.8:63
#, no-wrap
msgid "BUGS"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.8:72
msgid ""
"Packages are not compressed using gzip --rsyncable, which gives a 30% "
@@ -195,57 +195,57 @@
"source and other packages."
msgstr ""
-# type: SH
+#. type: SH
#: doc/apt-proxy.8:73 doc/apt-proxy-import.8:70 doc/apt-proxy-v1tov2.8:22
#, no-wrap
msgid "AUTHORS"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.8:75
msgid ""
"apt-proxy v2 was written by Manuel Estrada Sainz and is maintained by Otavio "
"Salvador and Chris Halls."
msgstr ""
-# type: TH
+#. type: TH
#: doc/apt-proxy.conf.5:2
#, no-wrap
msgid "apt-proxy\\&.conf"
msgstr ""
-# type: TH
+#. type: TH
#: doc/apt-proxy.conf.5:2
#, no-wrap
msgid "5 Jan 2006"
msgstr ""
-# type: SH
+#. type: SH
#: doc/apt-proxy.conf.5:3 doc/apt-proxy-import.8:3 doc/apt-proxy-v1tov2.8:2
#, no-wrap
msgid "NAME"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:5
msgid "apt-proxy\\&.conf - configuration file for apt-proxy"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:9
msgid ""
"B<apt-proxy\\&.conf> is the configuration file for apt-proxy. When "
"apt-proxy starts up, it will read I</etc/apt-proxy/apt-proxy\\&.conf>\\&."
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:12
msgid ""
"I</etc/apt-proxy/apt-proxy-v2\\&.conf> will be read instead if it exists to "
"make upgrading from v1 easier."
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:15
msgid ""
"The configuration file is divided up into several sections, where each "
@@ -253,7 +253,7 @@
"applies to all resources."
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:19
msgid ""
"The supplied I<apt-proxy\\&.conf> will work out of the box, but it is best "
@@ -262,61 +262,61 @@
"file\\&."
msgstr ""
-# type: SH
+#. type: SH
#: doc/apt-proxy.conf.5:21
#, no-wrap
msgid "[DEFAULT]"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:23
msgid "This section holds options global to the whole apt-proxy:"
msgstr ""
-# type: TP
+#. type: TP
#: doc/apt-proxy.conf.5:24
#, no-wrap
msgid "B<address>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:28
msgid ""
"IP address on which apt-proxy will listen for requests. Multiple addresses "
"have a empty space between it."
msgstr ""
-# type: TP
+#. type: TP
#: doc/apt-proxy.conf.5:29
#, no-wrap
msgid "B<port>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:32
msgid "TCP port on which apt-proxy will listen for requests."
msgstr ""
-# type: TP
+#. type: TP
#: doc/apt-proxy.conf.5:33 doc/apt-proxy.conf.5:132
#, no-wrap
msgid "B<min_refresh_delay>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:37
msgid ""
"If different from B<off>, means that Packages and other control files will "
"not be refreshed until they are at least this age."
msgstr ""
-# type: TP
+#. type: TP
#: doc/apt-proxy.conf.5:38 doc/apt-proxy.conf.5:103
#, no-wrap
msgid "B<timeout>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:43
msgid ""
"Maximum I/O timeout in seconds for backend transfers. Default: 30 seconds. "
@@ -324,24 +324,24 @@
"will try the next server in the list. Y"
msgstr ""
-# type: TP
+#. type: TP
#: doc/apt-proxy.conf.5:44
#, no-wrap
msgid "B<cache_dir>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:47
msgid "Cache directory. Default: /var/cache/apt-proxy"
msgstr ""
-# type: TP
+#. type: TP
#: doc/apt-proxy.conf.5:48
#, no-wrap
msgid "B<cleanup_freq>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:53
msgid ""
"If different from B<off>, indicates the time between housekeeping attempts: "
@@ -349,26 +349,26 @@
"and update internal tables, ..."
msgstr ""
-# type: TP
+#. type: TP
#: doc/apt-proxy.conf.5:54
#, no-wrap
msgid "B<max_age>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:58
msgid ""
"If different from B<off>, indicates the maximum age of files before deletion "
"from the cache."
msgstr ""
-# type: TP
+#. type: TP
#: doc/apt-proxy.conf.5:59
#, no-wrap
msgid "B<max_versions>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:67
msgid ""
"If different from B<off>, indicates the maximum number of versions of a "
@@ -379,13 +379,13 @@
"this will not work properly and should be disabled."
msgstr ""
-# type: TP
+#. type: TP
#: doc/apt-proxy.conf.5:68 doc/apt-proxy.conf.5:118
#, no-wrap
msgid "B<passive_ftp>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:73
msgid ""
"Specify B<on> to use passive FTP, which works from behind a firewall, but "
@@ -393,26 +393,26 @@
"instead. Default: on"
msgstr ""
-# type: TP
+#. type: TP
#: doc/apt-proxy.conf.5:74 doc/apt-proxy.conf.5:127
#, no-wrap
msgid "B<http_proxy>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:78
msgid ""
"Specify B<[username:password@]hostname:port> to use an upstream proxy. "
"Username and password are optional."
msgstr ""
-# type: TP
+#. type: TP
#: doc/apt-proxy.conf.5:79
#, no-wrap
msgid "B<dynamic_backends>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:84
msgid ""
"By default apt-proxy will add HTTP backends dynamically if not already "
@@ -420,13 +420,13 @@
"in the configuration file. Default: on"
msgstr ""
-# type: TP
+#. type: TP
#: doc/apt-proxy.conf.5:85
#, no-wrap
msgid "B<disable_pipelining>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:91
msgid ""
"apt-proxy can use HTTP pipelining to fetch several files at once (up to 10), "
@@ -435,13 +435,13 @@
"enable experimental http pipelining. Default: 1"
msgstr ""
-# type: TP
+#. type: TP
#: doc/apt-proxy.conf.5:92
#, no-wrap
msgid "B<bandwidth_limit = >I<amount>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:97
msgid ""
"When downloading from a backend server, limit the download speed to "
@@ -449,25 +449,25 @@
"backends only. Default: no limit"
msgstr ""
-# type: SH
+#. type: SH
#: doc/apt-proxy.conf.5:99
#, no-wrap
msgid "RESOURCES"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:102
msgid ""
"All other sections in the configuration file will be interpreted as resource "
"names. The options in the section apply to this resource only."
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:106
msgid "Overrides the global timeout"
msgstr ""
-# type: TP
+#. type: TP
#: doc/apt-proxy.conf.5:107
#, no-wrap
msgid ""
@@ -475,65 +475,65 @@
"[...]>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:110
msgid "A list one or more URLs referring to servers which hold debian packages\\&."
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:113
msgid "I<protocol>: internet protocol to use: http, ftp or rsync"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:115
msgid "I<server>: hostname of the backend server to contact"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:117
msgid "I<directory>: directory name to prepend requests to for this server"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:121
msgid "Override the global setting of passive_ftp"
msgstr ""
-# type: TP
+#. type: TP
#: doc/apt-proxy.conf.5:122
#, no-wrap
msgid "B<bandwidth_limit>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:126
msgid ""
"Set a bandwidth limit for downloads for this resource, overriding the global "
"bandwidth_limit"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:131
msgid ""
"Specify B<[username:password@]hostname:port> to use an upstream proxy, "
"overriding the global http_proxy."
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:136
msgid ""
"Override the global min_refresh_delay for this backend. Set this to the "
"interval at which this archive is usually refreshed."
msgstr ""
-# type: SH
+#. type: SH
#: doc/apt-proxy.conf.5:137
#, no-wrap
msgid "CONFIGURATION EXAMPLES"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:142
msgid ""
"To access a resource that's listed under a specific section name, simply "
@@ -541,17 +541,17 @@
"line in /etc/apt/sources.list"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:144
msgid "B<Debian main>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:147
msgid "This example shows how to give clients access to the main Debian archive:"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:151
#, no-wrap
msgid ""
@@ -560,25 +560,25 @@
" http://ftp.de.debian.org/debian/\n"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:156
msgid "Using this configuration, the client would use a I<sources.list> entry like:"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:159
#, no-wrap
msgid " deb http://server:9999/debian woody main\n"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:164
msgid ""
"And so the file request `/debian/woody/main/binary-i386/x11/foo_1-1.deb' "
"would turn into a backend request of first"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:167
#, no-wrap
msgid ""
@@ -586,12 +586,12 @@
"`http://ftp.us.debian.org/debian/woody/main/binary-i386/x11/foo_1-1.deb'\n"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:170
msgid "and if that failed,"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:173
#, no-wrap
msgid ""
@@ -599,12 +599,12 @@
"`http://ftp.de.debian.org/debian/woody/main/binary-i386/x11/foo_1-1.deb'\n"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:176
msgid "and apt-proxy will place the downloaded package in"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:178
#, no-wrap
msgid ""
@@ -612,23 +612,23 @@
"`/var/cache/apt-proxy/debian/debian/woody/main/binary-i386/x11/foo_1-1.deb'\\&.\n"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:181
msgid "B<backports.org>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:183
msgid "The backports.org website tells you to use this I<sources.list> line:"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:186
#, no-wrap
msgid " deb http://www.backports.org/debian sarge-backports main\n"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:190
msgid ""
"You can add this to apt-proxy by creating a new section in "
@@ -636,7 +636,7 @@
"URL:"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:194
#, no-wrap
msgid ""
@@ -644,7 +644,7 @@
" backends = http://www.backports.org/debian\n"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:199
msgid ""
"On the clients, replace the URL with one pointing to the apt-proxy resource "
@@ -652,162 +652,162 @@
"hostname is I<proxy> and it is running on port 9999, you would write:"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:202
#, no-wrap
msgid " deb http://proxy:9999/backports sarge-backports main\n"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:207
msgid ""
"For many more examples, see the supplied "
"/etc/apt-proxy/apt-proxy\\&.conf\\&."
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:210 doc/apt-proxy-v1tov2.8:20
msgid "/etc/apt-proxy/apt-proxy\\&.conf"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:212 doc/apt-proxy-v1tov2.8:22
msgid "/etc/apt-proxy/apt-proxy-v2\\&.conf"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:218
msgid "B<apt-proxy(8),> B</usr/share/doc/apt-proxy/README,> B<apt-proxy-import(8)>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:223
msgid "Plenty sure. Please report."
msgstr ""
-# type: SH
+#. type: SH
#: doc/apt-proxy.conf.5:224
#, no-wrap
msgid "AUTHOR"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy.conf.5:225
msgid ""
"apt-proxy v2 was written by Manuel Estrada Sainz "
"E<lt>ranty at debian.orgE<gt>\\&."
msgstr ""
-# type: TH
+#. type: TH
#: doc/apt-proxy-import.8:2
#, no-wrap
msgid "APT-PROXY-IMPORT"
msgstr ""
-# type: TH
+#. type: TH
#: doc/apt-proxy-import.8:2
#, no-wrap
-msgid "March 2008"
+msgid "December 2009"
msgstr ""
-# type: TH
+#. type: TH
#: doc/apt-proxy-import.8:2 doc/apt-proxy-v1tov2.8:1
#, no-wrap
msgid "Debian GNU/Linux"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:5
msgid "apt-proxy-import - Import packages into the apt-proxy cache."
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:8
msgid "B<apt-proxy-import> [I<options>] I<E<lt>filenameE<gt> >..."
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:11
msgid "apt-proxy-import B<-r> [options] E<lt>directoryE<gt> ..."
msgstr ""
-# type: SH
+#. type: SH
#: doc/apt-proxy-import.8:11
#, no-wrap
msgid "OPTIONS"
msgstr ""
-# type: TP
+#. type: TP
#: doc/apt-proxy-import.8:12
#, no-wrap
msgid "B<-V>, B<--version>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:15
msgid "print version and quit"
msgstr ""
-# type: TP
+#. type: TP
#: doc/apt-proxy-import.8:15
#, no-wrap
msgid "B<-v>, B<--verbose>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:18
msgid "give verbose output"
msgstr ""
-# type: TP
+#. type: TP
#: doc/apt-proxy-import.8:18
#, no-wrap
msgid "B<-d>, B<--debug>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:21
msgid "debug output"
msgstr ""
-# type: TP
+#. type: TP
#: doc/apt-proxy-import.8:21
#, no-wrap
msgid "B<-q>, B<--quiet>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:24
msgid "try not to write messages to stdout"
msgstr ""
-# type: TP
+#. type: TP
#: doc/apt-proxy-import.8:24
#, no-wrap
msgid "B<-r>, B<--recursive>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:27
msgid "recurse into subdirectories"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:30
msgid "Display this help and exit."
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:33
msgid "Configuration file"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:35
msgid "apt-proxy-import imports .deb files into the apt-proxy cache."
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:39
msgid ""
"It uses the package lists to determine where each file should be placed, so "
@@ -815,13 +815,13 @@
"lists before running apt-proxy-import."
msgstr ""
-# type: SH
+#. type: SH
#: doc/apt-proxy-import.8:39
#, no-wrap
msgid "USING TO BOOTSTRAP A NEW APT-PROXY CACHE"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:43
msgid ""
"If you have been using apt standalone, you probably have built up a large "
@@ -829,136 +829,136 @@
"these files into apt-proxy as follows:"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:45
msgid "1. Update apt-proxy's filelists:"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:47
#, no-wrap
msgid " apt-get update\n"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:50
msgid "2. Import files from apt's cache:"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:52
#, no-wrap
msgid " apt-proxy-import /var/cache/apt/archives\n"
msgstr ""
-# type: SH
+#. type: SH
#: doc/apt-proxy-import.8:53
#, no-wrap
msgid "IMPORTING APT-MOVE CACHE"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:55
msgid ""
"You can import the apt-move generated cache into apt-proxy using the "
"following command:"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:58
#, no-wrap
msgid " apt-proxy-import -r /var/cache/apt-move\n"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:61
msgid ""
"This tells apt-proxy-import to recuse over each directory in the apt-move "
"cache."
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:63
msgid "\\ /etc/apt-proxy/apt-proxy\\&.conf"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:66
msgid ""
"apt-proxy-import does not use I<max_age> or I<max_versions> to clean the "
"cache directory on import."
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:68
msgid "It does not yet import source.tar.gz or Packages files."
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:70
msgid "You must run it as the apt-proxy user or as root."
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:72
msgid ""
"Chris Halls E<lt>halls at debian.orgE<gt>, Manuel Estrada Sainz "
"E<lt>ranty at debian.orgE<gt>"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-import.8:77 doc/apt-proxy-v1tov2.8:29
msgid "B<apt-proxy>(8), B<apt-proxy.conf>(5)"
msgstr ""
-# type: TH
+#. type: TH
#: doc/apt-proxy-v1tov2.8:1
#, no-wrap
msgid "APT-PROXY-V1TOV2"
msgstr ""
-# type: TH
+#. type: TH
#: doc/apt-proxy-v1tov2.8:1
#, no-wrap
msgid "November 2002"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-v1tov2.8:4
msgid "apt-proxy-v1tov2 - Updates apt-proxy configuration to the new format."
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-v1tov2.8:7
msgid "B<apt-proxy-v1tov2> [v1_conf [v2_sample_conf]] E<gt> v2_conf"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-v1tov2.8:11
msgid ""
"apt-proxy-v1tov2 tries to update I<v2_sample_conf> with the configuration "
"found in I<v1_conf> and writes the result to I<stdout>."
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-v1tov2.8:14
msgid ""
"By default, it will use /etc/apt-proxy/apt-proxy.conf for I<v1_conf> and "
"/etc/apt-proxy/apt-proxy-v2.conf for I<v2_sample_conf>."
msgstr ""
-# type: SH
+#. type: SH
#: doc/apt-proxy-v1tov2.8:15
#, no-wrap
msgid "NOTES"
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-v1tov2.8:17
msgid "Hopefully the package maintainer scripts have already run this for you."
msgstr ""
-# type: Plain text
+#. type: Plain text
#: doc/apt-proxy-v1tov2.8:24
msgid "Manuel Estrada Sainz E<lt>ranty at debian.orgE<gt>"
msgstr ""
More information about the apt-proxy-devel
mailing list