[apt-proxy-devel] r705 - in branches/1.9.36/debian: . po

Wed Dec 9 14:39:25 UTC 2009

Author: xluthi
Date: Wed Dec  9 14:39:25 2009
New Revision: 705

Log:
Finally, all lintian errors/warnings are fixed.  Let's focus now on existing bugs ;-)

Added:
   branches/1.9.36/debian/config
   branches/1.9.36/debian/pycompat
Deleted:
   branches/1.9.36/debian/preinst
Modified:
   branches/1.9.36/debian/changelog
   branches/1.9.36/debian/control
   branches/1.9.36/debian/copyright
   branches/1.9.36/debian/init.d
   branches/1.9.36/debian/po/ca.po
   branches/1.9.36/debian/po/cs.po
   branches/1.9.36/debian/po/da.po
   branches/1.9.36/debian/po/de.po
   branches/1.9.36/debian/po/es.po
   branches/1.9.36/debian/po/fr.po
   branches/1.9.36/debian/po/ja.po
   branches/1.9.36/debian/po/nl.po
   branches/1.9.36/debian/po/pt.po
   branches/1.9.36/debian/po/pt_BR.po
   branches/1.9.36/debian/po/ru.po
   branches/1.9.36/debian/po/sv.po
   branches/1.9.36/debian/po/templates.pot
   branches/1.9.36/debian/po/vi.po
   branches/1.9.36/debian/postinst
   branches/1.9.36/debian/rules
   branches/1.9.36/debian/templates

Modified: branches/1.9.36/debian/changelog
==============================================================================

--- branches/1.9.36/debian/changelog	Fri Dec  4 16:50:59 2009	(r704)
+++ branches/1.9.36/debian/changelog	Wed Dec  9 14:39:25 2009	(r705)
@@ -1,3 +1,23 @@
+apt-proxy (1.9.36.4) UNRELEASED; 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.
+
+ -- Xavier LÃ¼thi <xluthi at debian.org>  Wed, 09 Dec 2009 14:55:48 +0100
+
 apt-proxy (1.9.36.3+nmu2) unstable; urgency=low
 
   * Non-maintainer upload.

Added: branches/1.9.36/debian/config
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/1.9.36/debian/config	Wed Dec  9 14:39:25 2009	(r705)
@@ -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: branches/1.9.36/debian/control
==============================================================================
--- branches/1.9.36/debian/control	Fri Dec  4 16:50:59 2009	(r704)
+++ branches/1.9.36/debian/control	Wed Dec  9 14:39:25 2009	(r705)
@@ -2,11 +2,11 @@
 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://apt-proxy.sourceforge.net
 XS-Python-Version: current
-Build-Depends: debhelper (>= 4.1.13), po-debconf
+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

Modified: branches/1.9.36/debian/copyright
==============================================================================
--- branches/1.9.36/debian/copyright	Fri Dec  4 16:50:59 2009	(r704)
+++ branches/1.9.36/debian/copyright	Wed Dec  9 14:39:25 2009	(r705)
@@ -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: branches/1.9.36/debian/init.d
==============================================================================
--- branches/1.9.36/debian/init.d	Fri Dec  4 16:50:59 2009	(r704)
+++ branches/1.9.36/debian/init.d	Wed Dec  9 14:39:25 2009	(r705)
@@ -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: branches/1.9.36/debian/po/ca.po
==============================================================================
--- branches/1.9.36/debian/po/ca.po	Fri Dec  4 16:50:59 2009	(r704)
+++ branches/1.9.36/debian/po/ca.po	Wed Dec  9 14:39:25 2009	(r705)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
-"POT-Creation-Date: 2009-12-04 17:39+0100\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"
@@ -58,9 +58,11 @@
 #| "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."
+"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 "
@@ -74,32 +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Ã³"
+#~ 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 ""
+#~ "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."
 
-#. Type: note
-#. Description
-#: ../templates:2001
 #, 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)"
