tags 595446 + patch
tags 595446 + pending
thanks

Dear maintainer,

I've prepared an NMU for ntop (versioned as 3:3.3-14.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

While it is a quite grave change to deactivate ssl support, it is my
understanding, that it is the only viable solution for squeeze.

Regards.
diff -u ntop-3.3/debian/control ntop-3.3/debian/control
--- ntop-3.3/debian/control
+++ ntop-3.3/debian/control
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Ola Lundqvist <o...@debian.org>
-Build-Depends: debhelper (>= 4.1.39), libpcap0.8-dev, autoconf, automake1.7, libgdbm-dev, libpng12-dev, libncurses5-dev, libtool, libwrap0-dev, libgd2-noxpm-dev, libssl-dev, libjpeg62-dev, po-debconf, librrd2-dev
+Build-Depends: debhelper (>= 4.1.39), libpcap0.8-dev, autoconf, automake1.7, libgdbm-dev, libpng12-dev, libncurses5-dev, libtool, libwrap0-dev, libgd2-noxpm-dev, libjpeg62-dev, po-debconf, librrd2-dev
 Standards-Version: 3.7.2
 
 Package: ntop
diff -u ntop-3.3/debian/rules ntop-3.3/debian/rules
--- ntop-3.3/debian/rules
+++ ntop-3.3/debian/rules
@@ -20,7 +20,7 @@
 		--with-zlib-lib=/usr/lib --with-zlib-include=/usr/include \
 		--with-libpng-lib=/usr/lib --with-libpng-include=/usr/include \
 		--with-gd-lib=/usr/lib --with-gd-include=/usr/include \
-	        --enable-sslv3 --enable-i18n --disable-snmp
+	        --enable-i18n --disable-snmp
 
 	touch configure-stamp-ntop
 
