Dear maintainer of ntop, On Sunday, April 20, 2008 I sent you a notice announcing my intent to upload a NMU of your package to fix its pending l10n issues, after an initial notice sent on Friday, April 18, 2008.
You either agreed for this NMU or did not respond to my notices.
I will now upload this NMU to DELAYED/2-DAY.
The NMU patch is attached to this mail.
The NMU changelog is:
Source: ntop
Version: 3:3.3-5.1
Distribution: unstable
Urgency: low
Maintainer: Christian Perrier <[EMAIL PROTECTED]>
Date: Fri, 18 Apr 2008 19:37:35 +0200
Closes: 414836 466505 476981 476982
Changes:
ntop (3:3.3-5.1) unstable; urgency=low
.
* Non-maintainer upload to fix pending l10n issues.
* Fix typos and errors in the man page. Thanks to A. Costa
for the patch. Closes: #466505
* Debconf translations:
- Portuguese. Closes: #414836
- Finnish. Closes: #476981
- Galician. Closes: #476982
* [Lintian] Set debhelper compatibility level in debian/compat
* [Lintian] No longer ignore errors by make in the clean target
* [Lintian] Add copyright information to debian/copyright
--
diff -Nru ntop-3.3.old/debian/changelog ntop-3.3/debian/changelog --- ntop-3.3.old/debian/changelog 2008-04-18 08:42:25.652396458 +0200 +++ ntop-3.3/debian/changelog 2008-04-29 18:48:45.530124673 +0200 @@ -1,3 +1,18 @@ +ntop (3:3.3-5.1) unstable; urgency=low + + * Non-maintainer upload to fix pending l10n issues. + * Fix typos and errors in the man page. Thanks to A. Costa + for the patch. Closes: #466505 + * Debconf translations: + - Portuguese. Closes: #414836 + - Finnish. Closes: #476981 + - Galician. Closes: #476982 + * [Lintian] Set debhelper compatibility level in debian/compat + * [Lintian] No longer ignore errors by make in the clean target + * [Lintian] Add copyright information to debian/copyright + + -- Christian Perrier <[EMAIL PROTECTED]> Fri, 18 Apr 2008 19:37:35 +0200 + ntop (3:3.3-5) unstable; urgency=low * Changed init script to use valid options. diff -Nru ntop-3.3.old/debian/compat ntop-3.3/debian/compat --- ntop-3.3.old/debian/compat 1970-01-01 01:00:00.000000000 +0100 +++ ntop-3.3/debian/compat 2008-04-29 18:41:39.214134413 +0200 @@ -0,0 +1 @@ +4 diff -Nru ntop-3.3.old/debian/copyright ntop-3.3/debian/copyright --- ntop-3.3.old/debian/copyright 2008-04-18 08:42:25.560396343 +0200 +++ ntop-3.3/debian/copyright 2008-04-29 18:48:20.510127379 +0200 @@ -5,7 +5,7 @@ Upstream Author: Luca Deri <[EMAIL PROTECTED]> -Copyright: +Copyright © 1998-2007 Luca Deri <[EMAIL PROTECTED]> This program is free software; you may redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,4 +21,4 @@ /usr/share/common-licenses/GPL in the Debian GNU/Linux distribution or on the World Wide Web at http://www.gnu.org/copyleft/gpl.html. You can also obtain it by writing to the Free Software Foundation, Inc., 51 Franklin St, -Fifth Floor, Boston, MA 02110-1301, USA. \ No newline at end of file +Fifth Floor, Boston, MA 02110-1301, USA. diff -Nru ntop-3.3.old/debian/patches/ntop.8.v1.diff ntop-3.3/debian/patches/ntop.8.v1.diff --- ntop-3.3.old/debian/patches/ntop.8.v1.diff 1970-01-01 01:00:00.000000000 +0100 +++ ntop-3.3/debian/patches/ntop.8.v1.diff 2008-04-18 19:41:40.236063432 +0200 @@ -0,0 +1,59 @@ +--- ntop.8 2007-05-18 13:56:33.000000000 -0400 ++++ /tmp/ntop.8 2008-02-19 02:03:28.000000000 -0500 +@@ -327,7 +327,7 @@ + 'other' packets are found. The file is in tcpdump (pcap) format and is named + <path>/ntop-other-pkts.<device>.pcap, where <path> is defined by the + -O | --output-packet-path parameter. +-This file is useful for understanding these unclassifed packets. ++This file is useful for understanding these unclassified packets. + + .It2 -l --pcap-log + This parameter causes a dump file to be created of the network traffic captured by +@@ -788,7 +788,7 @@ + merges the data collected from all of the interfaces (NICs) it is monitoring into a + single set of counters. + +-If you have a simple network, say a small LAN with a connection to the internet, ++If you have a simple network, say a small LAN with a connection to the Internet, + merging data is good as it gives you a better picture of the whole network. + For larger, more complex networks, this may not be desirable. + You may also have other reasons for wishing to monitor each interface separately, +@@ -912,7 +912,7 @@ + stores extra information about the locks and unlocks of the protective mutexes it uses. Since + .B ntop + uses fine-grained locking, this information is updated frequently. On some OSes, the system +-calls used to collect this informatio (getpid() and gettimeofday()) are expensive. This option ++calls used to collect this information (getpid() and gettimeofday()) are expensive. This option + disables the extra information. It should have no processing impact on + .B ntop + - however should +@@ -978,7 +978,7 @@ + uses the dladdr() function. The original Solaris routine had a bug, replicated in + FreeBSD (and possibly other places) where it uses the ARGV[0] value - which might be + erroneous - instead of the actual file name. If the 'running from' value looks bogus but +-the 'libaries in' value looks ok, go with the libarary. ++the 'libraries in' value looks OK, go with the library. + + .It --no-fc + +@@ -1008,8 +1008,8 @@ + This option sets the non-blocking + option (assuming it's available in the version of libpcap that is installed). + +-While this works around the problem (by turing an interupt driven process into +-a poll), it also MAY signifcantly increases the cpu usage of ++While this works around the problem (by turning an interrupt driven process into ++a poll), it also MAY significantly increase the CPU usage of + .B ntop. + Although it does not actually interfere with other work, seeing + .B ntop +@@ -1267,7 +1267,7 @@ + which flags are being used. + + The libpcap, gdbm, openssl and zlib versions come from the strings returned by the various +-inquiry functions (if they're availabe). ++inquiry functions (if they're available). + + Here's a sample log record: + + diff -Nru ntop-3.3.old/debian/po/fi.po ntop-3.3/debian/po/fi.po --- ntop-3.3.old/debian/po/fi.po 1970-01-01 01:00:00.000000000 +0100 +++ ntop-3.3/debian/po/fi.po 2008-04-20 18:30:05.349258000 +0200 @@ -0,0 +1,56 @@ +msgid "" +msgstr "" +"Project-Id-Version: ntop\n" +"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" +"POT-Creation-Date: 2006-08-16 07:38+0200\n" +"PO-Revision-Date: 2008-04-20 17:28+0200\n" +"Last-Translator: Esko Arajärvi <[EMAIL PROTECTED]>\n" +"Language-Team: Finnish <[EMAIL PROTECTED]>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Poedit-Language: Finnish\n" +"X-Poedit-Country: FINLAND\n" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "Which is the name of the user to run the ntop daemon as ?" +msgstr "Käyttäjätunnus, jolla ntop-taustaohjelmaa ajetaan:" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"The selected user will be created if not already available. Don't choose " +"root, it is not recommended and will be discarded anyway." +msgstr "" +"Annettu tunnus luodaan, jos sitä ei vielä ole olemassa. Älä valitse " +"pääkäyttäjätunnusta (root). Sitä ei tulisi käyttää, eikä sitä kuitenkaan " +"hyväksytä." + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"If you select an empty string no user will be created on the system and you " +"will need to do that configuration yourself." +msgstr "" +"Jos kenttä jätetään tyhjäksi, järjestelmään ei luoda mitään käyttäjää ja " +"asetukset on tehtävä käsin." + +#. Type: string +#. Description +#: ../templates:2001 +msgid "Which interfaces should ntop listen on?" +msgstr "Kuunneltavat liitännät:" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"Please enter a comma separated list of interfaces ntop should listen on." +msgstr "" +"Anna pilkuilla eroteltu lista verkkoliitännöistä, joita ntopin tulisi " +"kuunnella." diff -Nru ntop-3.3.old/debian/po/gl.po ntop-3.3/debian/po/gl.po --- ntop-3.3.old/debian/po/gl.po 1970-01-01 01:00:00.000000000 +0100 +++ ntop-3.3/debian/po/gl.po 2008-04-20 18:30:30.025258000 +0200 @@ -0,0 +1,56 @@ +# Galician translation of ntop's debconf templates +# This file is distributed under the same license as the ntop package. +# Jacobo Tarrio <[EMAIL PROTECTED]>, 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: ntop\n" +"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" +"POT-Creation-Date: 2006-08-16 07:38+0200\n" +"PO-Revision-Date: 2008-04-20 15:40+0100\n" +"Last-Translator: Jacobo Tarrio <[EMAIL PROTECTED]>\n" +"Language-Team: Galician <[EMAIL PROTECTED]>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "Which is the name of the user to run the ntop daemon as ?" +msgstr "¿Cal é o nome do usuario co que executar o servizo ntop?" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"The selected user will be created if not already available. Don't choose " +"root, it is not recommended and will be discarded anyway." +msgstr "" +"Hase crear o usuario indicado se non existe xa. Non escolla \"root\"; non se " +"recomenda e hase ignorar de tódolos xeitos." + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"If you select an empty string no user will be created on the system and you " +"will need to do that configuration yourself." +msgstr "" +"Se introduce unha cadea baleira, non se ha crear ningún usuario no sistema e " +"ha ter que facer esta configuración vostede mesmo." + +#. Type: string +#. Description +#: ../templates:2001 +msgid "Which interfaces should ntop listen on?" +msgstr "¿En que interfaces debe escoitar ntop?" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"Please enter a comma separated list of interfaces ntop should listen on." +msgstr "" +"Introduza unha lista de interfaces nas que debe escoitar ntop, separadas por " +"comas." diff -Nru ntop-3.3.old/debian/po/pt.po ntop-3.3/debian/po/pt.po --- ntop-3.3.old/debian/po/pt.po 1970-01-01 01:00:00.000000000 +0100 +++ ntop-3.3/debian/po/pt.po 2008-04-18 19:45:49.824062000 +0200 @@ -0,0 +1,57 @@ +# Portuguese translation of ntop's debconf messages. +# Copyright (C) 2007 +# This file is distributed under the same license as the ntop package. +# Ricardo Silva <[EMAIL PROTECTED]>, 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: ntop 3:3.2-10\n" +"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" +"POT-Creation-Date: 2006-08-16 07:38+0200\n" +"PO-Revision-Date: 2007-03-13 23:06+0000\n" +"Last-Translator: Ricardo Silva <[EMAIL PROTECTED]>\n" +"Language-Team: Portuguese <[EMAIL PROTECTED]>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "Which is the name of the user to run the ntop daemon as ?" +msgstr "Qual é o nome do utilizador com que correr o daemon ntop ?" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"The selected user will be created if not already available. Don't choose " +"root, it is not recommended and will be discarded anyway." +msgstr "" +"O utilizador seleccionado será criado se ainda não existir. Não escolha " +"root, não é recomendado e será descartado de qualquer das formas." + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"If you select an empty string no user will be created on the system and you " +"will need to do that configuration yourself." +msgstr "" +"Se introduzir uma string vazia não será criado nenhum utilizador no sistema " +"e precisará de fazer essa configuração você mesmo." + +#. Type: string +#. Description +#: ../templates:2001 +msgid "Which interfaces should ntop listen on?" +msgstr "Em que interfaces quer que o ntop esteja atento?" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"Please enter a comma separated list of interfaces ntop should listen on." +msgstr "" +"Por favor introduza uma lista de interfaces separadas por vírgulas onde o " +"ntop deva estar atento." diff -Nru ntop-3.3.old/debian/postrm ntop-3.3/debian/postrm --- ntop-3.3.old/debian/postrm 2008-04-18 08:42:25.648404621 +0200 +++ ntop-3.3/debian/postrm 2008-04-29 18:46:52.078127151 +0200 @@ -41,6 +41,4 @@ update-rc.d -f ntop remove >/dev/null fi -ldconfig - #DEBHELPER# diff -Nru ntop-3.3.old/debian/rules ntop-3.3/debian/rules --- ntop-3.3.old/debian/rules 2008-04-18 08:42:25.648404621 +0200 +++ ntop-3.3/debian/rules 2008-04-29 18:43:36.982126906 +0200 @@ -5,9 +5,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# This is the debhelper compatability version to use. -export DH_COMPAT=4 - configure: configure-stamp-gdchart configure-stamp-ntop configure-stamp-gdchart: dh_testdir @@ -48,8 +45,8 @@ debconf-updatepo # Add here commands to clean up after the build process. - -$(MAKE) clean - -$(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) clean + [ ! -f Makefile ] || $(MAKE) distclean -rm -f config.status config.cache config.log find . -type d -name ".deps" | xargs rm -Rf diff -Nru ntop-3.3.old/ntop.8 ntop-3.3/ntop.8 --- ntop-3.3.old/ntop.8 2008-04-18 08:42:25.016396856 +0200 +++ ntop-3.3/ntop.8 2008-04-18 19:44:14.080062648 +0200 @@ -329,7 +329,7 @@ 'other' packets are found. The file is in tcpdump (pcap) format and is named <path>/ntop-other-pkts.<device>.pcap, where <path> is defined by the -O | --output-packet-path parameter. -This file is useful for understanding these unclassifed packets. +This file is useful for understanding these unclassified packets. .It2 -l --pcap-log This parameter causes a dump file to be created of the network traffic captured by @@ -790,7 +790,7 @@ merges the data collected from all of the interfaces (NICs) it is monitoring into a single set of counters. -If you have a simple network, say a small LAN with a connection to the internet, +If you have a simple network, say a small LAN with a connection to the Internet, merging data is good as it gives you a better picture of the whole network. For larger, more complex networks, this may not be desirable. You may also have other reasons for wishing to monitor each interface separately, @@ -914,7 +914,7 @@ stores extra information about the locks and unlocks of the protective mutexes it uses. Since .B ntop uses fine-grained locking, this information is updated frequently. On some OSes, the system -calls used to collect this informatio (getpid() and gettimeofday()) are expensive. This option +calls used to collect this information (getpid() and gettimeofday()) are expensive. This option disables the extra information. It should have no processing impact on .B ntop - however should @@ -980,7 +980,7 @@ uses the dladdr() function. The original Solaris routine had a bug, replicated in FreeBSD (and possibly other places) where it uses the ARGV[0] value - which might be erroneous - instead of the actual file name. If the 'running from' value looks bogus but -the 'libaries in' value looks ok, go with the libarary. +the 'libraries in' value looks OK, go with the library. .It --no-fc @@ -1010,8 +1010,8 @@ This option sets the non-blocking option (assuming it's available in the version of libpcap that is installed). -While this works around the problem (by turing an interupt driven process into -a poll), it also MAY signifcantly increases the cpu usage of +While this works around the problem (by turning an interrupt driven process into +a poll), it also MAY significantly increase the CPU usage of .B ntop. Although it does not actually interfere with other work, seeing .B ntop @@ -1269,7 +1269,7 @@ which flags are being used. The libpcap, gdbm, openssl and zlib versions come from the strings returned by the various -inquiry functions (if they're availabe). +inquiry functions (if they're available). Here's a sample log record:
signature.asc
Description: Digital signature
