diff -Nru argus-2.0.6.fixes.1.old/debian/argus-server.dirs argus-2.0.6.fixes.1/debian/argus-server.dirs
--- argus-2.0.6.fixes.1.old/debian/argus-server.dirs	2008-06-01 10:11:16.679118568 +0200
+++ argus-2.0.6.fixes.1/debian/argus-server.dirs	2008-06-01 18:43:59.471119969 +0200
@@ -1,4 +1,3 @@
-usr/bin
 usr/sbin
 usr/share
 usr/share/man
diff -Nru argus-2.0.6.fixes.1.old/debian/changelog argus-2.0.6.fixes.1/debian/changelog
--- argus-2.0.6.fixes.1.old/debian/changelog	2008-06-01 10:11:16.679118568 +0200
+++ argus-2.0.6.fixes.1/debian/changelog	2008-06-21 07:55:17.143658175 +0200
@@ -1,3 +1,18 @@
+argus (1:2.0.6.fixes.1-14.1) unstable; urgency=low
+
+  * Non-maintainer upload to fix pending l10n issues.
+  * Debconf translations:
+    - Portuguese. Closes: #443652
+    - Japanese. Closes: #463326
+    - Russian. Closes: #485006
+    - Vietnamese. Closes: #485940
+    - Galician. Closes: #485991
+    - Basque. Closes: #487158
+  * [Lintian] No longer ignore erros by "make clean"
+  * [Lintian] Add copyright information to debian/copyright
+
+ -- Christian Perrier <bubulle@debian.org>  Sun, 01 Jun 2008 18:09:15 +0200
+
 argus (1:2.0.6.fixes.1-14) unstable; urgency=low
 
   * Updated German debconf template translation (closes: #411188)
diff -Nru argus-2.0.6.fixes.1.old/debian/copyright argus-2.0.6.fixes.1/debian/copyright
--- argus-2.0.6.fixes.1.old/debian/copyright	2008-06-01 10:11:16.615132649 +0200
+++ argus-2.0.6.fixes.1/debian/copyright	2008-06-01 18:46:16.171128120 +0200
@@ -2,7 +2,8 @@
 from sources obtained from: 
 <ftp://qosient.com/dev/argus-2.0/argus-2.0.6.beta.1.tar.gz>
 
-copyright:
+Copyright © 2000-2004 QoSient, LLC
+
 argus 2.0.3 is covered under the GNU General Public License, version 2 or
 later. The GPL is located at /usr/share/common-licenses/GPL-2 on your
 Debian system.
diff -Nru argus-2.0.6.fixes.1.old/debian/po/eu.po argus-2.0.6.fixes.1/debian/po/eu.po
--- argus-2.0.6.fixes.1.old/debian/po/eu.po	1970-01-01 01:00:00.000000000 +0100
+++ argus-2.0.6.fixes.1/debian/po/eu.po	2008-06-20 07:24:25.375672000 +0200
@@ -0,0 +1,57 @@
+# translation of argus debconf to Euskara
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Xabier Bilbao <xabidu@gmail.com>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: argus-eu\n"
+"Report-Msgid-Bugs-To: apollock@debian.org\n"
+"POT-Creation-Date: 2006-11-07 20:48-0800\n"
+"PO-Revision-Date: 2008-06-14 00:40+0200\n"
+"Last-Translator: Xabier Bilbao <xabidu@gmail.com>\n"
+"Language-Team: Basque <debian-l10n-basque@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "boot, dialup, both, none"
+msgstr "sistema abiatzean, konexioan, bietan, batean ere ez"
+
+#. Type: select
+#. Description
+#: ../templates:1002
+msgid "Startup behaviour:"
+msgstr "Abiarazteko jokabidea:"
+
+#. Type: select
+#. Description
+#: ../templates:1002
+msgid ""
+"It is possible to start argus at boot time, upon initiating a PPP "
+"connection, both, or never, which requires user intervention in order to "
+"start argus."
+msgstr ""
+"Sistema abiaraztearekin batera abia daiteke argus, edo PPP konexio bat "
+"abiatzean, edo bietan, edo batean ere ez; azken kasuan erabiltzaileak berak "
+"abiarazi beharko du argus."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Should /etc/default/argus-server be overwritten?"
+msgstr "/etc/default/argus-server gainidatzi nahi duzu?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"If you select this option, the installation script will always overwrite /"
+"etc/default/argus-server. Otherwise, you will manage that file yourself."
+msgstr ""
+"Aukera hau hautatzen baduzu, instalazio script-ak beti gainidatziko du /etc/"
+"default/argus-server. Bestela zuk kudeatu beharko duzu fitxategi hori."
diff -Nru argus-2.0.6.fixes.1.old/debian/po/gl.po argus-2.0.6.fixes.1/debian/po/gl.po
--- argus-2.0.6.fixes.1.old/debian/po/gl.po	1970-01-01 01:00:00.000000000 +0100
+++ argus-2.0.6.fixes.1/debian/po/gl.po	2008-06-13 07:43:41.506781000 +0200
@@ -0,0 +1,55 @@
+# Galician translation of argus's debconf templates
+# This file is distributed under the same license as the argus package.
+# Jacobo Tarrio <jtarrio@debian.org>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: argus\n"
+"Report-Msgid-Bugs-To: apollock@debian.org\n"
+"POT-Creation-Date: 2006-11-07 20:48-0800\n"
+"PO-Revision-Date: 2008-06-12 22:16+0100\n"
+"Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
+"Language-Team: Galician <proxecto@trasno.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "boot, dialup, both, none"
+msgstr "arrincar, conexión, ambos, ningún"
+
+#. Type: select
+#. Description
+#: ../templates:1002
+msgid "Startup behaviour:"
+msgstr "Comportamento de inicio:"
+
+#. Type: select
+#. Description
+#: ../templates:1002
+msgid ""
+"It is possible to start argus at boot time, upon initiating a PPP "
+"connection, both, or never, which requires user intervention in order to "
+"start argus."
+msgstr ""
+"É posible iniciar argus ao arrincar o ordenador, ao iniciar unha conexión "
+"PPP, ámbolos dous, ou nunca, o que precisa de intervención manual para "
+"iniciar argus."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Should /etc/default/argus-server be overwritten?"
+msgstr "¿Quere sobrescribir /etc/default/argus-server?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"If you select this option, the installation script will always overwrite /"
+"etc/default/argus-server. Otherwise, you will manage that file yourself."
+msgstr ""
+"Se escolle esta opción, o script de instalación sempre ha sobrescribir /etc/"
+"default/argus-server. Se non, pode xestionar vostede mesmo o ficheiro."
diff -Nru argus-2.0.6.fixes.1.old/debian/po/ja.po argus-2.0.6.fixes.1/debian/po/ja.po
--- argus-2.0.6.fixes.1.old/debian/po/ja.po	2008-06-01 10:11:16.611117331 +0200
+++ argus-2.0.6.fixes.1/debian/po/ja.po	2008-06-01 18:15:51.427119000 +0200
@@ -1,23 +1,23 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
-#
+# 
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+# 
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# 
+#    Developers do not need to manually edit POT or PO files.
+# 
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: argus 3.0.0.rc.34-1\n"
+"Project-Id-Version: argus 1:2.0.6.fixes.1-14\n"
 "Report-Msgid-Bugs-To: apollock@debian.org\n"
 "POT-Creation-Date: 2006-11-07 20:48-0800\n"
-"PO-Revision-Date: 2006-11-24 14:20+0900\n"
+"PO-Revision-Date: 2008-01-30 21:26+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@
 #. Description
 #: ../templates:1002
 msgid "Startup behaviour:"
-msgstr ""
+msgstr "起動時の動作:"
 
 #. Type: select
 #. Description
@@ -65,6 +65,3 @@
 msgstr ""
 "このオプションを選んだ場合、インストールスクリプトは /etc/default/argus-"
 "server を常に上書きします。それ以外の場合はファイルを手動で変更します。"
-
-#~ msgid "How should argus be started?"
-#~ msgstr "どのようにして argus を起動しますか?"
diff -Nru argus-2.0.6.fixes.1.old/debian/po/pt.po argus-2.0.6.fixes.1/debian/po/pt.po
--- argus-2.0.6.fixes.1.old/debian/po/pt.po	2008-06-01 10:11:16.611117331 +0200
+++ argus-2.0.6.fixes.1/debian/po/pt.po	2008-06-01 18:15:40.771119000 +0200
@@ -1,19 +1,21 @@
-# Luís Ferreira <anarka@anarka.org>, 2005.
+# translation of argus debconf to Portuguese
 #
 # 2005-11-04 - Luis Ferreira - Initial translation
+# Luís Ferreira <anarka@anarka.org>, 2005.
+# Américo Monteiro <a_monteiro@netcabo.pt>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: argus 1:2.0.6.fixes.1-10\n"
+"Project-Id-Version: argus 1:2.0.6.fixes.1-14\n"
 "Report-Msgid-Bugs-To: apollock@debian.org\n"
 "POT-Creation-Date: 2006-11-07 20:48-0800\n"
-"PO-Revision-Date: 2005-11-03 15:32+0100\n"
-"Last-Translator: Luís Ferreira <anarka@anarka.org>\n"
+"PO-Revision-Date: 2007-09-23 08:31+0100\n"
+"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. Type: select
@@ -26,7 +28,7 @@
 #. Description
 #: ../templates:1002
 msgid "Startup behaviour:"
-msgstr ""
+msgstr "Comportamento de arranque:"
 
 #. Type: select
 #. Description
@@ -44,7 +46,7 @@
 #. Description
 #: ../templates:2001
 msgid "Should /etc/default/argus-server be overwritten?"
-msgstr "Deve o /etc/default/argus-server ser rescrito?"
+msgstr "Deve o /etc/default/argus-server ser reescrito?"
 
 #. Type: boolean
 #. Description
@@ -55,6 +57,3 @@
 msgstr ""
 "Se seleccionar esta opção o script de instalação vai sempre reescrever o /"
 "etc/default/argus-server. Caso contrário esse ficheiro será gerido por si."
-
-#~ msgid "How should argus be started?"
-#~ msgstr "Como deve o argus ser iniciado?"
diff -Nru argus-2.0.6.fixes.1.old/debian/po/ru.po argus-2.0.6.fixes.1/debian/po/ru.po
--- argus-2.0.6.fixes.1.old/debian/po/ru.po	1970-01-01 01:00:00.000000000 +0100
+++ argus-2.0.6.fixes.1/debian/po/ru.po	2008-06-08 07:22:36.265240000 +0200
@@ -0,0 +1,60 @@
+# translation of ru.po to Russian
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Yuri Kozlov <kozlov.y@gmail.com>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: argus 1:2.0.6.fixes.1-14\n"
+"Report-Msgid-Bugs-To: apollock@debian.org\n"
+"POT-Creation-Date: 2006-11-07 20:48-0800\n"
+"PO-Revision-Date: 2008-06-07 21:21+0400\n"
+"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "boot, dialup, both, none"
+msgstr "при включении, по звонку, в обоих случаях, вручную"
+
+#. Type: select
+#. Description
+#: ../templates:1002
+msgid "Startup behaviour:"
+msgstr "Способ запуска:"
+
+#. Type: select
+#. Description
+#: ../templates:1002
+msgid ""
+"It is possible to start argus at boot time, upon initiating a PPP "
+"connection, both, or never, which requires user intervention in order to "
+"start argus."
+msgstr ""
+"Возможно настроить argus на запуск при включении компьютера, при поднятии "
+"соединения PPP, в обоих случаях, или никогда, то есть argus будет "
+"запускаться пользователем вручную."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Should /etc/default/argus-server be overwritten?"
+msgstr "Перезаписывать /etc/default/argus-server?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"If you select this option, the installation script will always overwrite /"
+"etc/default/argus-server. Otherwise, you will manage that file yourself."
+msgstr ""
+"Если вы ответите утвердительно, то сценарий установки будет всегда "
+"перезаписывать /etc/default/argus-server. Иначе, вам придётся управлять этим "
+"файлом самостоятельно."
diff -Nru argus-2.0.6.fixes.1.old/debian/po/vi.po argus-2.0.6.fixes.1/debian/po/vi.po
--- argus-2.0.6.fixes.1.old/debian/po/vi.po	2008-06-01 10:11:16.611117331 +0200
+++ argus-2.0.6.fixes.1/debian/po/vi.po	2008-06-12 18:24:51.033429000 +0200
@@ -1,19 +1,20 @@
-# Vietnamese translation for argus.
-# Copyright © 2005 Free Software Foundation, Inc.
-# Clytie Siddall <clytie@riverland.net.au>, 2005.
-# 
+# Vietnamese Debconf translation for Argus.
+# Copyright © 2008 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2005-2008.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: argus 1/2.0.6.fixes.1-4\n"
+"Project-Id-Version: argus 1:2.0.6.fixes.1-14.1\n"
 "Report-Msgid-Bugs-To: apollock@debian.org\n"
 "POT-Creation-Date: 2006-11-07 20:48-0800\n"
-"PO-Revision-Date: 2005-06-12 11:38+0930\n"
+"PO-Revision-Date: 2008-06-12 21:47+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
-"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.7b3\n"
 
 #. Type: select
 #. Choices
@@ -25,7 +26,7 @@
 #. Description
 #: ../templates:1002
 msgid "Startup behaviour:"
-msgstr ""
+msgstr "Ứng xử khởi chạy:"
 
 #. Type: select
 #. Description
@@ -35,15 +36,15 @@
 "connection, both, or never, which requires user intervention in order to "
 "start argus."
 msgstr ""
-"Có thể khởi chạy trình argus khi khởi động máy, khi bắt đầu kết nối bằng "
-"PPP, dùng cả hai phương pháp, hay không bao giờ (bạn phải tự khởi chạy trình "
-"ấy)."
+"Có thể khởi chạy trình argus vào lúc khởi động máy, vào lúc thiết lập một "
+"kết nối bằng PPP, vào cả hai lúc đó, hoặc không bao giờ (thì người dùng cần "
+"phải khởi chạy argus)."
 
 #. Type: boolean
 #. Description
 #: ../templates:2001
 msgid "Should /etc/default/argus-server be overwritten?"
-msgstr "Bạn có muốn ghi đè lên «/etc/default/argus-server» không?"
+msgstr "Có nên ghi đè lên « /etc/default/argus-server » không?"
 
 #. Type: boolean
 #. Description
@@ -52,8 +53,8 @@
 "If you select this option, the installation script will always overwrite /"
 "etc/default/argus-server. Otherwise, you will manage that file yourself."
 msgstr ""
-"Nếu bạn chọn tùy chọn này, tập lệnh cài đặt sẽ luôn ghi đè lên «/etc/default/"
-"argus-server». Nếu không thì bạn sẽ phải tự quan lý tập tin ấy."
+"Bật tùy chọn này thì văn lệnh cài đặt sẽ lúc nào cũng ghi đè lên tập tin « /"
+"etc/default/argus-server ». Không thì bạn tự quản lý tập tin đó."
 
 #~ msgid "How should argus be started?"
 #~ msgstr "Bạn có muốn khởi chạy trình argus như thế nào?"
diff -Nru argus-2.0.6.fixes.1.old/debian/rules argus-2.0.6.fixes.1/debian/rules
--- argus-2.0.6.fixes.1.old/debian/rules	2008-06-01 10:11:16.675117706 +0200
+++ argus-2.0.6.fixes.1/debian/rules	2008-06-01 18:44:44.359120155 +0200
@@ -56,7 +56,7 @@
 	test -f debian/control
 	rm -f build-stamp
 	rm -rf $(tmp) $(tmp-ALT) debian/substvars debian/files *.orig */*.orig *~ */*~
-	-$(MAKE) -f Makefile.in realclean ALLDIRS="clients common server"
+	[ ! -f Makefile.in ] || $(MAKE) -f Makefile.in realclean ALLDIRS="clients common server"
 	debconf-updatepo
 	dh_clean
 
