Package: couriergraph
Version: 0.24-1
Severity: normal
Tags: patch
Hi,
Attached is the diff for my couriergraph 0.24-1.1 NMU.
--
Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D
Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
diff -u couriergraph-0.24/couriergraph.pl couriergraph-0.24/couriergraph.pl
--- couriergraph-0.24/couriergraph.pl
+++ couriergraph-0.24/couriergraph.pl
@@ -316,7 +316,7 @@
my $daemon_pidfile = '/var/run/servergraph/couriergraph.pid';
my $daemon_rrd_dir = '/var/lib/couriergraph';
-my $courier_pop3d = 'pop3login';
+my $courier_pop3d = 'courierpop3login';
my $courier_imapd = 'imaplogin';
my $courier_pop3d_ssl = 'pop3d-ssl';
my $courier_imapd_ssl = 'imapd-ssl';
diff -u couriergraph-0.24/debian/control couriergraph-0.24/debian/control
--- couriergraph-0.24/debian/control
+++ couriergraph-0.24/debian/control
@@ -7,9 +7,9 @@
Package: couriergraph
Architecture: all
-Pre-Depends: debconf (>= 1.1)
+Pre-Depends: debconf (>= 1.1) | debconf-2.0
Depends: libfile-tail-perl, librrds-perl
-Recommends: httpd courier-pop courier-imap
+Recommends: httpd, courier-pop, courier-imap
Description: Mail statistics RRDtool frontend for Courier-{POP,IMAP}
Couriergraph is a very simple mail statistics RRDtool frontend for
Courier-POP & Courier-IMAP that produces daily, weekly, monthly and
diff -u couriergraph-0.24/debian/changelog couriergraph-0.24/debian/changelog
--- couriergraph-0.24/debian/changelog
+++ couriergraph-0.24/debian/changelog
@@ -1,3 +1,15 @@
+couriergraph (0.24-1.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Fix broken recommends (Closes: #352785).
+ * Add debconf-2.0 alternative (Closes: #331784).
+ * Add Vietnamese debconf translation (Closes: #313372).
+ * Add Czech debconf translation (Closes: #306445).
+ * Add Swedish debconf translation (Closes: #333370).
+ * Fix default pop login detection (Closes: #293654).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Tue, 28 Feb 2006 23:19:31 +0100
+
couriergraph (0.24-1) unstable; urgency=low
* New upstream version (Closes: #284958)
only in patch2:
unchanged:
--- couriergraph-0.24.orig/debian/po/vi.po
+++ couriergraph-0.24/debian/po/vi.po
@@ -0,0 +1,65 @@
+# Vietnamese translation for couriergraph.
+# Copyright ?? 2005 Free Software Foundation, Inc.
+# Clytie Siddall <[EMAIL PROTECTED]>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: couriergraph 0.24-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-19 18:33+0200\n"
+"PO-Revision-Date: 2005-06-13 20:09+0930\n"
+"Last-Translator: Clytie Siddall <[EMAIL PROTECTED]>\n"
+"Language-Team: Vietnamese <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#.Type: boolean
+#.Description
+#:../templates:4
+msgid "Should CourierGraph start on boot?"
+msgstr "B???n c?? mu???n kh???i ch???y tr??nh CourierGraph l??c kh???i ?????ng
m??y kh??ng?"
+
+#.Type: boolean
+#.Description
+#:../templates:4
+msgid ""
+"Couriergraph can start on boot time as a daemon. Then it will monitor your "
+"mail logfile for changes. This is recommended."
+msgstr "Tr??nh CourierGraph c?? th??? kh???i ch???y l??c kh???i ?????ng m??y
v???i t?? c??ch tr??nh n???n, ????? theo d??i t???p tin b???n ghi ????? t??m
thay ?????i n??o. Khuy???n kh??ch l??m nh?? th???."
+
+#.Type: boolean
+#.Description
+#:../templates:4
+msgid ""
+"The other method is to call couriergraph.pl by hand with the -l parameter."
+msgstr "Ph????ng ph??p kh??c l?? t??? g???i ??couriergraph.pl?? v???i tham
s??? ??-l??."
+
+#.Type: string
+#.Description
+#:../templates:13
+msgid "Which logfile should be used by couriergraph?"
+msgstr "Tr??nh couriergraph n??n d??ng t???p tin b???n ghi n??o?"
+
+#.Type: string
+#.Description
+#:../templates:13
+msgid ""
+"Enter the logfile which should be used to create the databases for "
+"couriergraph. If unsure, leave default."
+msgstr "H??y nh???p t???p tin b???n ghi n???n ???????c d??ng ????? t???o c??
s??? d??? li???u cho couriergraph. N???u ch??a ch???c th?? ch???n m???c
?????nh."
+
+#.Type: boolean
+#.Description
+#:../templates:20
+msgid "Remove RRD files on purge?"
+msgstr "B???n c?? mu???n lo???i b??? c??c t???p tin RRD khi t???y kh??ng?"
+
+#.Type: boolean
+#.Description
+#:../templates:20
+msgid ""
+"Couriergraph keeps its database files under /var/lib/couriergraph. Should "
+"this directory be removed completely on purge?"
+msgstr "Tr??nh couriergraph l??u c??c t???p tin c?? s??? d??? li???u d?????i
??/var/lib/couriergraph??. B???n c?? mu???n x??a b??? th?? m???c n??y ho??n
th??nh khi t???y g??i tin n??y kh??ng?"
only in patch2:
unchanged:
--- couriergraph-0.24.orig/debian/po/cs.po
+++ couriergraph-0.24/debian/po/cs.po
@@ -0,0 +1,69 @@
+# Czech translation of couriergraph templates
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: couriergraph 0.24-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-19 18:33+0200\n"
+"PO-Revision-Date: 2005-04-24 20:58+0200\n"
+"Last-Translator: Martin Sin <[EMAIL PROTECTED]>\n"
+"Language-Team: Czech <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid "Should CourierGraph start on boot?"
+msgstr "M? se CourierGraph spustit p?i startu?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid ""
+"Couriergraph can start on boot time as a daemon. Then it will monitor your "
+"mail logfile for changes. This is recommended."
+msgstr ""
+"Couriergraph se m??e spustit p?i startu jako daemon. Pak bude monitorovat V??
"
+"po?tovn? logfile na zm?ny. Toto je doporu?eno."
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid ""
+"The other method is to call couriergraph.pl by hand with the -l parameter."
+msgstr ""
+"Dal??m zp?sobem je zavolat couriergraph.pl ru?n? s parametrem -l."
+
+#. Type: string
+#. Description
+#: ../templates:13
+msgid "Which logfile should be used by couriergraph?"
+msgstr "Kter? logfile m? b?t pou?it programem couriergraph?"
+
+#. Type: string
+#. Description
+#: ../templates:13
+msgid ""
+"Enter the logfile which should be used to create the databases for "
+"couriergraph. If unsure, leave default."
+msgstr ""
+"Vlo?te logfile, kter? se m? pou??t pro vytvo?en? datab?ze pro "
+"couriergraph. Pokud si nejste jist?, nechte implicitn?."
+
+#. Type: boolean
+#. Description
+#: ../templates:20
+msgid "Remove RRD files on purge?"
+msgstr "Odstranit RRD soubory p?i ?i?t?n??"
+
+#. Type: boolean
+#. Description
+#: ../templates:20
+msgid ""
+"Couriergraph keeps its database files under /var/lib/couriergraph. Should "
+"this directory be removed completely on purge?"
+msgstr ""
+"Couriergraph zachov?v? vlastn? datab?zi soubor? v /var/lib/couriergraph. "
+"M??e b?t tento adres?? kompletn? odstran?n p?i ?i?t?n??"
only in patch2:
unchanged:
--- couriergraph-0.24.orig/debian/po/sv.po
+++ couriergraph-0.24/debian/po/sv.po
@@ -0,0 +1,78 @@
+# 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.
+# , fuzzy
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: couriergraph 0.24-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-19 18:33+0200\n"
+"PO-Revision-Date: 2005-10-12 17:28+0200\n"
+"Last-Translator: Daniel Nylander <[EMAIL PROTECTED]>\n"
+"Language-Team: Swedish <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid "Should CourierGraph start on boot?"
+msgstr "Ska CourierGraph startas vid uppstart?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid ""
+"Couriergraph can start on boot time as a daemon. Then it will monitor your "
+"mail logfile for changes. This is recommended."
+msgstr ""
+"Couriergraph kan startas som en daemon vid uppstart. Den kommer d? att
?vervaka din e-postloggfil f?r "
+"?ndringar. Detta ?r rekommenderat."
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid ""
+"The other method is to call couriergraph.pl by hand with the -l parameter."
+msgstr ""
+"Den andra metoden ?r att kalla upp couriergraph.pl f?r hand med -l
parametern."
+
+#. Type: string
+#. Description
+#: ../templates:13
+msgid "Which logfile should be used by couriergraph?"
+msgstr "Vilken loggfil ska anv?ndas av couriergraph?"
+
+#. Type: string
+#. Description
+#: ../templates:13
+msgid ""
+"Enter the logfile which should be used to create the databases for "
+"couriergraph. If unsure, leave default."
+msgstr ""
+"Ange loggfilen som ska anv?ndas f?r att skapa databaserna f?r couriergraph.
Om du ?r os?ker, l?mna den blank."
+
+#. Type: boolean
+#. Description
+#: ../templates:20
+msgid "Remove RRD files on purge?"
+msgstr "Ta bort RRD-filer vid avinstallation?"
+
+#. Type: boolean
+#. Description
+#: ../templates:20
+msgid ""
+"Couriergraph keeps its database files under /var/lib/couriergraph. Should "
+"this directory be removed completely on purge?"
+msgstr ""
+"Couriergraph sparar sina databaser under /var/lib/couriergraph. Ska denna
mapp tas bort helt vid avinstallation?"
+
