diff -u dspam-3.6.8/debian/control dspam-3.6.8/debian/control --- dspam-3.6.8/debian/control +++ dspam-3.6.8/debian/control @@ -1,7 +1,8 @@ Source: dspam Section: mail Priority: optional -Maintainer: Debian DSPAM Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian DSPAM Maintainers Uploaders: Matthijs Mohlmann , Christoph Haas , Kurt B. Kaiser , Jesus Climent , Rudolf Weber , Aurelien Labrosse XS-DM-Upload-Allowed: yes Build-Depends: debhelper (>= 4.0), libpq-dev, dpatch (>= 2.0.0), libtool, automake1.9, autotools-dev, libmysqlclient15-dev, libdb-dev (>= 4.7), libsqlite3-dev, libldap2-dev diff -u dspam-3.6.8/debian/dspam.init dspam-3.6.8/debian/dspam.init --- dspam-3.6.8/debian/dspam.init +++ dspam-3.6.8/debian/dspam.init @@ -33,7 +33,7 @@ # Create directory for PIDFILE, if it does not exist and change ownership. test -d $(dirname $PIDFILE) || mkdir -p -m 755 $(dirname $PIDFILE) -chown dspam $(dirname $PIDFILE) +chown $USER $(dirname $PIDFILE) OPTIONS="--daemon $OPTIONS" diff -u dspam-3.6.8/debian/changelog dspam-3.6.8/debian/changelog --- dspam-3.6.8/debian/changelog +++ dspam-3.6.8/debian/changelog @@ -1,3 +1,17 @@ +dspam (3.6.8-9.3ubuntu1) maverick; urgency=low + + * Merge from debian unstable (LP: #595520), remaining changes: + - debian/dspam.init: + + use $USER for chowning $PIDFILE and starting the daemon (not only for + the test start). Not fully fixed in Debian. (LP: #232543) + - debian/patches/fix-libtool-hack.dpatch: Don't try and use an in-tree + libtool script that doesn't exist, fixes build failure. + * Dropped changes: + - Transition libdb4.5-dev to libdb4.7-dev in build-deps: fixed in the debian package + - Transition for libmysqlclientdev: fixed in the debian package + + -- Lorenzo De Liso Thu, 17 Jun 2010 16:32:21 +0200 + dspam (3.6.8-9.3) unstable; urgency=low * Non-maintainer upload to fix release goal. @@ -20,6 +34,34 @@ -- Andreas Barth Sat, 29 Aug 2009 12:33:05 +0200 +dspam (3.6.8-9ubuntu4) lucid; urgency=low + + * Transition for libmysqlclientdev. + + -- Chuck Short Tue, 06 Apr 2010 08:12:33 -0400 + +dspam (3.6.8-9ubuntu3) jaunty; urgency=low + + * Transition libdb4.5-dev to libdb4.7-dev in build-deps + + -- Steve Stalcup Wed, 11 Feb 2009 15:37:08 -0500 + +dspam (3.6.8-9ubuntu2) jaunty; urgency=low + + * debian/patches/fix-libtool-hack.dpatch: Don't try and use an in-tree + libtool script that doesn't exist, fixes build failure. + + -- James Westby Mon, 24 Nov 2008 03:29:52 +0000 + +dspam (3.6.8-9ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - debian/dspam.init: + - use $USER for chowning $PIDFILE and starting the daemon (not only for + the test start). Not fully fixed in Debian. (LP: #232543) + + -- Daniel Hahler Mon, 10 Nov 2008 23:08:29 +0100 + dspam (3.6.8-9) unstable; urgency=low [ Kurt B. Kaiser ] @@ -41,6 +83,24 @@ -- Peter Eisentraut Tue, 15 Jul 2008 13:13:03 +0200 +dspam (3.6.8-8ubuntu2) intrepid; urgency=low + + * debian/dspam.init: + - use $USER for chowning $PIDFILE and starting the daemon (not only for + the test start) + - Patch from Bernhard Wodok (LP: #232543). Thanks. + + -- Daniel Hahler Sat, 31 May 2008 21:01:08 +0200 + +dspam (3.6.8-8ubuntu1) hardy; urgency=low + + * debian/libdspam7-drv-mysql.cron.daily: + Fix bashism (s/echo -e/printf/) (LP: #207579) + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Daniel Hahler Thu, 27 Mar 2008 20:27:37 +0100 + dspam (3.6.8-8) unstable; urgency=high [ Matthijs Mohlmann ] diff -u dspam-3.6.8/debian/patches/00list dspam-3.6.8/debian/patches/00list --- dspam-3.6.8/debian/patches/00list +++ dspam-3.6.8/debian/patches/00list @@ -25,0 +26 @@ +fix-libtool-hack only in patch2: unchanged: --- dspam-3.6.8.orig/debian/patches/fix-libtool-hack.dpatch +++ dspam-3.6.8/debian/patches/fix-libtool-hack.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix-libtool-hack.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: don't try and use an in-tree libtool script as it doesn't exist. + +@DPATCH@ +diff -urNad dspam-3.6.8~/m4/libtool_hack.m4 dspam-3.6.8/m4/libtool_hack.m4 +--- dspam-3.6.8~/m4/libtool_hack.m4 2004-10-24 21:48:37.000000000 +0100 ++++ dspam-3.6.8/m4/libtool_hack.m4 2008-11-24 03:29:15.000000000 +0000 +@@ -26,7 +26,7 @@ + AC_MSG_ERROR([DS@&t@_LIBTOOL_RUN_IFELSE: internal error: ac_link variable is empty]) + fi + ds_ac_link_save="$ac_link" +- ac_link="./libtool --mode=link $ac_link -no-install" ++ ac_link="libtool --tag=CC --mode=link $ac_link -no-install" + AC_LINK_IFELSE($@) + ac_link="$ds_ac_link_save" + AS_VAR_POPDEF([ds_ac_link_save])