Hi, this is the diff for the NMU.
Regards, Tobias
diff --git a/debian/changelog b/debian/changelog index a1c3937..badfee1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +webalizer (2.23.08-3.1) unstable; urgency=medium + + * Non-maintainer upload with maintainer consent. + * Updated Debconf translations: + - German, thanks Markus Hiereth (Closes: #886029) + * Obvious lintian fixes: + - spelling-error-in-patch-description + - vcs-obsolete-in-debian-infrastructure + - file-contains-trailing-whitespace + - insecure-copyright-format-uri + * Suggest new fonts-* package names. (Closes: #885464) + + -- Helge Kreutzmann <[email protected]> Mon, 15 Oct 2018 17:03:02 +0200 + webalizer (2.23.08-3) unstable; urgency=medium * Update debhelper to compat level 10 (remove explicit use of autoreconf as @@ -66,7 +80,7 @@ webalizer (2.23.05-1) unstable; urgency=low array layout, as nobody complained on the BTS I assume nobody used the feature, so I remove it ;) - 04_geolizer: dropped, GeoIP already integrated upstream. - - 05_apache_logio: ported to new version. + - 05_apache_logio: ported to new version. Integrating fix for the total calculation. Closes: #482771 While porting I rewrote part of code that Closes: #558749 - 06_UserColor: dropped, already integrated upstream. @@ -210,7 +224,7 @@ webalizer (2.01.10-31.1) unstable; urgency=low webalizer (2.01.10-31) unstable; urgency=low - * Better write webalizer/upgrade2011030 message in template file. + * Better write webalizer/upgrade2011030 message in template file. (Closes: #383820, #397193) * Changed cron script to dont abort, and continue when occour error with just one .conf file. Now it continue and just print a error message. @@ -291,7 +305,7 @@ webalizer (2.01.10-30) unstable; urgency=low - Fixed buffer overflow when parsing FTP xfer log files. - Fixed buffer overflow when parsing webalizer.conf. - Fixed off-by-one bug in the DNS handling. - 12_recognize_Opera_browsers. Thanks to + 12_recognize_Opera_browsers. Thanks to Steinar H. Gunderson <[email protected]> - Webalizer now recognizes Opera browsers. 13_add_NoFollow_feature. Thanks to Robert Cheramy <[email protected]>. @@ -299,7 +313,7 @@ webalizer (2.01.10-30) unstable; urgency=low 14_add_search_engines. Thanks to Gavin Rogers <[email protected]> and Cyril Bouthors <[email protected]>. - Added more search engines in sample.conf file. - 15_ignore_localhost. Thanks to + 15_ignore_localhost. Thanks to Norbert Bottlaender-Prier <[email protected]> - Ignore localhost by default in sample.conf file. 16_fix_typos_webalizer.1 @@ -313,10 +327,10 @@ webalizer (2.01.10-30) unstable; urgency=low - Added a little text about this patch in README.Debian.(Closes: #334984) 18_ttf_support_throught_libgd. Thanks to Tatsuki Sugiura <[email protected]>. - make possible to use TrueTypeFont throught libgd. (Closes: #201723) - 19_add_PagePrefix_feature. Thanks to + 19_add_PagePrefix_feature. Thanks to Remco van de Meent <[email protected]> - Added new PagePrefix feature. (Closes: #149183) - 20_fix_capital_letter_option. Thanks to + 20_fix_capital_letter_option. Thanks to Frank IJskes <[email protected]> (Closes: #358764) 21_remove_-v_option. (Closes: #308190) Remove -v option to follows common and already established guidelines. @@ -334,7 +348,7 @@ webalizer (2.01.10-30) unstable; urgency=low release and if yes move /etc/webalizer.conf to new place. * Suggests apache2's log file on installation. (Closes: #232564) * Remove /var/www/webalizer directory after purge, remove output for - /dev/null in mkdir command and change exit code to 1 instead -1. + /dev/null in mkdir command and change exit code to 1 instead -1. (Closes: #349594) * Updated pt_BR debconf translation. diff --git a/debian/control b/debian/control index 8a34c38..1d278b5 100644 --- a/debian/control +++ b/debian/control @@ -6,13 +6,13 @@ Uploaders: Felipe Augusto van de Wiel (faw) <[email protected]> Build-Depends: debhelper (>= 10), libgd-dev, libfreetype6-dev, libpng-dev, libdb-dev (>= 4.7), zlib1g-dev, gettext, po-debconf, libgeoip-dev, autoconf Standards-Version: 4.1.2 Homepage: http://www.mrunix.net/webalizer/ -Vcs-Git: https://anonscm.debian.org/git/collab-maint/webalizer.git -Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/webalizer.git/ +#Vcs-Git: https://anonscm.debian.org/git/collab-maint/webalizer.git +#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/webalizer.git/ Package: webalizer Architecture: any Recommends: geoip-database -Suggests: httpd, ttf-dejavu-core | ttf-bitstream-vera | ttf-freefont +Suggests: httpd, fonts-dejavu-core | fonts-freefont-ttf Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: debconf (>= 1.4.58) | debconf-2.0 Description: web server log analysis program diff --git a/debian/copyright b/debian/copyright index 12f12ae..1b18220 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: webalizer Upstream-Contact: Bradford L. Barrett <[email protected]> Source: http://www.mrunix.net/webalizer/ diff --git a/debian/patches/18_ttf_support_throught_libgd.diff b/debian/patches/18_ttf_support_throught_libgd.diff index b5a51c3..1d2c0d8 100644 --- a/debian/patches/18_ttf_support_throught_libgd.diff +++ b/debian/patches/18_ttf_support_throught_libgd.diff @@ -1,5 +1,5 @@ From: Tatsuki Sugiura <[email protected]> -Subject: make possible to use TrueTypeFont throught libgd +Subject: make possible to use TrueTypeFont through libgd Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=201723 @@ -11,7 +11,7 @@ Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=201723 # GD's built-in font has no Japanese Kanji and any other multi-byte # characters. Graph labels can't be displayed correctly under some # locales which has these characters. -# This patch make possible to use TrueTypeFont throught libgd +# This patch make possible to use TrueTypeFont through libgd # function. Index: webalizer/README.FIRST diff --git a/debian/patches/23_gettext_first_part.diff b/debian/patches/23_gettext_first_part.diff index 598efdb..bd93086 100644 --- a/debian/patches/23_gettext_first_part.diff +++ b/debian/patches/23_gettext_first_part.diff @@ -19,11 +19,11 @@ He described his patch as follows: # - case 't': msg_title=optarg; break; /* Report title */ # + case 't': _("Usage Statistics for")=optarg; break; /* Report title */ # To do it, just look at .diff files and after remove these one. -# 5. Looked for strings that arent msg_*, like new string put with fprintf, ex. +# 5. Looked for strings that aren't msg_*, like new string put with fprintf, ex. # fprintf(stderr,"%s %s!\n","Error: File is a symlink",log_fname); # in webalizer.c file # grep \" *.c |grep -v "_(\"" |less -# 6. Found and change string that arent msg_* . Patch of Geolizer is an example. +# 6. Found and change string that aren't msg_* . Patch of Geolizer is an example. # It put messages like "Error, something..." and we need to change to _("Error, som...") # 7. Created webalizer.pot file with the follow command: # xgettext --default-domain=webalizer --directory=. -o po/webalizer.pot \ diff --git a/debian/po/de.po b/debian/po/de.po index 1cae472..f0778f6 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -1,28 +1,28 @@ # translation of de.po to German # German translation for webalizer (debconf). # Copyright 2005 Free Software Foundation, Inc. -# # Erik Schanze <[email protected]>, 2005-2006. +# Markus Hiereth <[email protected]>, 2017. msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2013-11-17 23:24+0100\n" -"PO-Revision-Date: 2006-11-15 22:20+0100\n" -"Last-Translator: Erik Schanze <[email protected]>\n" -"Language-Team: German <[email protected]>\n" +"PO-Revision-Date: 2017-12-28 19:13+0200\n" +"Last-Translator: Markus Hiereth <[email protected]>\n" +"Language-Team: debian-l10n-german <[email protected]>\n" "Language: de\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=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.7.1\n" #. Type: note #. Description #: ../templates:1001 msgid "Upgrading from a version < 2.01.6" -msgstr "Aktualisierung einer Version < 2.01.6" +msgstr "Upgrade einer Version < 2.01.6" #. Type: note #. Description @@ -31,15 +31,15 @@ msgid "" "WARNING: If you're upgrading from a version < 2.01.6, see /usr/share/doc/" "webalizer/README.FIRST.gz for details on upgrading your old data!!" msgstr "" -"ACHTUNG: Wenn Sie eine Version < 2.01.6 aktualisieren, sehen Sie sich die " -"Datei /usr/share/doc/webalizer/README.FIRST.gz für Einzelheiten der " -"Aktualisierung Ihrer alten Daten an!!" +"ACHTUNG: Sollte noch eine Programmversion vor 2.01.6 installiert sein, " +"entnehmen Sie bitte der Datei /usr/share/doc/webalizer/README.FIRST.gz, wie " +"mit den alten Daten verfahren wird." #. Type: note #. Description #: ../templates:2001 msgid "Upgrading from a version < 2.01.10-30" -msgstr "Aktualisierung einer Version < 2.01.10-30" +msgstr "Upgrade einer Version < 2.01.10-30" #. Type: note #. Description @@ -50,10 +50,10 @@ msgid "" "gz, README.gz and new examples/sample.conf.gz in /usr/share/doc/webalizer " "directory." msgstr "" -"ACHTUNG: Diese Aktualisierung wird die Datei webalizer.conf in das " -"Verzeichnis /etc/webalizer verschieben. Es wurden auch neue Funktionen " -"hinzugefügt. Bitte lesen Sie die Dateien README.FIRST.gz, README.gz und die " -"neue examples/sample.conf.gz im Verzeichnis /usr/share/doc/webalizer." +"ACHTUNG: Ab dieser Version finden Sie die Datei webalizer.conf im " +"Verzeichnis /etc/webalizer. Es wurden auch neue Funktionen hinzugefügt. " +"Bitte lesen Sie die Dateien README.FIRST.gz, README.gz und die neue examples/" +"sample.conf.gz im Verzeichnis /usr/share/doc/webalizer." #. Type: string #. Description @@ -65,7 +65,7 @@ msgstr "Verzeichnis, in dem die Ausgaben abgelegt werden:" #. Description #: ../templates:4001 msgid "Generate a default configuration file ?" -msgstr "" +msgstr "Eine Standard-Konfigurationsdatei erzeugen?" #. Type: boolean #. Description @@ -75,18 +75,21 @@ msgid "" "on using more than one configuration or using the -c parameter, you probably " "want to say No here." msgstr "" +"Beachten Sie, dass webalizer immer die Standardkonfiguration auswertet. Wenn " +"Sie also mit mehr als einer Konfiguration arbeiten oder den Parameter -c " +"verwenden wollen, werden Sie hier wohl mit »Nein« antworten." #. Type: string #. Default #: ../templates:5001 msgid "Usage Statistics for[ hostname will be appended ]" -msgstr "Benutzungsstatistik für" +msgstr "Benutzungsstatistik für [Hostname wird angehängt]" #. Type: string #. Description #: ../templates:5002 msgid "Title of the reports webalizer will generate:" -msgstr "Titel der Berichte, die Webalizer erstellen wird:" +msgstr "Titel der Berichte, die webalizer erstellen wird:" #. Type: string #. Description @@ -113,6 +116,5 @@ msgid "" "Speed up name resolving with the DNSCache option enabled. See /usr/share/doc/" "webalizer/DNS.README.gz for more information." msgstr "" -"Die Namensauflösung wird durch Aktivieren der DNSCache-Option beschleunigt. " -"Mehr Informationen finden Sie in der Datei /usr/share/doc/webalizer/DNS." -"README.gz." +"Die Namensauflösung wird durch die aktive DNSCache-Option beschleunigt. Mehr " +"Informationen finden Sie in der Datei /usr/share/doc/webalizer/DNS.README.gz."
signature.asc
Description: OpenPGP digital signature