+#~| 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: branches/1.9.36/debian/po/cs.po
==============================================================================
--- branches/1.9.36/debian/po/cs.po	Fri Dec  4 16:50:59 2009	(r704)
+++ branches/1.9.36/debian/po/cs.po	Wed Dec  9 14:39:25 2009	(r705)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: apt-proxy\n"
 "Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
-"POT-Creation-Date: 2009-12-04 17:39+0100\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"
@@ -55,9 +55,11 @@
 #| "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."
+"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 "
@@ -71,32 +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"
+#~ 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 ""
+#~ "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."
 
-#. Type: note
-#. Description
-#: ../templates:2001
 #, 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)"
+#~| 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: branches/1.9.36/debian/po/da.po
==============================================================================
--- branches/1.9.36/debian/po/da.po	Fri Dec  4 16:50:59 2009	(r704)
+++ branches/1.9.36/debian/po/da.po	Wed Dec  9 14:39:25 2009	(r705)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: apt-proxy 1.9.18\n"
 "Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
-"POT-Creation-Date: 2009-12-04 17:39+0100\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"
@@ -57,9 +57,11 @@
 #| "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."
+"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 "
@@ -74,32 +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"
+#~ 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 ""
+#~ "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."
 
-#. Type: note
-#. Description
-#: ../templates:2001
 #, 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)"
+#~| 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: branches/1.9.36/debian/po/de.po
==============================================================================
--- branches/1.9.36/debian/po/de.po	Fri Dec  4 16:50:59 2009	(r704)
+++ branches/1.9.36/debian/po/de.po	Wed Dec  9 14:39:25 2009	(r705)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: apt-proxy 1.9.32\n"
 "Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
-"POT-Creation-Date: 2009-12-04 17:39+0100\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"
@@ -58,9 +58,11 @@
 #| "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."
+"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 "
@@ -76,33 +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"
+#~ 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 ""
+#~ "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."
 
-#. Type: note
-#. Description
-#: ../templates:2001
 #, 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."
+#~| 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: branches/1.9.36/debian/po/es.po
==============================================================================
--- branches/1.9.36/debian/po/es.po	Fri Dec  4 16:50:59 2009	(r704)
+++ branches/1.9.36/debian/po/es.po	Wed Dec  9 14:39:25 2009	(r705)
@@ -28,7 +28,7 @@
 msgstr ""
 "Project-Id-Version: apt-proxy\n"
 "Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
-"POT-Creation-Date: 2009-12-04 17:39+0100\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"
@@ -70,9 +70,11 @@
 #: ../templates:1001
 #, fuzzy
 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."
+"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,32 +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
 #, 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)."
+#~| 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: branches/1.9.36/debian/po/fr.po
==============================================================================
--- branches/1.9.36/debian/po/fr.po	Fri Dec  4 16:50:59 2009	(r704)
+++ branches/1.9.36/debian/po/fr.po	Wed Dec  9 14:39:25 2009	(r705)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: apt-proxy_1.9.32\n"
 "Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
-"POT-Creation-Date: 2009-12-04 17:39+0100\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"
@@ -57,9 +57,11 @@
 #| "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."
+"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. "
@@ -75,33 +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"
+#~ 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 ""
+#~ "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."
 
-#. Type: note
-#. Description
-#: ../templates:2001
 #, 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."
+#~| 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: branches/1.9.36/debian/po/ja.po
==============================================================================
--- branches/1.9.36/debian/po/ja.po	Fri Dec  4 16:50:59 2009	(r704)
+++ branches/1.9.36/debian/po/ja.po	Wed Dec  9 14:39:25 2009	(r705)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: apt-proxy 1.9.17\n"
 "Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
-"POT-Creation-Date: 2009-12-04 17:39+0100\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"
@@ -57,9 +57,11 @@
 #| "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."
