--- a/debian/changelog	Tue Mar 04 20:40:26 2003 +0000
+++ b/debian/changelog	Tue Mar 04 20:47:54 2003 +0000
@@ -1,10 +1,11 @@
-noffle (1.1.4-2.cvs20030304) unstable; urgency=low
+noffle (1.1.4-3) unstable; urgency=low
 
+  * Transition to po-debconf, updated build-dependencies.
+  * Removed dependency on sysvinit.
   * Added xinetd dependency option and example.
-  * Removed dependency on sysvinit.
   * Minor debian/ cleanup.
 
- -- Martin A. Godisch <godisch@debian.org>  Tue, 04 Mar 2003 18:26:30 +0100
+ -- Martin A. Godisch <godisch@debian.org>  Tue, 04 Mar 2003 21:41:51 +0100
 
 noffle (1.0.1-1.1.woody.1) stable; urgency=medium
 

--- a/debian/control	Tue Mar 04 20:40:26 2003 +0000
+++ b/debian/control	Tue Mar 04 20:47:54 2003 +0000
@@ -2,7 +2,7 @@
 Section: news
 Priority: optional
 Maintainer: Martin A. Godisch <godisch@debian.org>
-Build-Depends: libgdbmg1-dev, debconf-utils
+Build-Depends: libgdbmg1-dev, po-debconf
 Standards-Version: 3.5.8
 
 Package: noffle

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/po/POTFILES.in	Tue Mar 04 20:47:54 2003 +0000
@@ -0,0 +1,1 @@
+[type: gettext/rfc822deb] templates

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/po/templates.pot	Tue Mar 04 20:47:54 2003 +0000
@@ -0,0 +1,162 @@
+#
+#    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: PACKAGE VERSION\n"
+"POT-Creation-Date: 2003-03-04 21:38+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../templates:4
+msgid "Manage noffle configuration using debconf?"
+msgstr ""
+
+#. Description
+#: ../templates:4
+msgid ""
+"I'm going to overwrite /etc/news/noffle.conf and /etc/default/noffle with "
+"some defaults and your following answers, and will update /etc/inetd.conf if "
+"you say 'yes' here."
+msgstr ""
+
+#. Default
+#: ../templates:11
+msgid "119"
+msgstr ""
+
+#. Description
+#: ../templates:12
+msgid "Please choose the port number noffle runs on:"
+msgstr ""
+
+#. Description
+#: ../templates:12
+msgid ""
+"The default port number for NNTP is 119 (nntp). However, perhaps you want to "
+"run noffle alongside a normal NNTP server; in that case, choose another "
+"number (above 1024, I recommend 10119), and configure your news reader also "
+"to use that port number."
+msgstr ""
+
+#. Default
+#: ../templates:20
+msgid "news"
+msgstr ""
+
+#. Description
+#: ../templates:21
+msgid "Which parent NNTP server do you want to use?"
+msgstr ""
+
+#. Description
+#: ../templates:21
+msgid ""
+"Noffle expects to obtain its news from another NNTP server. Enter the name "
+"of that server here. If the server uses a non-standard port number for the "
+"NNTP connection, please fill that in here as 'servername:portnumber'."
+msgstr ""
+
+#. Description
+#: ../templates:28
+msgid "What is your username when accessing your parent NNTP server?"
+msgstr ""
+
+#. Description
+#: ../templates:28
+msgid ""
+"If you need to authenticate you may fill in your username on your parent "
+"NNTP server; if not, just leave this field blank."
+msgstr ""
+
+#. Description
+#: ../templates:37
+msgid "What is your password when accessing your parent NNTP server?"
+msgstr ""
+
+#. Description
+#: ../templates:37
+msgid ""
+"If you need to authenticate you may fill in your password on your parent "
+"NNTP server; if not, just leave this field blank. Warning: This password "
+"will be saved in plaintext in /etc/news/noffle.conf and in the debconf "
+"database!"
+msgstr ""
+
+#. Description
+#: ../templates:37
+msgid ""
+"This is not the preferred way of authentication, since your password will be "
+"transmitted in clear text, see README.Debian for more details."
+msgstr ""
+
+#. Choices
+#: ../templates:48
+msgid "ppp, cron"
+msgstr ""
+
+#. Description
+#: ../templates:49
+msgid "How is noffle supposed to fetch the articles?"
+msgstr ""
+
+#. Description
+#: ../templates:49
+msgid ""
+"If this is a dialup system, then noffle can be configured to fetch articles "
+"when the PPP connection comes online. This is done via scripts in /etc/ppp/"
+"ip-up.d/ and /etc/ppp/ip-down.d/. If you have a permanent connection, noffle "
+"will assume it can always access the NNTP server and a cron job will do."
+msgstr ""
+
+#. Default
+#: ../templates:58
+msgid "300"
+msgstr ""
+
+#. Description
+#: ../templates:59
+msgid "Fetch how many articles by default?"
+msgstr ""
+
+#. Description
+#: ../templates:59
+msgid ""
+"When noffle fetches articles, it will never fetch more than this amount; if "
+"there are more, the oldest are discarded."
+msgstr ""
+
+#. Default
+#: ../templates:65
+msgid "14"
+msgstr ""
+
+#. Description
+#: ../templates:66
+msgid "What should the default expire time (in days) be?"
+msgstr ""
+
+#. Description
+#: ../templates:66
+msgid ""
+"Noffle is configured to purge the local cache of articles older than a "
+"certain limit. This parameter configures the minimum age of articles to "
+"expire; this can be fine-tuned in /etc/news/noffle.conf if necessary. Enter "
+"'0' to disable it."
+msgstr ""

