Your message dated Wed, 14 Nov 2012 17:31:56 +0000
with message-id <1352914316.27968.161.ca...@jacala.jungle.funky-badger.org>
and subject line Re: Bug#692965: unblock: gnarwl/3.6.dfsg-6.2
has caused the Debian Bug report #692965,
regarding unblock: gnarwl/3.6.dfsg-6.2
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
692965: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=692965
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
X-Debbugs-CC: gna...@packages.debian.org
Please unblock package gnarwl. The version currently in Sid fixes RC bug
#687943 and adds a Japanese translation update (#692477). The debdiff is
attached.
unblock gnarwl/3.6.dfsg-6.2
Thanks,
diff -Nru gnarwl-3.6.dfsg/debian/changelog gnarwl-3.6.dfsg/debian/changelog
--- gnarwl-3.6.dfsg/debian/changelog 2012-09-10 23:34:12.000000000 +0200
+++ gnarwl-3.6.dfsg/debian/changelog 2012-11-08 21:41:48.000000000 +0100
@@ -1,3 +1,13 @@
+gnarwl (3.6.dfsg-6.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * No longer ship /etc/gnarwl.cfg as a conffile; manage it using ucf to
+ preserve user changes. Thanks to Federico Ceratto for writing a first
+ version of the patch. (Closes: #687943)
+ * Add new Japanese debconf translation by Victory (Closes: #692477)
+
+ -- Sébastien Villemot <sebast...@debian.org> Thu, 08 Nov 2012 20:40:37 +0100
+
gnarwl (3.6.dfsg-6.1) unstable; urgency=low
* Non-maintainer upload to fix pending l10n issues.
diff -Nru gnarwl-3.6.dfsg/debian/control gnarwl-3.6.dfsg/debian/control
--- gnarwl-3.6.dfsg/debian/control 2010-08-06 17:14:28.000000000 +0200
+++ gnarwl-3.6.dfsg/debian/control 2012-11-08 20:40:12.000000000 +0100
@@ -9,7 +9,7 @@
Package: gnarwl
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser (>=3.48), ed
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser (>=3.48), ucf
Recommends: phamm-ldap-vacation
Description: Email autoresponder based on LDAP
Gnarwl is an email autoresponder. Unlike the original vacation program,
diff -Nru gnarwl-3.6.dfsg/debian/patches/data-makefile.patch gnarwl-3.6.dfsg/debian/patches/data-makefile.patch
--- gnarwl-3.6.dfsg/debian/patches/data-makefile.patch 2010-07-29 16:36:11.000000000 +0200
+++ gnarwl-3.6.dfsg/debian/patches/data-makefile.patch 2012-11-08 21:52:27.000000000 +0100
@@ -1,6 +1,6 @@
---- gnarwl-3.6/data/Makefile 2005-03-13 15:30:54.000000000 +0100
-+++ gnarwl-3.6.debian//data/Makefile 2010-07-29 15:53:35.000000000 +0200
-@@ -7,14 +7,14 @@
+--- a/data/Makefile
++++ b/data/Makefile
+@@ -7,17 +7,18 @@
rm -f $(BIN)-$(VER).spec gnarwl.cfg
config:
@@ -16,4 +16,9 @@
+ echo \/usr\/bin\/$(BIN) > $(HOMEDIR)/.forward
install -m 644 header.txt $(HOMEDIR)
install -m 644 footer.txt $(HOMEDIR)
- install -m 600 gnarwl.cfg $(CONFDIR)
+- install -m 600 gnarwl.cfg $(CONFDIR)
++ mkdir -p $(CONFDIR)/../usr/share/gnarwl
++ install -m 600 gnarwl.cfg $(CONFDIR)/../usr/share/gnarwl/gnarwl.cfg.template
+ cat badheaders.txt | $(SBINDIR)/$(SBIN) -a $(HOMEDIR)/badheaders.db
+ cat blacklist.txt | $(SBINDIR)/$(SBIN) -a $(HOMEDIR)/blacklist.db
+
diff -Nru gnarwl-3.6.dfsg/debian/po/ja.po gnarwl-3.6.dfsg/debian/po/ja.po
--- gnarwl-3.6.dfsg/debian/po/ja.po 1970-01-01 01:00:00.000000000 +0100
+++ gnarwl-3.6.dfsg/debian/po/ja.po 2012-11-08 20:55:25.000000000 +0100
@@ -0,0 +1,63 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# victory <victory....@gmail.com>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnarwl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-09-16 14:29+0000\n"
+"PO-Revision-Date: 2012-09-16 23:29+0900\n"
+"Last-Translator: victory <victory....@gmail.com>\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"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "Name/address of the LDAP server:"
+msgstr "LDAP サーバの名前/アドレス:"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid ""
+"Gnarwl contacts a LDAP server in order to get information about vacation "
+"messages and accounts. Please specify the server, optionally with the port "
+"to be used."
+msgstr ""
+"Gnarwl は休暇メッセージやアカウントの情報を得るのに LDAP サーバと通信します。"
+"サーバを指定してください。オプションでポートも同時に指定できます。"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "Example: ldap.yourdomain.local:389"
+msgstr "例: ldap.yourdomain.local:389"
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "Base DN of the LDAP server:"
+msgstr "LDAP サーバのベース DN:"
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid ""
+"In order to access the LDAP server, please specify the base gnarwl should "
+"use for LDAP queries."
+msgstr ""
+"LDAP サーバへアクセスする際に LDAP クエリに gnarwl が使うベースを指定してくだ"
+"さい。"
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "Example: dc=yourdomain,dc=somewhere"
+msgstr "例: dc=yourdomain,dc=somewhere"
+
diff -Nru gnarwl-3.6.dfsg/debian/postinst gnarwl-3.6.dfsg/debian/postinst
--- gnarwl-3.6.dfsg/debian/postinst 2010-04-06 10:04:20.000000000 +0200
+++ gnarwl-3.6.dfsg/debian/postinst 2012-11-08 21:59:45.000000000 +0100
@@ -2,6 +2,10 @@
set -e
+CONFIGFILE="/etc/gnarwl.cfg"
+TMPCONF="/etc/gnarwl.cfg.dpkg-tmp"
+TEMPLATE="/usr/share/gnarwl/gnarwl.cfg.template"
+
# Source debconf library.
. /usr/share/debconf/confmodule
@@ -17,31 +21,31 @@
SERVER=`echo $RET | cut -d: -f1`
PORT=`echo $RET | cut -d: -f2`
[ "$PORT" = "$SERVER" ] && PORT=389
- ed -s /etc/gnarwl.cfg << EOF >/dev/null
-/^server
-dl
-i
-server $SERVER
-.
-wq
-EOF
- ed -s /etc/gnarwl.cfg << EOF >/dev/null
-/^port
-dl
-i
-port $PORT
-.
-wq
-EOF
+
db_get gnarwl/base
- ed -s /etc/gnarwl.cfg << EOF >/dev/null
-/^base
-dl
-i
-base $RET
-.
-wq
-EOF
+ BASE="$RET"
+
+ # Generate temporary config file
+ sed -e "
+ /^server /c server $SERVER
+ /^port /c port $PORT
+ /^base /c base $BASE
+ " < $TEMPLATE > $TMPCONF
+
+ # Avoid spurious prompt if upgrading from pre-UCF version
+ if `dpkg --compare-versions "$2" le-nl 3.6.dfsg-6.1`; then
+ echo 99a06e9b2e087fae09e04be56a590805 > $TMPCONF.md5sum
+ fi
+
+ # Put config file in place through UCF
+ ucf --debconf-ok $TMPCONF $CONFIGFILE
+
+ rm -f $TMPCONF $TMPCONF.md5sum
+
+ # At first install, set safe permissions
+ if [ -z "$2" ]; then
+ chmod 600 $CONFIGFILE
+ fi
;;
*) exit 0;
esac
diff -Nru gnarwl-3.6.dfsg/debian/postrm gnarwl-3.6.dfsg/debian/postrm
--- gnarwl-3.6.dfsg/debian/postrm 1970-01-01 01:00:00.000000000 +0100
+++ gnarwl-3.6.dfsg/debian/postrm 2012-11-08 21:26:59.000000000 +0100
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+
+CONFIGFILE="/etc/gnarwl.cfg"
+
+#DEBHELPER#
+
+if [ "$1" = "purge" ]; then
+ for ext in '~' '%' .bak .ucf-new .ucf-old .ucf-dist; do
+ rm -f $CONFIGFILE$ext
+ done
+
+ rm -f $CONFIGFILE
+
+ if which ucf >/dev/null; then
+ ucf --purge $CONFIGFILE
+ fi
+fi
--
.''`. Sébastien Villemot
: :' : Debian Developer
`. `' http://www.dynare.org/sebastien
`- GPG Key: 4096R/381A7594
pgpOefYIcdtsF.pgp
Description: PGP signature
--- End Message ---
--- Begin Message ---
On Mon, 2012-11-12 at 14:57 +0100, Sébastien Villemot wrote:
> "Adam D. Barratt" <a...@adam-barratt.org.uk> writes:
>
> > On Sun, 2012-11-11 at 14:40 +0100, Sébastien Villemot wrote:
> >> Please unblock package gnarwl. The version currently in Sid fixes RC bug
> >> #687943 and adds a Japanese translation update (#692477). The debdiff is
> >> attached.
> >
> > Hmmm, I do wonder whether removing the package might make more sense.
> >
> > There hasn't been a maintainer upload in more than two years, it's a
> > leaf package and the reported popcon is below 30.
>
> I have no strong opinion on that matter. Please go ahead if you think
> a removal from testing is better.
I've been procrastinating on this a bit; unblocked.
Regards,
Adam
--- End Message ---