+"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-"
@@ -72,32 +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 "ã‚¢ãƒƒãƒ—ã‚°ãƒ¬ãƒ¼ãƒ‰ã«ã¤ã„ã¦"
+#~ 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 ""
+#~ "The upgrading script dumped some warnings and they have been mailed to "
+#~ "root at localhost."
+#~ msgstr ""
+#~ "ã‚¢ãƒƒãƒ—ã‚°ãƒ¬ãƒ¼ãƒ‰ã®ã‚¹ã‚¯ãƒªãƒ—ãƒˆã¯è¦å‘Šã‚’å¹¾ã¤ã‹å‡ºåŠ›ã—ã€root at localhost å®›ã«é€ä¿¡ã—"
+#~ "ã¾ã—ãŸã€‚"
 
-#. Type: note
-#. Description
-#: ../templates:2001
 #, 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) ã‚’è¦‹ç›´ã™å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
+#~| 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: branches/1.9.36/debian/po/nl.po
==============================================================================
--- branches/1.9.36/debian/po/nl.po	Fri Dec  4 16:50:59 2009	(r704)
+++ branches/1.9.36/debian/po/nl.po	Wed Dec  9 14:39:25 2009	(r705)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: apt-proxy\n"
 "Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
-"POT-Creation-Date: 2009-12-04 17:39+0100\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"
@@ -56,9 +56,11 @@
 #| "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."
+"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 "
@@ -72,33 +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"
+#~ 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 ""
+#~ "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."
 
-#. Type: note
-#. Description
-#: ../templates:2001
 #, 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)"
+#~| 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: branches/1.9.36/debian/po/pt.po
==============================================================================
--- branches/1.9.36/debian/po/pt.po	Fri Dec  4 16:50:59 2009	(r704)
+++ branches/1.9.36/debian/po/pt.po	Wed Dec  9 14:39:25 2009	(r705)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: apt-proxy 1.9.32\n"
 "Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
-"POT-Creation-Date: 2009-12-04 17:39+0100\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"
@@ -50,9 +50,11 @@
 #| "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."
+"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, "
@@ -67,32 +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"
+#~ 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 ""
+#~ "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."
 
-#. Type: note
-#. Description
-#: ../templates:2001
 #, 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)"
+#~| 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: branches/1.9.36/debian/po/pt_BR.po
==============================================================================
--- branches/1.9.36/debian/po/pt_BR.po	Fri Dec  4 16:50:59 2009	(r704)
+++ branches/1.9.36/debian/po/pt_BR.po	Wed Dec  9 14:39:25 2009	(r705)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: apt-proxy\n"
 "Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
-"POT-Creation-Date: 2009-12-04 17:39+0100\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"
@@ -58,9 +58,11 @@
 #| "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."
+"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 "
@@ -75,32 +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"
+#~ 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 ""
+#~ "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."
 
-#. Type: note
-#. Description
-#: ../templates:2001
 #, 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)"
+#~| 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: branches/1.9.36/debian/po/ru.po
==============================================================================
--- branches/1.9.36/debian/po/ru.po	Fri Dec  4 16:50:59 2009	(r704)
+++ branches/1.9.36/debian/po/ru.po	Wed Dec  9 14:39:25 2009	(r705)
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: apt-proxy_1.9.35-0.3_ru\n"
 "Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
-"POT-Creation-Date: 2009-12-04 17:39+0100\n"
+"POT-Creation-Date: 2009-12-08 22:51+0100\n"
 "PO-Revision-Date: 2007-03-27 12:36+1000\n"
 "Last-Translator: Yuriy Talakan' <yt at drsk.ru>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -61,9 +61,11 @@
 #| "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."
+"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 Ð½Ð° Ð¾ÑÐ½Ð¾Ð²Ðµ Ð²Ð°ÑˆÐ¸ ÑÑ‚Ð°Ñ€Ñ‹Ñ… Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐº, "
 "ÐµÑÐ»Ð¸ Ñƒ Ð²Ð°Ñ ÐµÑ‰Ðµ Ð½ÐµÑ‚ ÑÑ‚Ð¾Ð³Ð¾ Ñ„Ð°Ð¹Ð»Ð°. Ð’ Ð»ÑŽÐ±Ð¾Ð¼ ÑÐ»ÑƒÑ‡Ð°Ðµ, Ð·Ð°Ð¿Ð°ÑÐ½Ð¾Ð¹ Ñ„Ð°Ð¹Ð» Ð±ÑƒÐ´ÐµÑ‚ Ð·Ð°Ð¿Ð¸ÑÐ°Ð½ "
