tags 542661 + patch
thanks
Attached is a nmudiff that does what I said before.
diff -u cherokee-0.99.22/debian/cherokee.preinst cherokee-0.99.22/debian/cherokee.preinst
--- cherokee-0.99.22/debian/cherokee.preinst
+++ cherokee-0.99.22/debian/cherokee.preinst
@@ -44,13 +44,6 @@
case "$action" in
install)
- # Make sure the configuration file has a trailing whiteline to
- # avoid confusing the parser (see #528160)
- CONFFILE=/etc/cherokee.conf
- if [ -f $CONFFILE -a ! -z "$(tail -1 $CONFFILE)" ]
- then
- echo >> $CONFFILE
- fi
;;
upgrade)
if ( dpkg --compare-versions "$version" lt 0.6 )
diff -u cherokee-0.99.22/debian/changelog cherokee-0.99.22/debian/changelog
--- cherokee-0.99.22/debian/changelog
+++ cherokee-0.99.22/debian/changelog
@@ -1,3 +1,11 @@
+cherokee (0.99.22-1.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Do not add trailing line to conf file during install time, do it at
+ build time. Closes: #542661.
+
+ -- Felipe Sateler <fsate...@gmail.com> Fri, 11 Sep 2009 14:51:17 -0400
+
cherokee (0.99.22-1) unstable; urgency=low
[ Leonel Nunez ]
diff -u cherokee-0.99.22/debian/rules cherokee-0.99.22/debian/rules
--- cherokee-0.99.22/debian/rules
+++ cherokee-0.99.22/debian/rules
@@ -79,6 +79,9 @@
build-arch-stamp: config.status
$(MAKE)
+ echo >> $(CURDIR)/cherokee.conf.sample
+ echo '# Please always leave a trailing newline or otherwise the parser fails' >> $(CURDIR)/cherokee.conf.sample
+ echo '# See http://bugs.debian.org/528160' >> $(CURDIR)/cherokee.conf.sample
# $(MAKE) test
touch build-arch-stamp