--- a/debian/rules	Tue Mar 04 20:40:26 2003 +0000
+++ b/debian/rules	Tue Mar 04 20:47:54 2003 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# $Id: rules 462 2003-02-24 06:23:50Z godisch $
+# $Id: rules 474 2003-03-04 20:47:54Z godisch $
 
 #export MAINT_BUILD=1
 
@@ -141,7 +141,7 @@
 	install    -o root -g root -m 0755 debian/config debian/preinst debian/postinst debian/prerm debian/postrm $(DEBDIR)
 	cd $(BUILDDIR) && find usr -type f -print0 | xargs -0 md5sum | tee DEBIAN/md5sums
 	cd $(BUILDDIR) && find ./etc -type f | cut -c 2- | tee DEBIAN/conffiles
-	debconf-mergetemplate debian/templates.?? debian/templates > $(DEBDIR)/templates
+	po2debconf debian/templates > $(DEBDIR)/templates
 	chown root:root $(DEBDIR)/md5sums $(DEBDIR)/conffiles $(DEBDIR)/templates
 	chmod 0644      $(DEBDIR)/md5sums $(DEBDIR)/conffiles $(DEBDIR)/templates
 

--- a/debian/templates	Tue Mar 04 20:40:26 2003 +0000
+++ b/debian/templates	Tue Mar 04 20:47:54 2003 +0000
@@ -1,73 +1,70 @@
 Template: noffle/debconf
 Type: boolean
 Default: yes
-Description: Manage noffle configuration using debconf?
- I'm going to overwrite /etc/news/noffle.conf and /etc/default/noffle
- with some defaults and your following answers, and will update
- /etc/inetd.conf if you say 'yes' here.
+_Description: Manage noffle configuration using debconf?
+ I'm going to overwrite /etc/news/noffle.conf and /etc/default/noffle with
+ some defaults and your following answers, and will update /etc/inetd.conf
+ if you say 'yes' here.
 
 Template: noffle/port
 Type: string
-Default: 119
-Description: Please choose the port number noffle runs on
- The default port number for NNTP is 119.
- However, perhaps you want to run noffle alongside a normal
- NNTP server; in that case, choose another number (above 1024,
- I recommend 10119), and configure your news reader also to use
- that port number.
+_Default: 119
+_Description: Please choose the port number noffle runs on:
+ The default port number for NNTP is 119 (nntp). However, perhaps you want
+ to run noffle alongside a normal NNTP server; in that case, choose another
+ number (above 1024, I recommend 10119), and configure your news reader also
+ to use that port number.
 
 Template: noffle/server
 Type: string
-Default: news
-Description: Which parent NNTP server do you want to use?
- Noffle expects to obtain its news from another NNTP server.
- Enter the name of that server here.
- .
- If the server uses a non-standard port number for the NNTP
- connection, please fill that in here as servername:portnumber
+_Default: news
+_Description: Which parent NNTP server do you want to use?
+ Noffle expects to obtain its news from another NNTP server. Enter the name
+ of that server here. If the server uses a non-standard port number for the
+ NNTP connection, please fill that in here as 'servername:portnumber'.
 
 Template: noffle/username
 Type: string
-Description: What is your username when accessing your parent NNTP server?
- If you need to authenticate you may fill in your username on
- your parent NNTP server; if not, just leave this field blank.
+_Description: What is your username when accessing your parent NNTP server?
+ If you need to authenticate you may fill in your username on your parent
+ NNTP server; if not, just leave this field blank.
  .
  This is not the preferred way of authentication, since your password will