@@ -76,33 +78,24 @@
 "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 "Ð”ÐµÑ‚Ð°Ð»Ð¸ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ"
+#~ 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 ""
+#~ "The upgrading script dumped some warnings and they have been mailed to "
+#~ "root at localhost."
+#~ msgstr ""
+#~ "Ð¡Ñ†ÐµÐ½Ð°Ñ€Ð¸Ð¹ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½Ð¸Ð» Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð¸ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð¸Ð» Ð¸Ñ… "
+#~ "Ð½Ð°root at localhost."
 
-#. Type: note
-#. Description
-#: ../templates:2001
 #, 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)"
+#~| 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: branches/1.9.36/debian/po/sv.po
==============================================================================
--- branches/1.9.36/debian/po/sv.po	Fri Dec  4 16:50:59 2009	(r704)
+++ branches/1.9.36/debian/po/sv.po	Wed Dec  9 14:39:25 2009	(r705)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: apt-proxy 1.9.32\n"
 "Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
-"POT-Creation-Date: 2009-12-04 17:39+0100\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"
@@ -55,9 +55,11 @@
 #| "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."
+"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å "
@@ -72,32 +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"
+#~ 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 ""
+#~ "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."
 
-#. Type: note
-#. Description
-#: ../templates:2001
 #, 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)"
+#~| 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: branches/1.9.36/debian/po/templates.pot
==============================================================================
--- branches/1.9.36/debian/po/templates.pot	Fri Dec  4 16:50:59 2009	(r704)
+++ branches/1.9.36/debian/po/templates.pot	Wed Dec  9 14:39:25 2009	(r705)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
-"POT-Creation-Date: 2009-12-04 17:39+0100\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"
@@ -41,9 +41,11 @@
 #. Description
 #: ../templates:1001
 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."
+"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: branches/1.9.36/debian/po/vi.po
==============================================================================
--- branches/1.9.36/debian/po/vi.po	Fri Dec  4 16:50:59 2009	(r704)
+++ branches/1.9.36/debian/po/vi.po	Wed Dec  9 14:39:25 2009	(r705)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: apt-proxy 1.9.30\n"
 "Report-Msgid-Bugs-To: apt-proxy at packages.debian.org\n"
-"POT-Creation-Date: 2009-12-04 17:39+0100\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"
@@ -43,9 +43,11 @@
 #: ../templates:1001
 #, fuzzy
 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."
+"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,32 +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
 #, 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Â»)."
+#~| 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: branches/1.9.36/debian/postinst
==============================================================================
--- branches/1.9.36/debian/postinst	Fri Dec  4 16:50:59 2009	(r704)
+++ branches/1.9.36/debian/postinst	Wed Dec  9 14:39:25 2009	(r705)
@@ -36,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 ) \
@@ -55,11 +52,6 @@
             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

Added: branches/1.9.36/debian/pycompat
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/1.9.36/debian/pycompat	Wed Dec  9 14:39:25 2009	(r705)
@@ -0,0 +1 @@
+2

Modified: branches/1.9.36/debian/rules
==============================================================================
--- branches/1.9.36/debian/rules	Fri Dec  4 16:50:59 2009	(r704)
+++ branches/1.9.36/debian/rules	Wed Dec  9 14:39:25 2009	(r705)
@@ -25,7 +25,7 @@
 install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 	dh_install
 	dh_installdebconf

Modified: branches/1.9.36/debian/templates
==============================================================================
--- branches/1.9.36/debian/templates	Fri Dec  4 16:50:59 2009	(r704)
+++ branches/1.9.36/debian/templates	Wed Dec  9 14:39:25 2009	(r705)
@@ -7,18 +7,13 @@
  format is incompatible with previous version. Hopefully you will like the
  new format better :)
  .
- 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.
+ 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).

