[apt-proxy-devel] r654 - in trunk: . debian doc/po

[Chris Halls]

Author: halls
Date: Tue May  1 13:51:02 2007
New Revision: 654

Modified:
   trunk/   (props changed)
   trunk/debian/changelog
   trunk/doc/po/apt-proxy.pot
   trunk/doc/po/fr.po
Log:
Merged revisions 643 via svnmerge from 
svn+ssh://svn.debian.org/svn/apt-proxy/branches/etch

........
  r643 | halls | 2007-01-24 12:54:07 +0000 (Wed, 24 Jan 2007) | 14 lines
  
  Import NMU:
  	apt-proxy (1.9.35-0.1) unstable; urgency=high
  
  	  * Non-maintainer upload.
  	  * Use "self.filelist" instead of "filelist" in ftpListResult() (in
  	    fetchers.py), as the latter is a non-existant variable, giving 500
  	    errors when SIZE failed in an FTP session for some reason.
  	    (Closes: #402481)
  	  * Make the FTP fetcher unescape file names before fetching, which makes
  	    ~ in file names work again with FTP; patch from Ben Hutchings.
  	    (Closes: #393483, #386344)
  
  	 -- Steinar H. Gunderson <sesse at debian.org>  Wed, 27 Dec 2006 12:20:45 +0100
........


Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Tue May  1 13:51:02 2007
@@ -1,7 +1,7 @@
 apt-proxy (1.9.36~svn) unstable; urgency=low
 
   [ Chris Halls ]
-  * Acknowledge NMU by Steinar H. Gunderson, thanks! (Closes: #386344)
+  * Acknowledge NMU by Steinar H. Gunderson, thanks! (Closes: #404679)
   * Close a longstanding bug where clients would hang when receiving
     files from the cache. The problem was caused by reusing the same
     file handle for several requests at once.
@@ -32,6 +32,19 @@
 
  -- Chris Halls <halls at debian.org>  Tue, 17 Apr 2007 22:53:19 +0100
 
+apt-proxy (1.9.35-0.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Use "self.filelist" instead of "filelist" in ftpListResult() (in
+    fetchers.py), as the latter is a non-existant variable, giving 500
+    errors when SIZE failed in an FTP session for some reason.
+    (Closes: #402481)
+  * Make the FTP fetcher unescape file names before fetching, which makes
+    ~ in file names work again with FTP; patch from Ben Hutchings.
+    (Closes: #393483, #386344)
+
+ -- Steinar H. Gunderson <sesse at debian.org>  Wed, 27 Dec 2006 12:20:45 +0100
+
 apt-proxy (1.9.35) unstable; urgency=low
 
   * http_proxy option:

Modified: trunk/doc/po/apt-proxy.pot
==============================================================================
--- trunk/doc/po/apt-proxy.pot	(original)
+++ trunk/doc/po/apt-proxy.pot	Tue May  1 13:51:02 2007
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-08-14 12:59+0100\n"
+"POT-Creation-Date: 2006-12-27 12:26+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"
@@ -699,7 +699,7 @@
 # type: TH
 #: doc/apt-proxy-import.8:2
 #, no-wrap
-msgid "August 2006"
+msgid "December 2006"
 msgstr ""
 
 # type: TH
@@ -708,12 +708,6 @@
 msgid "Debian GNU/Linux"
 msgstr ""
 
-# type: TH
-#: doc/apt-proxy-import.8:2 doc/apt-proxy-v1tov2.8:1
-#, no-wrap
-msgid " "
-msgstr ""
-
 # type: Plain text
 #: doc/apt-proxy-import.8:5
 msgid "apt-proxy-import - Import packages into the apt-proxy cache."

Modified: trunk/doc/po/fr.po
==============================================================================
--- trunk/doc/po/fr.po	(original)
+++ trunk/doc/po/fr.po	Tue May  1 13:51:02 2007
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: apt-proxy 1.3.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-14 12:59+0100\n"
+"POT-Creation-Date: 2006-12-27 12:26+0100\n"
 "PO-Revision-Date: 2005-10-18 19:14+0200\n"
 "Last-Translator: Sylvain Archenault <sylvain.archenault at laposte.net>\n"
 "Language-Team: French <French <debian-l10n-french at lists.debian.org>>\n"
@@ -799,9 +799,9 @@
 
 # type: TH
 #: doc/apt-proxy-import.8:2
-#, no-wrap
-msgid "August 2006"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "December 2006"
+msgstr "novembre 2002"
 
 # type: TH
 #: doc/apt-proxy-import.8:2 doc/apt-proxy-v1tov2.8:1
@@ -809,12 +809,6 @@
 msgid "Debian GNU/Linux"
 msgstr "Debian GNU/Linux"
 
-# type: TH
-#: doc/apt-proxy-import.8:2 doc/apt-proxy-v1tov2.8:1
-#, fuzzy, no-wrap
-msgid " "
-msgstr " "
-
 # type: Plain text
 #: doc/apt-proxy-import.8:5
 msgid "apt-proxy-import - Import packages into the apt-proxy cache."
@@ -1086,6 +1080,11 @@
 msgstr "Manuel Estrada Sainz E<lt>ranty at debian.orgE<gt>"
 
 # type: TH
+#, fuzzy
+#~ msgid " "
+#~ msgstr " "
+
+# type: TH
 #~ msgid "October 2005"
 #~ msgstr "Octobre 2005"