- be transmitted in clear text. See README.Debian for more details.
+ be transmitted in clear text, see README.Debian for more details.
 
 Template: noffle/password
 Type: password
-Description: What is your password when accessing your parent NNTP server?
- If you need to authenticate you may fill in your password on
- your parent NNTP server; if not, just leave this field blank.
- Warning: This password will be saved in plaintext in
- /etc/news/noffle.conf and in the debconf database!
+_Description: What is your password when accessing your parent NNTP server?
+ If you need to authenticate you may fill in your password on your parent
+ NNTP server; if not, just leave this field blank. Warning: This password
+ will be saved in plaintext in /etc/news/noffle.conf and in the debconf
+ database!
  .
  This is not the preferred way of authentication, since your password will
- be transmitted in clear text. See README.Debian for more details.
+ be transmitted in clear text, see README.Debian for more details.
 
 Template: noffle/fetchmode
 Type: select
-Choices: ppp, cron
-Description: How is noffle supposed to fetch the articles?
- If this is a dialup system, then noffle can be configured to
- fetch articles when the PPP connection comes online. This is
- done via scripts in /etc/ppp/ip-up.d/ and /etc/ppp/ip-down.d/.
- If you have a permanent connection, noffle will assume it
- can always access the NNTP server and a cron job will do.
+_Choices: ppp, cron
+_Description: How is noffle supposed to fetch the articles?
+ If this is a dialup system, then noffle can be configured to fetch articles
+ when the PPP connection comes online. This is done via scripts in
+ /etc/ppp/ip-up.d/ and /etc/ppp/ip-down.d/. If you have a permanent
+ connection, noffle will assume it can always access the NNTP server and a
+ cron job will do.
 
 Template: noffle/maxfetch
 Type: string
-Default: 300
-Description: Fetch how many articles by default?
- When noffle fetches articles, it will never fetch more than this
- amount; if there are more, the oldest are discarded.
+_Default: 300
+_Description: Fetch how many articles by default?
+ When noffle fetches articles, it will never fetch more than this amount; if
+ there are more, the oldest are discarded.
 
 Template: noffle/default-expire
 Type: string
-Default: 14
-Description: What should the default expire time (in days) be?
- Noffle is configured to purge the local cache of articles older than
- a certain limit. This parameter configures the minimum age of articles
- to expire; this can be fine-tuned in /etc/news/noffle.conf if necessary.
+_Default: 14
+_Description: What should the default expire time (in days) be?
+ Noffle is configured to purge the local cache of articles older than a
+ certain limit. This parameter configures the minimum age of articles to
+ expire; this can be fine-tuned in /etc/news/noffle.conf if necessary.
  Enter '0' to disable it.

