Hi Chris,
I've prepared a new package version for apt-proxy. It's currently an
NMU but of course, if you've time, you can upload it as a new non-NMU
revision of the package.
You'll find attached the corresponding debdiff, the package itself
can be downloaded here:
- URL: http://mentors.debian.net/debian/pool/main/a/apt-proxy
- dget
http://mentors.debian.net/debian/pool/main/a/apt-proxy/apt-proxy_1.9.36.3+nmu2.dsc
Here is the changelog:
apt-proxy (1.9.36.3+nmu2) unstable; urgency=low
* Non-maintainer upload.
* set Apt::Cache-Limit to a high value (Closes: #370610)
* Correct handling of empty configuration file options (Closes: #285770)
* Path for bunzip2 corrected (Closes: #391869)
* doc/apt-proxy-import.8: explain what import means (Closes: #355523)
* doc/apt-proxy.conf.5:
- document file: backends (Closes: #386562)
- document debug option (Closes: #272155)
* French program translation update (Closes: #485078)
* debian/default: Setting a nice value (Closes: #275658)
* debian/init.d: Prevent apt-proxy to fail silently during startup
(Closes: #432221)
* Fix some easy to correct lintian warnings:
- debian/control: Build-Depends on python (>=2.3.5) instead of 2.3.5-1
- debian/rules: dh_python statement removed as useless
- debian/postinst: deprecated chown usage fixed
- debian/copyright: clear copyright notice added
- debian/preinst, prerm, postrm: 'set -e' added
*
-- Xavier Luthi <[EMAIL PROTECTED]> Fri, 14 Nov 2008 11:46:12 +0100
Cheers,
Xavierdiff -Nru apt-proxy-1.9.36.3+nmu1/apt_proxy/apt_proxy_conf.py
apt-proxy-1.9.36.3+nmu2/apt_proxy/apt_proxy_conf.py
--- apt-proxy-1.9.36.3+nmu1/apt_proxy/apt_proxy_conf.py 2007-06-04
11:54:39.000000000 +0200
+++ apt-proxy-1.9.36.3+nmu2/apt_proxy/apt_proxy_conf.py 2008-11-13
16:58:48.000000000 +0100
@@ -45,12 +45,17 @@
def getint(self, section, option):
value = self.get(section, option)
+ # see bug #285770
+ if len(value) == 0:
+ return None
return int(value)
def gettime(self, section, option):
mult = 1
value = self.get(section, option)
if len(value) == 0:
- raise ConfigError("Configuration parse error: [%s] %s" % (section,
option))
+ # see bug #285770
+ #raise ConfigError("Configuration parse error: [%s] %s" %
(section, option))
+ return None
suffix = value[-1].lower()
if suffix in self.time_multipliers.keys():
mult = self.time_multipliers[suffix]
@@ -196,6 +201,10 @@
# read default values
for name,default,getmethod in self.CONFIG_ITEMS:
value = self.parseConfigValue(config, DEFAULTSECT, name, default,
getmethod)
+ # see bug #285770
+ if value == None:
+ value = default
+ # end of bug #285770
setattr(self, name, value)
if value != default and name != "telnet_pass":
log.debug("config value %s=%s"%(name, value), 'config')
diff -Nru apt-proxy-1.9.36.3+nmu1/apt_proxy/cache.py
apt-proxy-1.9.36.3+nmu2/apt_proxy/cache.py
--- apt-proxy-1.9.36.3+nmu1/apt_proxy/cache.py 2008-06-28 20:31:24.000000000
+0200
+++ apt-proxy-1.9.36.3+nmu2/apt_proxy/cache.py 2008-11-14 10:13:27.000000000
+0100
@@ -597,7 +597,7 @@
elif re.search(r"\.gz$", self.path):
self.worker = FileVerifierProcess(self, '/bin/gunzip', '-t', '-v',
self.path)
elif re.search(r"\.bz2$", self.path):
- self.worker = FileVerifierProcess(self, '/usr/bin/bunzip2',
'--test', self.path)
+ self.worker = FileVerifierProcess(self, '/bin/bunzip2', '--test',
self.path)
else:
# Unknown file, just check it is not 0 size
try:
diff -Nru apt-proxy-1.9.36.3+nmu1/apt_proxy/packages.py
apt-proxy-1.9.36.3+nmu2/apt_proxy/packages.py
--- apt-proxy-1.9.36.3+nmu1/apt_proxy/packages.py 2007-08-14
23:02:44.000000000 +0200
+++ apt-proxy-1.9.36.3+nmu2/apt_proxy/packages.py 2008-11-13
16:55:50.000000000 +0100
@@ -105,7 +105,8 @@
#'APT' : '',
'APT::Architecture' : 'i386', # TODO: Fix this, see bug #436011 and
#285360
#'APT::Default-Release' : 'unstable',
-
+ 'APT::Cache-Limit' : '100000000',
+
'Dir':'.', # /
'Dir::State' : 'apt/', # var/lib/apt/
'Dir::State::Lists': 'lists/', # lists/
diff -Nru apt-proxy-1.9.36.3+nmu1/debian/changelog
apt-proxy-1.9.36.3+nmu2/debian/changelog
--- apt-proxy-1.9.36.3+nmu1/debian/changelog 2008-06-28 20:33:47.000000000
+0200
+++ apt-proxy-1.9.36.3+nmu2/debian/changelog 2008-11-14 11:46:42.000000000
+0100
@@ -1,3 +1,27 @@
+apt-proxy (1.9.36.3+nmu2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * set Apt::Cache-Limit to a high value (Closes: #370610)
+ * Correct handling of empty configuration file options (Closes: #285770)
+ * Path for bunzip2 corrected (Closes: #391869)
+ * doc/apt-proxy-import.8: explain what import means (Closes: #355523)
+ * doc/apt-proxy.conf.5:
+ - document file: backends (Closes: #386562)
+ - document debug option (Closes: #272155)
+ * French program translation update (Closes: #485078)
+ * debian/default: Setting a nice value (Closes: #275658)
+ * debian/init.d: Prevent apt-proxy to fail silently during startup
+ (Closes: #432221)
+ * Fix some easy to correct lintian warnings:
+ - debian/control: Build-Depends on python (>=2.3.5) instead of 2.3.5-1
+ - debian/rules: dh_python statement removed as useless
+ - debian/postinst: deprecated chown usage fixed
+ - debian/copyright: clear copyright notice added
+ - debian/preinst, prerm, postrm: 'set -e' added
+ *
+
+ -- Xavier Luthi <[EMAIL PROTECTED]> Fri, 14 Nov 2008 11:46:12 +0100
+
apt-proxy (1.9.36.3+nmu1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru apt-proxy-1.9.36.3+nmu1/debian/control
apt-proxy-1.9.36.3+nmu2/debian/control
--- apt-proxy-1.9.36.3+nmu1/debian/control 2008-04-29 10:27:10.000000000
+0200
+++ apt-proxy-1.9.36.3+nmu2/debian/control 2008-11-14 11:09:18.000000000
+0100
@@ -3,10 +3,10 @@
Priority: extra
Maintainer: Chris Halls <[EMAIL PROTECTED]>
Uploaders: Otavio Salvador <[EMAIL PROTECTED]>
-Standards-Version: 3.7.2
+Standards-Version: 3.8.0
XS-Python-Version: current
Build-Depends: debhelper (>= 4.1.13), po-debconf
-Build-Depends-Indep: help2man, python-twisted-web (>= 0.6), python (>=
2.3.5-1), python-apt, po4a (>= 0.18.1), python-central (>= 0.5)
+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
diff -Nru apt-proxy-1.9.36.3+nmu1/debian/copyright
apt-proxy-1.9.36.3+nmu2/debian/copyright
--- apt-proxy-1.9.36.3+nmu1/debian/copyright 2002-07-23 14:48:09.000000000
+0200
+++ apt-proxy-1.9.36.3+nmu2/debian/copyright 2008-11-14 11:07:35.000000000
+0100
@@ -1,5 +1,7 @@
This is the Debian GNU/Linux packaged version of apt-proxy
+Copyright (C) 2002 Manuel Estrada Sainz <[EMAIL PROTECTED]>
+
Version 2 was written by Manuel Estrada Sainz. The original version was by
Rusty Russel. The package is maintained by Chris Halls
diff -Nru apt-proxy-1.9.36.3+nmu1/debian/default
apt-proxy-1.9.36.3+nmu2/debian/default
--- apt-proxy-1.9.36.3+nmu1/debian/default 2004-09-10 18:06:54.000000000
+0200
+++ apt-proxy-1.9.36.3+nmu2/debian/default 2008-11-13 14:10:19.000000000
+0100
@@ -5,3 +5,8 @@
## Log file
#logfile=/var/log/apt-proxy.log
+
+## change process priority as requested in http://bugs.debian.org/275658
+# and do that silent
+renice 5 $$ >/dev/null
+
diff -Nru apt-proxy-1.9.36.3+nmu1/debian/init.d
apt-proxy-1.9.36.3+nmu2/debian/init.d
--- apt-proxy-1.9.36.3+nmu1/debian/init.d 2008-03-25 14:23:39.000000000
+0100
+++ apt-proxy-1.9.36.3+nmu2/debian/init.d 2008-11-13 16:51:55.000000000
+0100
@@ -14,6 +14,7 @@
pidfile=$rundir/apt-proxy.pid
logfile=/var/log/apt-proxy.log
application=/usr/sbin/apt-proxy
+process=$(basename $application)
twistd=/usr/bin/twistd
user=aptproxy
group=nogroup
@@ -53,6 +54,8 @@
start-stop-daemon --start --quiet --exec $twistd -- \
--pidfile=$pidfile --rundir=$rundir --python=$application \
--logfile=$logfile --no_save
+ sleep 1 # for some startup time and then check
+ ps -eo cmd | grep -q ^$process
log_end_msg $?
;;
diff -Nru apt-proxy-1.9.36.3+nmu1/debian/postinst
apt-proxy-1.9.36.3+nmu2/debian/postinst
--- apt-proxy-1.9.36.3+nmu1/debian/postinst 2007-05-01 15:56:19.000000000
+0200
+++ apt-proxy-1.9.36.3+nmu2/debian/postinst 2008-11-14 11:03:43.000000000
+0100
@@ -1,5 +1,7 @@
#! /bin/sh
+set -e
+
NAME=apt-proxy
APTPROXY_USER=aptproxy
APTPROXY_LOGFILE=/var/log/$NAME.log
@@ -64,7 +66,7 @@
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
;;
diff -Nru apt-proxy-1.9.36.3+nmu1/debian/postrm
apt-proxy-1.9.36.3+nmu2/debian/postrm
--- apt-proxy-1.9.36.3+nmu1/debian/postrm 2002-11-26 23:08:35.000000000
+0100
+++ apt-proxy-1.9.36.3+nmu2/debian/postrm 2008-11-14 10:53:47.000000000
+0100
@@ -1,5 +1,7 @@
#!/bin/sh
+set -e
+
#DEBHELPER#
NAME=apt-proxy
diff -Nru apt-proxy-1.9.36.3+nmu1/debian/preinst
apt-proxy-1.9.36.3+nmu2/debian/preinst
--- apt-proxy-1.9.36.3+nmu1/debian/preinst 2002-12-01 18:38:48.000000000
+0100
+++ apt-proxy-1.9.36.3+nmu2/debian/preinst 2008-11-14 10:52:52.000000000
+0100
@@ -1,5 +1,7 @@
#! /bin/sh
+set -e
+
#DEBHELPER#
# Source debconf library.
diff -Nru apt-proxy-1.9.36.3+nmu1/debian/prerm
apt-proxy-1.9.36.3+nmu2/debian/prerm
--- apt-proxy-1.9.36.3+nmu1/debian/prerm 2005-08-18 17:48:31.000000000
+0200
+++ apt-proxy-1.9.36.3+nmu2/debian/prerm 2008-11-14 10:53:13.000000000
+0100
@@ -1,5 +1,7 @@
#!/bin/sh
+set -e
+
#DEBHELPER#
NAME=apt-proxy
diff -Nru apt-proxy-1.9.36.3+nmu1/debian/rules
apt-proxy-1.9.36.3+nmu2/debian/rules
--- apt-proxy-1.9.36.3+nmu1/debian/rules 2007-05-01 15:56:19.000000000
+0200
+++ apt-proxy-1.9.36.3+nmu2/debian/rules 2008-11-14 11:01:14.000000000
+0100
@@ -35,7 +35,7 @@
dh_installchangelogs
dh_installlogrotate
dh_pycentral
- dh_python
+ #dh_python
dh_installinit
#install -g root -o root -m 755 \
@@ -44,7 +44,7 @@
# apt-proxy-import debian/apt-proxy/usr/sbin/apt-proxy-import
#install -g root -o root -m 644 \
# apt-proxy.conf debian/apt-proxy/etc/apt-proxy/apt-proxy.conf
-
+
# 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
diff -Nru apt-proxy-1.9.36.3+nmu1/doc/apt-proxy.8
apt-proxy-1.9.36.3+nmu2/doc/apt-proxy.8
--- apt-proxy-1.9.36.3+nmu1/doc/apt-proxy.8 2006-08-04 01:54:46.000000000
+0200
+++ apt-proxy-1.9.36.3+nmu2/doc/apt-proxy.8 2008-11-05 13:40:39.000000000
+0100
@@ -10,8 +10,8 @@
.SH "DESCRIPTION"
\fBapt\-proxy\fP is a python program designed to be run as an stand alone
server via twistd, and provides a clean, caching, intelligent proxy for
-\fBapt\-get\fP, which speaks HTTP to apt\-get clients, and http, ftp or rsync
to
-the backend server(s)\&. apt-proxy listens by default on port 9999\&.
+\fBapt\-get\fP, which speaks HTTP to apt\-get clients, and http, ftp, rsync or
+file to the backend server(s)\&. apt-proxy listens by default on port 9999\&.
.PP
.TP
\fB\-h\fR, \fB\-\-help\fR
diff -Nru apt-proxy-1.9.36.3+nmu1/doc/apt-proxy.conf.5
apt-proxy-1.9.36.3+nmu2/doc/apt-proxy.conf.5
--- apt-proxy-1.9.36.3+nmu1/doc/apt-proxy.conf.5 2008-03-25
13:46:14.000000000 +0100
+++ apt-proxy-1.9.36.3+nmu2/doc/apt-proxy.conf.5 2008-11-12
14:37:41.000000000 +0100
@@ -95,6 +95,16 @@
\fIamount\fR bytes per second. Note this applies to \fBhttp\fP and \fBrsync\fP
backends only. Default: no limit
+.TP
+.B debug = \fIlogging_string\fR
+apt\-proxy is logging some information in the file
+/var/log/apt-proxy.log. The \fBdebug\fP parameter is used to
+determine what to log. The \fIlogging_string\fR consists of a space
+separated list of domain:level pair(s). All logging requests belong
+to one domain and have a defined level associated. To log all
+messages, debug must be set to "all:9". For more information on the
+debugging features, please see the apt-proxy/misc.py file. Default: all:3
+
.PP
.SH RESOURCES
All other sections in the configuration file will be interpreted as resource
@@ -109,7 +119,7 @@
A list one or more URLs referring to servers which hold debian packages\&.
.br
.br
-\fIprotocol\fP: internet protocol to use: http, ftp or rsync
+\fIprotocol\fP: internet protocol to use: http, ftp, rsync or even file (for
local repositories)
.br
\fIserver\fP: hostname of the backend server to contact
.br
diff -Nru apt-proxy-1.9.36.3+nmu1/doc/po/apt-proxy.pot
apt-proxy-1.9.36.3+nmu2/doc/po/apt-proxy.pot
--- apt-proxy-1.9.36.3+nmu1/doc/po/apt-proxy.pot 2008-04-29
10:45:36.000000000 +0200
+++ apt-proxy-1.9.36.3+nmu2/doc/po/apt-proxy.pot 2008-11-14
11:37:46.000000000 +0100
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-04-29 09:45+0100\n"
+"POT-Creation-Date: 2008-11-13 14:13+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -60,8 +60,8 @@
msgid ""
"B<apt-proxy> is a python program designed to be run as an stand alone server "
"via twistd, and provides a clean, caching, intelligent proxy for B<apt-get>, "
-"which speaks HTTP to apt-get clients, and http, ftp or rsync to the backend "
-"server(s)\\&. apt-proxy listens by default on port 9999\\&."
+"which speaks HTTP to apt-get clients, and http, ftp, rsync or file to the "
+"backend server(s)\\&. apt-proxy listens by default on port 9999\\&."
msgstr ""
# type: TP
@@ -160,7 +160,7 @@
msgstr ""
# 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
+#: doc/apt-proxy.8:56 doc/apt-proxy.conf.5:218 doc/apt-proxy-import.8:61
doc/apt-proxy-v1tov2.8:18
#, no-wrap
msgid "FILES"
msgstr ""
@@ -171,7 +171,7 @@
msgstr ""
# 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
+#: doc/apt-proxy.8:61 doc/apt-proxy.conf.5:222 doc/apt-proxy-import.8:72
doc/apt-proxy-v1tov2.8:24
#, no-wrap
msgid "SEE ALSO"
msgstr ""
@@ -182,7 +182,7 @@
msgstr ""
# type: SH
-#: doc/apt-proxy.8:68 doc/apt-proxy.conf.5:221 doc/apt-proxy-import.8:63
+#: doc/apt-proxy.8:68 doc/apt-proxy.conf.5:231 doc/apt-proxy-import.8:63
#, no-wrap
msgid "BUGS"
msgstr ""
@@ -298,7 +298,7 @@
msgstr ""
# type: TP
-#: doc/apt-proxy.conf.5:33 doc/apt-proxy.conf.5:132
+#: doc/apt-proxy.conf.5:33 doc/apt-proxy.conf.5:142
#, no-wrap
msgid "B<min_refresh_delay>"
msgstr ""
@@ -311,7 +311,7 @@
msgstr ""
# type: TP
-#: doc/apt-proxy.conf.5:38 doc/apt-proxy.conf.5:103
+#: doc/apt-proxy.conf.5:38 doc/apt-proxy.conf.5:113
#, no-wrap
msgid "B<timeout>"
msgstr ""
@@ -380,7 +380,7 @@
msgstr ""
# type: TP
-#: doc/apt-proxy.conf.5:68 doc/apt-proxy.conf.5:118
+#: doc/apt-proxy.conf.5:68 doc/apt-proxy.conf.5:128
#, no-wrap
msgid "B<passive_ftp>"
msgstr ""
@@ -394,7 +394,7 @@
msgstr ""
# type: TP
-#: doc/apt-proxy.conf.5:74 doc/apt-proxy.conf.5:127
+#: doc/apt-proxy.conf.5:74 doc/apt-proxy.conf.5:137
#, no-wrap
msgid "B<http_proxy>"
msgstr ""
@@ -449,26 +449,44 @@
"backends only. Default: no limit"
msgstr ""
+# type: TP
+#: doc/apt-proxy.conf.5:98
+#, no-wrap
+msgid "B<debug = >I<logging_string>"
+msgstr ""
+
+# type: Plain text
+#: doc/apt-proxy.conf.5:107
+msgid ""
+"apt-proxy is logging some information in the file /var/log/apt-proxy.log. "
+"The B<debug> parameter is used to determine what to log. The "
+"I<logging_string> consists of a space separated list of domain:level "
+"pair(s). All logging requests belong to one domain and have a defined level "
+"associated. To log all messages, debug must be set to \"all:9\". For more "
+"information on the debugging features, please see the apt-proxy/misc.py "
+"file. Default: all:3"
+msgstr ""
+
# type: SH
-#: doc/apt-proxy.conf.5:99
+#: doc/apt-proxy.conf.5:109
#, no-wrap
msgid "RESOURCES"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:102
+#: doc/apt-proxy.conf.5:112
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
-#: doc/apt-proxy.conf.5:106
+#: doc/apt-proxy.conf.5:116
msgid "Overrides the global timeout"
msgstr ""
# type: TP
-#: doc/apt-proxy.conf.5:107
+#: doc/apt-proxy.conf.5:117
#, no-wrap
msgid ""
"B<backends = E<lt>protocolE<gt>://E<lt>serverE<gt>/E<lt>directoryE<gt> "
@@ -476,65 +494,67 @@
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:110
+#: doc/apt-proxy.conf.5:120
msgid "A list one or more URLs referring to servers which hold debian
packages\\&."
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:113
-msgid "I<protocol>: internet protocol to use: http, ftp or rsync"
+#: doc/apt-proxy.conf.5:123
+msgid ""
+"I<protocol>: internet protocol to use: http, ftp, rsync or even file (for "
+"local repositories)"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:115
+#: doc/apt-proxy.conf.5:125
msgid "I<server>: hostname of the backend server to contact"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:117
+#: doc/apt-proxy.conf.5:127
msgid "I<directory>: directory name to prepend requests to for this server"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:121
+#: doc/apt-proxy.conf.5:131
msgid "Override the global setting of passive_ftp"
msgstr ""
# type: TP
-#: doc/apt-proxy.conf.5:122
+#: doc/apt-proxy.conf.5:132
#, no-wrap
msgid "B<bandwidth_limit>"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:126
+#: doc/apt-proxy.conf.5:136
msgid ""
"Set a bandwidth limit for downloads for this resource, overriding the global "
"bandwidth_limit"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:131
+#: doc/apt-proxy.conf.5:141
msgid ""
"Specify B<[username:[EMAIL PROTECTED]:port> to use an upstream proxy, "
"overriding the global http_proxy."
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:136
+#: doc/apt-proxy.conf.5:146
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
-#: doc/apt-proxy.conf.5:137
+#: doc/apt-proxy.conf.5:147
#, no-wrap
msgid "CONFIGURATION EXAMPLES"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:142
+#: doc/apt-proxy.conf.5:152
msgid ""
"To access a resource that's listed under a specific section name, simply "
"append the section name (without the brackets) to the end of your deb source "
@@ -542,17 +562,17 @@
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:144
+#: doc/apt-proxy.conf.5:154
msgid "B<Debian main>"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:147
+#: doc/apt-proxy.conf.5:157
msgid "This example shows how to give clients access to the main Debian
archive:"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:151
+#: doc/apt-proxy.conf.5:161
#, no-wrap
msgid ""
"[debian]\n"
@@ -561,25 +581,25 @@
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:156
+#: doc/apt-proxy.conf.5:166
msgid "Using this configuration, the client would use a I<sources.list> entry
like:"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:159
+#: doc/apt-proxy.conf.5:169
#, no-wrap
msgid " deb http://server:9999/debian woody main\n"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:164
+#: doc/apt-proxy.conf.5:174
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
-#: doc/apt-proxy.conf.5:167
+#: doc/apt-proxy.conf.5:177
#, no-wrap
msgid ""
" "
@@ -587,12 +607,12 @@
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:170
+#: doc/apt-proxy.conf.5:180
msgid "and if that failed,"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:173
+#: doc/apt-proxy.conf.5:183
#, no-wrap
msgid ""
" "
@@ -600,12 +620,12 @@
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:176
+#: doc/apt-proxy.conf.5:186
msgid "and apt-proxy will place the downloaded package in"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:178
+#: doc/apt-proxy.conf.5:188
#, no-wrap
msgid ""
" "
@@ -613,23 +633,23 @@
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:181
+#: doc/apt-proxy.conf.5:191
msgid "B<backports.org>"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:183
+#: doc/apt-proxy.conf.5:193
msgid "The backports.org website tells you to use this I<sources.list> line:"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:186
+#: doc/apt-proxy.conf.5:196
#, no-wrap
msgid " deb http://www.backports.org/debian sarge-backports main\n"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:190
+#: doc/apt-proxy.conf.5:200
msgid ""
"You can add this to apt-proxy by creating a new section in "
"I<apt-proxy\\&.conf>\\&. In the new section, add a backends entry for the "
@@ -637,7 +657,7 @@
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:194
+#: doc/apt-proxy.conf.5:204
#, no-wrap
msgid ""
" [backports]\n"
@@ -645,7 +665,7 @@
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:199
+#: doc/apt-proxy.conf.5:209
msgid ""
"On the clients, replace the URL with one pointing to the apt-proxy resource "
"name, in the form I<http://hostname:port/backend>. If your apt-proxy "
@@ -653,46 +673,46 @@
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:202
+#: doc/apt-proxy.conf.5:212
#, no-wrap
msgid " deb http://proxy:9999/backports sarge-backports main\n"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:207
+#: doc/apt-proxy.conf.5:217
msgid ""
"For many more examples, see the supplied "
"/etc/apt-proxy/apt-proxy\\&.conf\\&."
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:210 doc/apt-proxy-v1tov2.8:20
+#: doc/apt-proxy.conf.5:220 doc/apt-proxy-v1tov2.8:20
msgid "/etc/apt-proxy/apt-proxy\\&.conf"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:212 doc/apt-proxy-v1tov2.8:22
+#: doc/apt-proxy.conf.5:222 doc/apt-proxy-v1tov2.8:22
msgid "/etc/apt-proxy/apt-proxy-v2\\&.conf"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:218
+#: doc/apt-proxy.conf.5:228
msgid "B<apt-proxy(8),> B</usr/share/doc/apt-proxy/README,>
B<apt-proxy-import(8)>"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:223
+#: doc/apt-proxy.conf.5:233
msgid "Plenty sure. Please report."
msgstr ""
# type: SH
-#: doc/apt-proxy.conf.5:224
+#: doc/apt-proxy.conf.5:234
#, no-wrap
msgid "AUTHOR"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:225
+#: doc/apt-proxy.conf.5:235
msgid ""
"apt-proxy v2 was written by Manuel Estrada Sainz "
"E<lt>[EMAIL PROTECTED]<gt>\\&."
@@ -707,7 +727,7 @@
# type: TH
#: doc/apt-proxy-import.8:2
#, no-wrap
-msgid "April 2008"
+msgid "November 2008"
msgstr ""
# type: TH
diff -Nru apt-proxy-1.9.36.3+nmu1/doc/po/fr.po
apt-proxy-1.9.36.3+nmu2/doc/po/fr.po
--- apt-proxy-1.9.36.3+nmu1/doc/po/fr.po 2008-04-29 10:25:22.000000000
+0200
+++ apt-proxy-1.9.36.3+nmu2/doc/po/fr.po 2008-11-14 10:45:07.000000000
+0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-29 09:15+0100\n"
+"POT-Creation-Date: 2008-11-13 14:13+0100\n"
"PO-Revision-Date: 2008-04-02 06:20+0200\n"
"Last-Translator: Sylvain Archenault <[EMAIL PROTECTED]>\n"
"Language-Team: French <French <[EMAIL PROTECTED]>>\n"
@@ -61,11 +61,12 @@
# type: Plain text
#: doc/apt-proxy.8:15
+#, fuzzy
msgid ""
"B<apt-proxy> is a python program designed to be run as an stand alone server "
"via twistd, and provides a clean, caching, intelligent proxy for B<apt-get>, "
-"which speaks HTTP to apt-get clients, and http, ftp or rsync to the backend "
-"server(s)\\&. apt-proxy listens by default on port 9999\\&."
+"which speaks HTTP to apt-get clients, and http, ftp, rsync or file to the "
+"backend server(s)\\&. apt-proxy listens by default on port 9999\\&."
msgstr ""
"B<apt-proxy> est un logiciel �crit en python, con�u pour fonctionner de lui-"
"m�me via twistd et qui fournit un serveur mandataire (��proxy��) propre, "
@@ -192,7 +193,7 @@
"mandataire (��proxy��)."
# type: SH
-#: doc/apt-proxy.8:56 doc/apt-proxy.conf.5:208 doc/apt-proxy-import.8:61
+#: doc/apt-proxy.8:56 doc/apt-proxy.conf.5:218 doc/apt-proxy-import.8:61
#: doc/apt-proxy-v1tov2.8:18
#, no-wrap
msgid "FILES"
@@ -204,7 +205,7 @@
msgstr "/etc/apt-proxy/apt-proxy.conf ou /etc/apt-proxy/apt-proxy-v2.conf"
# type: SH
-#: doc/apt-proxy.8:61 doc/apt-proxy.conf.5:212 doc/apt-proxy-import.8:72
+#: doc/apt-proxy.8:61 doc/apt-proxy.conf.5:222 doc/apt-proxy-import.8:72
#: doc/apt-proxy-v1tov2.8:24
#, no-wrap
msgid "SEE ALSO"
@@ -216,7 +217,7 @@
msgstr "B<apt-proxy.conf>(5), B<apt-proxy-import>(8)"
# type: SH
-#: doc/apt-proxy.8:68 doc/apt-proxy.conf.5:221 doc/apt-proxy-import.8:63
+#: doc/apt-proxy.8:68 doc/apt-proxy.conf.5:231 doc/apt-proxy-import.8:63
#, no-wrap
msgid "BUGS"
msgstr "ANOMALIES"
@@ -351,7 +352,7 @@
msgstr "Le port TCP sur lequel apt-proxy sera � l'�coute des requ�tes."
# type: TP
-#: doc/apt-proxy.conf.5:33 doc/apt-proxy.conf.5:132
+#: doc/apt-proxy.conf.5:33 doc/apt-proxy.conf.5:142
#, no-wrap
msgid "B<min_refresh_delay>"
msgstr "B<min_refresh_delay>"
@@ -367,7 +368,7 @@
"pas d�pass�s cet �ge."
# type: TP
-#: doc/apt-proxy.conf.5:38 doc/apt-proxy.conf.5:103
+#: doc/apt-proxy.conf.5:38 doc/apt-proxy.conf.5:113
#, no-wrap
msgid "B<timeout>"
msgstr "B<timeout>"
@@ -452,7 +453,7 @@
"correctement et devrait �tre d�sactiv�."
# type: TP
-#: doc/apt-proxy.conf.5:68 doc/apt-proxy.conf.5:118
+#: doc/apt-proxy.conf.5:68 doc/apt-proxy.conf.5:128
#, no-wrap
msgid "B<passive_ftp>"
msgstr "B<passive_ftp>"
@@ -469,7 +470,7 @@
"utiliser le FTP actif � la place. D�faut�: on"
# type: TP
-#: doc/apt-proxy.conf.5:74 doc/apt-proxy.conf.5:127
+#: doc/apt-proxy.conf.5:74 doc/apt-proxy.conf.5:137
#, no-wrap
msgid "B<http_proxy>"
msgstr "B<http_proxy>"
@@ -537,14 +538,32 @@
"t�l�chargement sur un serveur. Veuillez remarquer que ceci s'applique "
"uniquement aux serveurs B<http> et B<rsync>. Par d�faut : pas de limite."
+# type: TP
+#: doc/apt-proxy.conf.5:98
+#, no-wrap
+msgid "B<debug = >I<logging_string>"
+msgstr ""
+
+# type: Plain text
+#: doc/apt-proxy.conf.5:107
+msgid ""
+"apt-proxy is logging some information in the file /var/log/apt-proxy.log. "
+"The B<debug> parameter is used to determine what to log. The "
+"I<logging_string> consists of a space separated list of domain:level pair"
+"(s). All logging requests belong to one domain and have a defined level "
+"associated. To log all messages, debug must be set to \"all:9\". For more "
+"information on the debugging features, please see the apt-proxy/misc.py "
+"file. Default: all:3"
+msgstr ""
+
# type: SH
-#: doc/apt-proxy.conf.5:99
+#: doc/apt-proxy.conf.5:109
#, no-wrap
msgid "RESOURCES"
msgstr "RESSOURCES"
# type: Plain text
-#: doc/apt-proxy.conf.5:102
+#: doc/apt-proxy.conf.5:112
msgid ""
"All other sections in the configuration file will be interpreted as resource "
"names. The options in the section apply to this resource only."
@@ -554,18 +573,18 @@
"ressources uniquement."
# type: Plain text
-#: doc/apt-proxy.conf.5:106
+#: doc/apt-proxy.conf.5:116
msgid "Overrides the global timeout"
msgstr "Supplanter le temps global d'expiration"
# type: TP
-#: doc/apt-proxy.conf.5:107
+#: doc/apt-proxy.conf.5:117
#, no-wrap
msgid "B<backends = E<lt>protocolE<gt>://E<lt>serverE<gt>/E<lt>directoryE<gt>
[...]>"
msgstr "B<backends =
E<lt>protocoleE<gt>://E<lt>serveurE<gt>/E<lt>r�pertoireE<gt> [...]>"
# type: Plain text
-#: doc/apt-proxy.conf.5:110
+#: doc/apt-proxy.conf.5:120
msgid ""
"A list one or more URLs referring to servers which hold debian packages\\&."
msgstr ""
@@ -573,34 +592,37 @@
"\\&."
# type: Plain text
-#: doc/apt-proxy.conf.5:113
-msgid "I<protocol>: internet protocol to use: http, ftp or rsync"
+#: doc/apt-proxy.conf.5:123
+#, fuzzy
+msgid ""
+"I<protocol>: internet protocol to use: http, ftp, rsync or even file (for "
+"local repositories)"
msgstr "I<Protocole>�: protocole � utiliser�parmi http, ftp et rsync"
# type: Plain text
-#: doc/apt-proxy.conf.5:115
+#: doc/apt-proxy.conf.5:125
msgid "I<server>: hostname of the backend server to contact"
msgstr "I<Serveur>�: nom d'h�te du miroir � contacter"
# type: Plain text
-#: doc/apt-proxy.conf.5:117
+#: doc/apt-proxy.conf.5:127
msgid "I<directory>: directory name to prepend requests to for this server"
msgstr ""
"I<R�pertoire>�: nom du r�pertoire o� ajouter des demandes pour ce serveur"
# type: Plain text
-#: doc/apt-proxy.conf.5:121
+#: doc/apt-proxy.conf.5:131
msgid "Override the global setting of passive_ftp"
msgstr "Supplanter la configuration globale de passive_ftp"
# type: TP
-#: doc/apt-proxy.conf.5:122
+#: doc/apt-proxy.conf.5:132
#, no-wrap
msgid "B<bandwidth_limit>"
msgstr "B<bandwidth_limit>"
# type: Plain text
-#: doc/apt-proxy.conf.5:126
+#: doc/apt-proxy.conf.5:136
msgid ""
"Set a bandwidth limit for downloads for this resource, overriding the global "
"bandwidth_limit"
@@ -609,7 +631,7 @@
"cette ressource, ignorant le param�tre global bandwidth_limit."
# type: Plain text
-#: doc/apt-proxy.conf.5:131
+#: doc/apt-proxy.conf.5:141
msgid ""
"Specify B<[username:[EMAIL PROTECTED]:port> to use an upstream proxy, "
"overriding the global http_proxy."
@@ -618,7 +640,7 @@
"un proxy amont, ignorant le param�tre global http_proxy."
# type: Plain text
-#: doc/apt-proxy.conf.5:136
+#: doc/apt-proxy.conf.5:146
msgid ""
"Override the global min_refresh_delay for this backend. Set this to the "
"interval at which this archive is usually refreshed."
@@ -628,13 +650,13 @@
"rafra�chie."
# type: SH
-#: doc/apt-proxy.conf.5:137
+#: doc/apt-proxy.conf.5:147
#, no-wrap
msgid "CONFIGURATION EXAMPLES"
msgstr "EXEMPLES DE CONFIGURATION"
# type: Plain text
-#: doc/apt-proxy.conf.5:142
+#: doc/apt-proxy.conf.5:152
msgid ""
"To access a resource that's listed under a specific section name, simply "
"append the section name (without the brackets) to the end of your deb source "
@@ -645,12 +667,12 @@
"fin de la ligne du fichier /etc/apt/sources.list"
# type: TH
-#: doc/apt-proxy.conf.5:144
+#: doc/apt-proxy.conf.5:154
msgid "B<Debian main>"
msgstr "B<Debian main>"
# type: Plain text
-#: doc/apt-proxy.conf.5:147
+#: doc/apt-proxy.conf.5:157
msgid ""
"This example shows how to give clients access to the main Debian archive:"
msgstr ""
@@ -658,7 +680,7 @@
"principale�:"
# type: Plain text
-#: doc/apt-proxy.conf.5:151
+#: doc/apt-proxy.conf.5:161
#, no-wrap
msgid ""
"[debian]\n"
@@ -670,7 +692,7 @@
" http://ftp.fr.debian.org/debian/\n";
# type: Plain text
-#: doc/apt-proxy.conf.5:156
+#: doc/apt-proxy.conf.5:166
msgid ""
"Using this configuration, the client would use a I<sources.list> entry like:"
msgstr ""
@@ -678,13 +700,13 @@
"list> comme ceci�:"
# type: Plain text
-#: doc/apt-proxy.conf.5:159
+#: doc/apt-proxy.conf.5:169
#, no-wrap
msgid " deb http://server:9999/debian woody main\n"
msgstr " deb http://serveur:9999/debian/ woody main\n"
# type: Plain text
-#: doc/apt-proxy.conf.5:164
+#: doc/apt-proxy.conf.5:174
msgid ""
"And so the file request `/debian/woody/main/binary-i386/x11/foo_1-1.deb' "
"would turn into a backend request of first"
@@ -693,53 +715,53 @@
"deb�� sera convertie en une demande d'abord de"
# type: Plain text
-#: doc/apt-proxy.conf.5:167
+#: doc/apt-proxy.conf.5:177
#, no-wrap
msgid "
`http://ftp.us.debian.org/debian/woody/main/binary-i386/x11/foo_1-1.deb'\n"
msgstr "
��http://ftp.us.debian.org/debian/woody/main/binary-i386/x11/foo_1-1.deb��\n";
# type: Plain text
-#: doc/apt-proxy.conf.5:170
+#: doc/apt-proxy.conf.5:180
msgid "and if that failed,"
msgstr "et, en cas d'�chec, de"
# type: Plain text
-#: doc/apt-proxy.conf.5:173
+#: doc/apt-proxy.conf.5:183
#, no-wrap
msgid "
`http://ftp.de.debian.org/debian/woody/main/binary-i386/x11/foo_1-1.deb'\n"
msgstr "
��http://ftp.fr.debian.org/debian/woody/main/binary-i386/x11/foo_1-1.deb��\n";
# type: Plain text
-#: doc/apt-proxy.conf.5:176
+#: doc/apt-proxy.conf.5:186
msgid "and apt-proxy will place the downloaded package in"
msgstr "et apt-proxy placera le paquet t�l�charg� dans"
# type: Plain text
-#: doc/apt-proxy.conf.5:178
+#: doc/apt-proxy.conf.5:188
#, no-wrap
msgid "
`/var/cache/apt-proxy/debian/debian/woody/main/binary-i386/x11/foo_1-1.deb'\\&.\n"
msgstr "
��/var/cache/apt-proxy/debian/debian/woody/main/binary-i386/x11/foo_1-1.deb��.\n"
# type: TP
-#: doc/apt-proxy.conf.5:181
+#: doc/apt-proxy.conf.5:191
msgid "B<backports.org>"
msgstr "B<backports.org>"
# type: Plain text
-#: doc/apt-proxy.conf.5:183
+#: doc/apt-proxy.conf.5:193
msgid "The backports.org website tells you to use this I<sources.list> line:"
msgstr ""
"Le site backports.org indique qu'il faut utiliser dans I<sources.list> cette "
"ligne�:"
# type: Plain text
-#: doc/apt-proxy.conf.5:186
+#: doc/apt-proxy.conf.5:196
#, no-wrap
msgid " deb http://www.backports.org/debian sarge-backports main\n"
msgstr " deb http://www.backports.org/debian sarge-backports main\n"
# type: Plain text
-#: doc/apt-proxy.conf.5:190
+#: doc/apt-proxy.conf.5:200
msgid ""
"You can add this to apt-proxy by creating a new section in I<apt-proxy\\&."
"conf>\\&. In the new section, add a backends entry for the URL:"
@@ -749,7 +771,7 @@
"pour l'URL�:"
# type: Plain text
-#: doc/apt-proxy.conf.5:194
+#: doc/apt-proxy.conf.5:204
#, no-wrap
msgid ""
" [backports]\n"
@@ -759,7 +781,7 @@
" backends = http://www.backports.org/debian\n";
# type: Plain text
-#: doc/apt-proxy.conf.5:199
+#: doc/apt-proxy.conf.5:209
msgid ""
"On the clients, replace the URL with one pointing to the apt-proxy resource "
"name, in the form I<http://hostname:port/backend>. If your apt-proxy "
@@ -770,48 +792,48 @@
"l'h�te d'apt-proxy est I<proxy> et son port est 9999, vous devez �crire�:"
# type: Plain text
-#: doc/apt-proxy.conf.5:202
+#: doc/apt-proxy.conf.5:212
#, no-wrap
msgid " deb http://proxy:9999/backports sarge-backports main\n"
msgstr " deb http://proxy:9999/backports sarge-backports main\n"
# type: Plain text
-#: doc/apt-proxy.conf.5:207
+#: doc/apt-proxy.conf.5:217
msgid ""
"For many more examples, see the supplied /etc/apt-proxy/apt-proxy\\&.conf\\&."
msgstr ""
"Pour d'autres exemples, voir le fichier /etc/apt-proxy/apt-proxy\\&.conf\\&."
# type: Plain text
-#: doc/apt-proxy.conf.5:210 doc/apt-proxy-v1tov2.8:20
+#: doc/apt-proxy.conf.5:220 doc/apt-proxy-v1tov2.8:20
msgid "/etc/apt-proxy/apt-proxy\\&.conf"
msgstr "/etc/apt-proxy/apt-proxy.conf"
# type: Plain text
-#: doc/apt-proxy.conf.5:212 doc/apt-proxy-v1tov2.8:22
+#: doc/apt-proxy.conf.5:222 doc/apt-proxy-v1tov2.8:22
msgid "/etc/apt-proxy/apt-proxy-v2\\&.conf"
msgstr "/etc/apt-proxy/apt-proxy-v2.conf"
# type: Plain text
-#: doc/apt-proxy.conf.5:218
+#: doc/apt-proxy.conf.5:228
msgid ""
"B<apt-proxy(8),> B</usr/share/doc/apt-proxy/README,> B<apt-proxy-import(8)>"
msgstr ""
"B<apt-proxy>(8), B</usr/share/doc/apt-proxy/README,>B<apt-proxy-import>(8)"
# type: Plain text
-#: doc/apt-proxy.conf.5:223
+#: doc/apt-proxy.conf.5:233
msgid "Plenty sure. Please report."
msgstr "Certainement. Veuillez nous en faire part."
# type: SH
-#: doc/apt-proxy.conf.5:224
+#: doc/apt-proxy.conf.5:234
#, no-wrap
msgid "AUTHOR"
msgstr "AUTEUR"
# type: Plain text
-#: doc/apt-proxy.conf.5:225
+#: doc/apt-proxy.conf.5:235
msgid ""
"apt-proxy v2 was written by Manuel Estrada Sainz E<lt>[EMAIL PROTECTED]<gt>"
"\\&."
@@ -827,8 +849,8 @@
# type: TH
#: doc/apt-proxy-import.8:2
#, fuzzy, no-wrap
-msgid "April 2008"
-msgstr "mars 2008"
+msgid "November 2008"
+msgstr "novembre 2002"
# type: TH
#: doc/apt-proxy-import.8:2 doc/apt-proxy-v1tov2.8:1
@@ -1108,6 +1130,10 @@
msgstr "Manuel Estrada Sainz E<lt>[EMAIL PROTECTED]<gt>"
# type: TH
+#~ msgid "April 2008"
+#~ msgstr "avril 2008"
+
+# type: TH
#~ msgid "February 2007"
#~ msgstr "Février 2007"
