diff -pruN 0.0.4/debian/changelog 0.0.4ubuntu5/debian/changelog --- 0.0.4/debian/changelog 2004-12-13 20:08:19.000000000 +0000 +++ 0.0.4ubuntu5/debian/changelog 2007-12-14 21:09:38.000000000 +0000 @@ -1,3 +1,66 @@ +mailping (0.0.4ubuntu5) hardy; urgency=low + + * Merge from debian unstable 0.0.4-1 (LP: #175998), remaining changes: + + debian/rules + - Keep DEB_PYTHON_SYSTEM defined. + + debian/control + - Updated Maintainer value to match Debian-Maintainer-Field Spec. + + -- Miguel Ruiz Fri, 14 Dec 2007 14:52:41 -0300 + +mailping (0.0.4-1) unstable; urgency=low + + * QA upload. (ACK NMU; Closes: #380863) + * Set maintainer to QA Group; Orphaned: #440618 + * Update debian/copyright + + -- Michael Ablassmeier Mon, 24 Sep 2007 09:46:25 +0200 + +mailping (0.0.4ubuntu4) gutsy; urgency=low + + * The "supposed to be 0.0.4-0.2ubuntu1" release. + * Merge from debian unstable, remaining changes: + - debian/rules: keep DEB_PYTHON_SYSTEM defined. + + -- Zak B. Elep Tue, 12 Jun 2007 13:02:48 +0000 + +mailping (0.0.4-0.2) unstable; urgency=high + + * Non-maintainer upload during BSP. + * Fix non-conditional use of userdel in postrm (Closes: #417020). + * Add depends on adduser as it is used in postinst. + + -- Luk Claes Thu, 17 May 2007 01:04:08 +0200 + +mailping (0.0.4ubuntu3) feisty; urgency=low + + * The "is this supposed to be 0.0.4-0.1ubuntu1?" release. + * debian/control, debian/rules: + + Update to work with new Python policy from Debian. + + -- Zak B. Elep Wed, 15 Nov 2006 17:25:18 +0800 + +mailping (0.0.4ubuntu2) edgy; urgency=low + + * Fake-syncing from debian unstable due to version number. No ubuntu changes + + -- Sarah Hobbs Wed, 30 Aug 2006 12:31:53 +1000 + +mailping (0.0.4-0.1) unstable; urgency=low + + * Non-maintainer upload. + * Bump Standards-Version to 3.7.2. + * Update package to the last python policy (Closes: #380863). + * Move some things into B-D instead of B-D-I. + + -- Pierre Habouzit Sat, 12 Aug 2006 13:45:40 +0200 + +mailping (0.0.4ubuntu1) hoary; urgency=low + + * Rebuild for python2.4. + + -- Matthias Klose Sun, 3 Apr 2005 21:01:33 +0200 + mailping (0.0.4) unstable; urgency=low * Skip temporary files when processing the pending directory. diff -pruN 0.0.4/debian/control 0.0.4ubuntu5/debian/control --- 0.0.4/debian/control 2004-12-13 20:07:59.000000000 +0000 +++ 0.0.4ubuntu5/debian/control 2007-12-14 21:09:38.000000000 +0000 @@ -1,13 +1,15 @@ Source: mailping Section: mail Priority: optional -Maintainer: Tommi Virtanen -Standards-Version: 3.5.6 -Build-Depends-Indep: python-dev, cdbs, debhelper (>= 4.1.68), xsltproc, docbook-xml, docbook-xsl +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian QA Group +Standards-Version: 3.7.2 +Build-Depends: cdbs, debhelper (>= 4.1.68), python-dev +Build-Depends-Indep: xsltproc, docbook-xml, docbook-xsl, python-support (>= 0.4.0) Package: mailping Architecture: all -Depends: ${python:Depends}, munin-node +Depends: ${python:Depends}, munin-node, adduser Description: monitor email service availability and functioning Monitor email service availability and functioning. Tests the whole route from SMTP submission to local delivery, not just whether an diff -pruN 0.0.4/debian/copyright 0.0.4ubuntu5/debian/copyright --- 0.0.4/debian/copyright 2004-04-16 18:59:28.000000000 +0100 +++ 0.0.4ubuntu5/debian/copyright 2007-09-24 08:50:22.000000000 +0100 @@ -23,8 +23,8 @@ __license__ = """ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. """ On Debian Linux systems, the complete text of the GNU General Public diff -pruN 0.0.4/debian/mailping.postrm 0.0.4ubuntu5/debian/mailping.postrm --- 0.0.4/debian/mailping.postrm 2004-04-16 18:57:03.000000000 +0100 +++ 0.0.4ubuntu5/debian/mailping.postrm 2007-05-16 23:58:46.000000000 +0100 @@ -33,9 +33,11 @@ remove_forward() { remove_system_user() { chown -R root:root /var/lib/mailping/Maildir - if getent passwd mailping >/dev/null; then - userdel mailping - fi + if [ -f /usr/sbin/userdel ]; then + if getent passwd mailping >/dev/null; then + /usr/sbin/userdel mailping + fi + fi } if [ "$1" = "remove" ]; then diff -pruN 0.0.4/debian/pycompat 0.0.4ubuntu5/debian/pycompat --- 0.0.4/debian/pycompat 1970-01-01 01:00:00.000000000 +0100 +++ 0.0.4ubuntu5/debian/pycompat 2007-12-14 21:09:38.000000000 +0000 @@ -0,0 +1 @@ +2 diff -pruN 0.0.4/debian/pyversions 0.0.4ubuntu5/debian/pyversions --- 0.0.4/debian/pyversions 1970-01-01 01:00:00.000000000 +0100 +++ 0.0.4ubuntu5/debian/pyversions 2006-08-12 12:50:18.000000000 +0100 @@ -0,0 +1 @@ +2.3- diff -pruN 0.0.4/debian/rules 0.0.4ubuntu5/debian/rules --- 0.0.4/debian/rules 2004-04-16 16:42:21.000000000 +0100 +++ 0.0.4ubuntu5/debian/rules 2007-12-14 21:09:38.000000000 +0000 @@ -2,8 +2,10 @@ # -*- mode: makefile; coding: utf-8 -*- # Copyright © 2002,2003 Colin Walters -include /usr/share/cdbs/1/rules/debhelper.mk +## YES I do want debhelper to be after distutils.mk +DEB_PYTHON_SYSTEM=pysupport include /usr/share/cdbs/1/class/python-distutils.mk +include /usr/share/cdbs/1/rules/debhelper.mk DEB_INSTALL_DOCS_mailping := doc/* DEB_DH_ALWAYS_EXCLUDE := .svn @@ -15,6 +17,9 @@ DEB_INSTALL_DIRS_mailping := \ install/mailping:: cd man && ./run +binary-install/mailping:: + dh_pysupport + DEB_INSTALL_MANPAGES_mailping := $(patsubst %.xml,%,$(wildcard man/*.[0-9].xml)) clean::