--- a/debian/templates.de	Tue Mar 04 20:40:26 2003 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-Template: noffle/debconf
-Type: boolean
-Default: yes
-Description: Manage noffle configuration using debconf?
- I'm going to overwrite /etc/news/noffle.conf and /etc/default/noffle
- with some defaults and your following answers, and will update
- /etc/inetd.conf if you say 'yes' here.
-Description-de: Soll noffle mittels debconf konfiguriert werden?
- /etc/news/noffle.conf und /etc/default/noffle werden mit einigen
- Standardwerten und Ihren folgenden Antworten überschrieben, und
- /etc/inetd.conf wird aktualisert werden, wenn Sie dies bejahen.
-
-Template: noffle/port
-Type: string
-Default: 119
-Description: Please choose the port number noffle runs on
- The default port number for NNTP is 119.
- However, perhaps you want to run noffle alongside a normal
- NNTP server; in that case, choose another number (above 1024,
- I recommend 10119), and configure your news reader also to use
- that port number.
-Description-de: Wählen Sie den Port für noffle.
- Der Standardport für NNTP ist 119. Vielleicht möchten Sie
- noffle auf einem anderen Port als den, den ein normaler
- NNTP-Server benutzt, antworten lassen (z.B. über Port 1024,
- vorgeschlagen wird Port 10119). Wählen Sie dazu den
- Port aus und konfigurieren Sie Ihren Newsreader entsprechend.
-
-Template: noffle/server
-Type: string
-Default: news
-Description: Which parent NNTP server do you want to use?
- Noffle expects to obtain its news from another NNTP server.
- Enter the name of that server here.
- .
- If the server uses a non-standard port number for the NNTP
- connection, please fill that in here as servername:portnumber
-Description-de: Von welchem Server sollen News bezogen werden?
- Noffle lädt News von einem anderen übergeordneten Server.
- Bitte geben Sie den Namen des Servers an.
- .
- Wenn der Server eine nicht standardmäßige Portnummer für NNTP
- verwendet, dann geben Sie diese hier mit Servername:Portnummer an.
-
-Template: noffle/username
-Type: string
-Description: What is your username when accessing your parent NNTP server?
- If you need to authenticate you may fill in your username on
- your parent NNTP server; if not, just leave this field blank.
- .
- This is not the preferred way of authentication, since your password will
- be transmitted in clear text. See README.Debian for more details.
-Description-de: Wie lautet Ihr Nutzername bei dem remote NNTP-Server?
- Falls Sie sich bei dem remote NNTP-Server identifizieren müssen,
- können Sie hier Ihren Nutzernamen eingeben; falls nicht, lassen
- Sie dieses Eingabefeld leer.
- .
- Dies ist nicht die bevorzugte Methode der Identifikation, da Ihr
- Paßwort in diesem Fall als Klartext übertragen wird. Beachten Sie
- die Datei README.Debian für weitere Details hierzu.
-
-Template: noffle/password
-Type: password
-Description: What is your password when accessing your parent NNTP server?
- If you need to authenticate you may fill in your password on
- your parent NNTP server; if not, just leave this field blank.
- Warning: This password will be saved in plaintext in
- /etc/news/noffle.conf and in the debconf database!
- .
- This is not the preferred way of authentication, since your password will
- be transmitted in clear text. See README.Debian for more details.
-Description-de: Wie lautet Ihr Paßwort bei dem remote NNTP-Server?
- Falls Sie sich bei dem remote NNTP-Server identifizieren müssen,
- können Sie hier Ihr Paßwort eingeben; falls nicht, lassen Sie
- dieses Eingabefeld leer. Achtung: Dieses Paßwort wird als Klartext
- in der Datei /etc/news/noffle.conf und der debconf-Datenbank abgelegt!
- .
- Dies ist nicht die bevorzugte Methode der Identifikation, da Ihr
- Paßwort in diesem Fall als Klartext übertragen wird. Beachten Sie
- die Datei README.Debian für weitere Details hierzu.
-
-Template: noffle/fetchmode
-Type: select
-Choices: ppp, cron
-Description: How is noffle supposed to fetch the articles?
- If this is a dialup system, then noffle can be configured to
- fetch articles when the PPP connection comes online. This is
- done via scripts in /etc/ppp/ip-up.d/ and /etc/ppp/ip-down.d/.
- If you have a permanent connection, noffle will assume it
- can always access the NNTP server and a cron job will do.
-Choices-de: ppp, cron
-Description-de: Wie soll noffle News herunterladen?
- Wenn dies ein Rechner mit Internet-Einwahl ist, dann kann
- noffle so konfiguriert werden, das es News herunterlädt, wenn
- eine PPP-Verbindung aufgebaut wurde. Dies geschieht durch
- die Skripte in /etc/ppp/ip-up.d/ und /etc/ppp/ip-down.d/.
- Wenn Sie eine permanente Verbindung haben, dann wird davon
- ausgegangen, daß mittels CRON immer auf den Newsserver
- zugegriffen werden kann.
-
-Template: noffle/maxfetch
-Type: string
-Default: 300
-Description: Fetch how many articles by default?
- When noffle fetches articles, it will never fetch more than this
- amount; if there are more, the oldest are discarded.
-Description-de: Wieviele Artikel sollen heruntergeladen werden?
- Wenn noffle Artikel herunterlädt, dann lädt es nie mehr Artikel
- als Sie hier angeben. Es werden immer die neueren Artikel
- heruntergeladen.
-
-Template: noffle/default-expire
-Type: string
-Default: 14
-Description: What should the default expire time (in days) be?
- Noffle is configured to purge the local cache of articles older than
- a certain limit. This parameter configures the minimum age of articles
- to expire; this can be fine-tuned in /etc/news/noffle.conf if necessary.
- Enter '0' to disable it.
-Description-de: Wie lange soll die Verfallszeit (in Tagen) sein?
- Noffle is so konfiguriert, dass es Artikel, die ein bestimmtes
- Alter erreicht haben, gelöscht werden. Dieser Parameter bestimmt
- das minimale Alter der Artikel. Die Feineinstellung dieser Angaben
- kann bei Bedarf in der Datei /etc/news/noffle.conf erfolgen. Geben
- Sie '0' ein, um hiervon keinen Gebrauch zu machen.