Hi, The attached file is the diff for my xmail 1.25-2.1 NMU. The associated changelog entry is:
xmail (1.25-2.1) unstable; urgency=medium
* Non-maintainer upload.
* Fix bashism in init.d script (Closes: #472892)
* Fix FTBFS on GNU/kFreeBSD (Closes: #401854)
Regards,
--
Chris Lamb, UK [EMAIL PROTECTED]
GPG: 0x634F9A20
diff -Nru xmail-1.25/debian/changelog xmail-1.25/debian/changelog
--- xmail-1.25/debian/changelog 2008-04-12 04:10:41.000000000 +0100
+++ xmail-1.25/debian/changelog 2008-04-12 04:10:41.000000000 +0100
@@ -1,3 +1,11 @@
+xmail (1.25-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix bashism in init.d script (Closes: #472892)
+ * Fix FTBFS on GNU/kFreeBSD (Closes: #401854)
+
+ -- Chris Lamb <[EMAIL PROTECTED]> Sat, 12 Apr 2008 04:06:09 +0100
+
xmail (1.25-2) unstable; urgency=low
* The postinst script now correctly uses bash as a shell.
diff -Nru /tmp/dBYQExIb8V/xmail-1.25/debian/init.d
/tmp/fS8EmvxWph/xmail-1.25/debian/init.d
--- xmail-1.25/debian/init.d 2008-04-12 04:10:41.000000000 +0100
+++ xmail-1.25/debian/init.d 2008-04-12 04:10:41.000000000 +0100
@@ -34,7 +34,7 @@
check_msgid()
{
if [ ! -f /var/lib/xmail/message.id ] ; then
- echo -e '1\r\n\0' > /var/lib/xmail/message.id
+ printf '1\r\n\0\n' > /var/lib/xmail/message.id
fi
}
diff -Nru /tmp/dBYQExIb8V/xmail-1.25/debian/rules
/tmp/fS8EmvxWph/xmail-1.25/debian/rules
--- xmail-1.25/debian/rules 2008-04-12 04:10:41.000000000 +0100
+++ xmail-1.25/debian/rules 2008-04-12 04:10:41.000000000 +0100
@@ -14,6 +14,8 @@
INSTALL_PROGRAM += -s
endif
+DEB_HOST_ARCH_OS = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
# Include dpatch stuff.
include /usr/share/dpatch/dpatch.make
@@ -36,7 +38,11 @@
dh_testdir
# Add here commands to compile the package.
+ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
+ OSTYPE=GNU/kFreeBSD $(MAKE) -f Makefile.bsd
+else
$(MAKE) -f Makefile.lnx
+endif
#/usr/bin/docbook-to-man debian/xmail.sgml > xmail.1
touch build-stamp
signature.asc
Description: PGP signature