diff -u ntop-3.3/debian/changelog ntop-3.3/debian/changelog
--- ntop-3.3/debian/changelog
+++ ntop-3.3/debian/changelog
@@ -1,3 +1,12 @@
+ntop (3:3.3-14.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Compile without ssl support due to license problems (Closes: #595446)
+    * removed build-depends on libssl-dev
+    * removed ssl option from configure call
+
+ -- Alexander Reichle-Schmehl <toli...@debian.org>  Tue, 19 Oct 2010 14:29:41 +0200
+
 ntop (3:3.3-14) unstable; urgency=low
 
   * Logcheck will now ignore packet truncated warnings. Closes: #585525.
diff -u ntop-3.3/debian/po/fr.po ntop-3.3/debian/po/fr.po
--- ntop-3.3/debian/po/fr.po
+++ ntop-3.3/debian/po/fr.po
@@ -7,8 +7,8 @@
 # /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: ntop 2:3.2rc1-1\n"
@@ -17,6 +17,7 @@
 "PO-Revision-Date: 2005-09-29 00:13+0200\n"
 "Last-Translator: Sylvain Archenault <sylvain.archena...@laposte.net>\n"
 "Language-Team: French <debian-l10n-fre...@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
diff -u ntop-3.3/debian/po/sv.po ntop-3.3/debian/po/sv.po
--- ntop-3.3/debian/po/sv.po
+++ ntop-3.3/debian/po/sv.po
@@ -8,8 +8,8 @@
 # or http://www.debian.org/intl/l10n/po-debconf/README-trans
 # Developers do not need to manually edit POT or PO files.
 # , fuzzy
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ntop 2:3.2rc1-1\n"
@@ -18,6 +18,7 @@
 "PO-Revision-Date: 2005-10-10 22:03+0200\n"
 "Last-Translator: Daniel Nylander <p...@danielnylander.se>\n"
 "Language-Team: Swedish <s...@li.org>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
diff -u ntop-3.3/debian/po/nl.po ntop-3.3/debian/po/nl.po
--- ntop-3.3/debian/po/nl.po
+++ ntop-3.3/debian/po/nl.po
@@ -19,6 +19,7 @@
 "PO-Revision-Date: 2006-04-27 10:04+0200\n"
 "Last-Translator: Esther <eha...@xs4all.nl>\n"
 "Language-Team: Nederlands <debian-l10n-du...@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff -u ntop-3.3/debian/po/it.po ntop-3.3/debian/po/it.po
--- ntop-3.3/debian/po/it.po
+++ ntop-3.3/debian/po/it.po
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2006-05-07 19:33+0200\n"
 "Last-Translator: Luca Monducci <luca...@tiscali.it>\n"
 "Language-Team: Italian <t...@lists.linux.it>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
diff -u ntop-3.3/debian/po/de.po ntop-3.3/debian/po/de.po
--- ntop-3.3/debian/po/de.po
+++ ntop-3.3/debian/po/de.po
@@ -12,6 +12,7 @@
 "PO-Revision-Date: 2006-10-29 20:57+0100\n"
 "Last-Translator: Helge Kreutzmann <deb...@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-ger...@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
diff -u ntop-3.3/debian/po/es.po ntop-3.3/debian/po/es.po
--- ntop-3.3/debian/po/es.po
+++ ntop-3.3/debian/po/es.po
@@ -33,7 +33,9 @@
 "POT-Creation-Date: 2006-08-16 07:38+0200\n"
 "PO-Revision-Date: 2006-12-25 12:11-0500\n"
 "Last-Translator: Rudy Godoy <r...@kernel-panik.org>\n"
-"Language-Team: Debian l10n Spanish Team <debian-l10n-span...@lists.debian.org>\n"
+"Language-Team: Debian l10n Spanish Team <debian-l10n-span...@lists.debian."
+"org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +52,9 @@
 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 "Se crear el usuario si no existe. No introduzca root, no se aconseja, y si lo hace se descartar en cualquier caso."
+msgstr ""
+"Se crear el usuario si no existe. No introduzca root, no se aconseja, y si "
+"lo hace se descartar en cualquier caso."
 
 #. Type: string
 #. Description
@@ -58,7 +62,9 @@
 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 "No se crear ningn usuario en el sistema si no introduce nada aqu, por lo que usted tendr que hacer la configuracin necesaria."
+msgstr ""
+"No se crear ningn usuario en el sistema si no introduce nada aqu, por lo "
+"que usted tendr que hacer la configuracin necesaria."
 
 #. Type: string
 #. Description
@@ -74 +80,3 @@
-msgstr "Por favor introduzca la lista, separada por comas, de las interfaces en las que debe escuchar ntop."
+msgstr ""
+"Por favor introduzca la lista, separada por comas, de las interfaces en las "
+"que debe escuchar ntop."
diff -u ntop-3.3/debian/po/ja.po ntop-3.3/debian/po/ja.po
--- ntop-3.3/debian/po/ja.po
+++ ntop-3.3/debian/po/ja.po
@@ -10,6 +10,7 @@
 "PO-Revision-Date: 2007-03-01 21:03+0900\n"
 "Last-Translator: Noritada Kobayashi <no...@dolphin.c.u-tokyo.ac.jp>\n"
 "Language-Team: Japanese <debian-japan...@lists.debian.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff -u ntop-3.3/debian/po/fi.po ntop-3.3/debian/po/fi.po
--- ntop-3.3/debian/po/fi.po
+++ ntop-3.3/debian/po/fi.po
@@ -6,6 +6,7 @@
 "PO-Revision-Date: 2008-04-20 17:28+0200\n"
 "Last-Translator: Esko Arajrvi <e...@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finn...@lists.debian.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
diff -u ntop-3.3/debian/po/gl.po ntop-3.3/debian/po/gl.po
--- ntop-3.3/debian/po/gl.po
+++ ntop-3.3/debian/po/gl.po
@@ -10,6 +10,7 @@
 "PO-Revision-Date: 2008-04-20 15:40+0100\n"
 "Last-Translator: Jacobo Tarrio <jtar...@debian.org>\n"
 "Language-Team: Galician <proxe...@trasno.net>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
diff -u ntop-3.3/debian/po/pt.po ntop-3.3/debian/po/pt.po
--- ntop-3.3/debian/po/pt.po
+++ ntop-3.3/debian/po/pt.po
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2007-03-13 23:06+0000\n"
 "Last-Translator: Ricardo Silva <ardo...@gmail.com>\n"
 "Language-Team: Portuguese <tra...@debianpt.org>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
diff -u ntop-3.3/debian/po/eu.po ntop-3.3/debian/po/eu.po
--- ntop-3.3/debian/po/eu.po
+++ ntop-3.3/debian/po/eu.po
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2008-04-29 10:00+0100\n"
 "Last-Translator: Piarres Beobide <p...@beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-bas...@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +20,9 @@
 #. Description
 #: ../templates:1001
 msgid "Which is the name of the user to run the ntop daemon as ?"
-msgstr "Zein da ntop-ek deabru bezala exekutatzeko erabili behar duen erabiltzaile izena ?"
+msgstr ""
+"Zein da ntop-ek deabru bezala exekutatzeko erabili behar duen erabiltzaile "
+"izena ?"
 
 #. Type: string
 #. Description
@@ -38,8 +41,8 @@
 "If you select an empty string no user will be created on the system and you "
 "will need to do that configuration yourself."
 msgstr ""
-"Kate hutsa utziaz gero ez da erabiltzailerik sortuko sisteman eta konfigurazioa "
-"zure kabuz egin beharko duzu."
+"Kate hutsa utziaz gero ez da erabiltzailerik sortuko sisteman eta "
+"konfigurazioa zure kabuz egin beharko duzu."
 
 #. Type: string
 #. Description
@@ -56 +59,2 @@
-"Mesedez idatzi gakoz bereiziriko zerrenda batetan ntop-ek entzun behar dituen interfazeak."
+"Mesedez idatzi gakoz bereiziriko zerrenda batetan ntop-ek entzun behar "
+"dituen interfazeak."
diff -u ntop-3.3/debian/po/cs.po ntop-3.3/debian/po/cs.po
--- ntop-3.3/debian/po/cs.po
+++ ntop-3.3/debian/po/cs.po
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2008-05-09 14:43+0200\n"
 "Last-Translator: Miroslav Kure <ku...@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-cz...@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,8 +29,8 @@
 "The selected user will be created if not already available. Don't choose "
 "root, it is not recommended and will be discarded anyway."
 msgstr ""
-"Pokud zadaný uživatel neexistuje, bude vytvořen. Nezadávejte uživatele "
-"root, protože to není dobrý nápad, který stejně bude ignorován."
+"Pokud zadaný uživatel neexistuje, bude vytvořen. Nezadávejte uživatele root, "
+"protože to není dobrý nápad, který stejně bude ignorován."
 
 #. Type: string
 #. Description
diff -u ntop-3.3/debian/po/pt_BR.po ntop-3.3/debian/po/pt_BR.po
--- ntop-3.3/debian/po/pt_BR.po
+++ ntop-3.3/debian/po/pt_BR.po
@@ -13,6 +13,7 @@
 "Last-Translator: Felipe Augusto van de Wiel (faw) <f...@debian.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portugu...@lists.debian."
 "org>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff -u ntop-3.3/debian/po/ru.po ntop-3.3/debian/po/ru.po
--- ntop-3.3/debian/po/ru.po
+++ ntop-3.3/debian/po/ru.po
@@ -11,11 +11,13 @@
 "PO-Revision-Date: 2009-06-18 20:36+0400\n"
 "Last-Translator: Yuri Kozlov <yu...@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russ...@lists.debian.org>\n"
+"Language: ru\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"
+"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: string
 #. Description
@@ -30,8 +32,8 @@
 "The selected user will be created if not already available. Don't choose "
 "root, it is not recommended and will be discarded anyway."
 msgstr ""
-"Указанный пользователь будет создан, если его нет в системе. Не указывайте root, "
-"так как это не рекомендуется и всё равно не сработает."
+"Указанный пользователь будет создан, если его нет в системе. Не указывайте "
+"root, так как это не рекомендуется и всё равно не сработает."
 
 #. Type: string
 #. Description
@@ -55,3 +57,3 @@
-msgid "Please enter a comma separated list of interfaces ntop should listen on."
+msgid ""
+"Please enter a comma separated list of interfaces ntop should listen on."
 msgstr "Введите интерфейсы (через запятую), которые должен прослушивать ntop."
-

Reply via email to