--- mailping-0.0.4.orig/debian/changelog
+++ mailping-0.0.4/debian/changelog
@@ -0,0 +1,112 @@
+mailping (0.0.4-2) unstable; urgency=low
+
+  * Adopt package (Closes: #440618).
+  * Use shutil.move instead of rename, in case the source mailbox is
+    on another filesystem.
+  * Canonicalize used paths, to prevent problems that some Python
+    modules have with paths containing "../..".
+  * Improve microseconds calculation in latency (closes: #457407),
+    thanks Andrew Garner for the patch.
+  * Denatify (closes: #453701).
+  * Switch from cdbs to debhelper.
+  * Ship Maildir in this package instead of creating it in postinst,
+    be more thorough on cleanup when purging package (closes: #454715).
+  * Update to debhelper version 6.
+  * Checked for policy 3.7.3, no changes.
+  * Fix part of manpage formatting.
+  * No longer remove 'mailping' user on package remove, since this
+    is controversial.
+
+ -- Thijs Kinkhorst <thijs@debian.org>  Tue, 15 Jan 2008 22:08:46 +0100
+
+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 <abi@debian.org>  Mon, 24 Sep 2007 09:46:25 +0200
+
+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 <luk@debian.org>  Thu, 17 May 2007 01:04:08 +0200
+
+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 <madcoder@debian.org>  Sat, 12 Aug 2006 13:45:40 +0200
+
+mailping (0.0.4) unstable; urgency=low
+
+  * Skip temporary files when processing the pending directory.
+  * Fix a typo in the probe message.
+  * Switch section from devel to mail.
+
+ -- Tommi Virtanen <tv@debian.org>  Mon, 13 Dec 2004 22:07:45 +0200
+
+mailping (0.0.3) unstable; urgency=low
+
+  * Build-depend on python-dev, not python2.3-dev. (Closes: #259130)
+
+ -- Tommi Virtanen <tv@debian.org>  Tue, 13 Jul 2004 15:39:16 +0300
+
+mailping (0.0.2) unstable; urgency=low
+
+  * Incompatible changes:
+    - Switch state directory to mean /var/lib/mailping and not
+      /var/lib/mailping/state. Fixes a bug where mail to mailping@.. was
+      delivered to /var/lib/mailping/state/Maildir.
+
+  * New features:
+    - Provide default values for "from" and "to".
+    - Reload munin-node in postinst and postrm if we touched plugins.
+
+  * Documentation improvements:
+    - Add manpages for mailping-success, mailping-latency.
+    - Munin plugins are not in $PATH, so show them with full pathname in
+      synopsis.
+    - Make Munin plugin manpages refer to munin-run(8), too.
+
+  * Bugfixes:
+    - Crontab seems to want the full if syntax instead of "[ test ] &&
+      foo". Not bothering to find out why, as the fix is trivial.
+    - Fix a bug where "admin" was a mandatory configuration option; it
+      should be optional.
+
+  * Cleanups:
+    - Be polite and say "quit" and end of the SMTP session.
+    - In error and usage messages, only print basename of executable.
+
+  * Internals:
+    - Split non-maildir-related things from MailPing.maildir to
+      MailPing.mail.
+    - Rename fileutil.mtime() to fileutil.getTime(), it's been long since
+      it had anything to do with file modification times.
+    - Add unit test to ensure there is no race between creation of
+      statedir and delivery of first email from probe; that is, delivery
+      can create the maildir on its own (and maildir-cron will have
+      created the statedir by that time).
+
+  * Packaging:
+    - Add a small shell script man/run to help non-Debian generation of
+      manpages.
+    - Remove generated manpages when cleaning.
+    - Make postinst and postrm plugin handling look similar.
+    - Add license texts to debian/copyright.
+
+ -- Tommi Virtanen <tv@debian.org>  Fri, 16 Apr 2004 21:07:56 +0300
+
+mailping (0.0.1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Tommi Virtanen <tv@debian.org>  Fri, 16 Apr 2004 14:33:17 +0300
+
--- mailping-0.0.4.orig/debian/mailping.postinst
+++ mailping-0.0.4/debian/mailping.postinst
@@ -0,0 +1,60 @@
+#! /bin/sh
+
+set -e
+
+prevver="$2"
+
+add_system_user() {
+    if ! getent passwd mailping >/dev/null; then
+	adduser --group --system --no-create-home --home /var/lib/mailping mailping
+    fi	
+}
+
+fixperms() {
+    chown -R mailping:mailping \
+	/var/lib/mailping/state \
+	/var/lib/mailping/Maildir
+}
+
+init_plugins() {
+    if [ -z "$prevver" ]; then
+	RELOAD=0
+	echo -n "Initializing plugins.."
+	for plugin in success latency; do
+	    if [ ! -e "/etc/munin/plugins/mailping-$plugin" ]; then
+		RELOAD=1
+		echo -n " '$plugin'"
+		ln -s "/usr/share/mailping/munin-plugins/mailping-$plugin" "/etc/munin/plugins/mailping-$plugin"
+	    fi
+	done
+	echo "."
+	if [ "$RELOAD" = "1" ]; then
+	    invoke-rc.d munin-node force-reload
+        fi
+    fi
+}
+
+create_forward() {
+    FORWARD=/var/lib/mailping/.forward
+    if [ ! -e /var/lib/mailping/do-not-touch-forward -a ! -e "$FORWARD" ]; then
+	install -m0644 /usr/share/mailping/dot-forward "$FORWARD"
+    fi
+}
+
+case "$1" in
+    configure)
+	add_system_user
+	fixperms
+	create_forward
+	init_plugins
+	;;
+    abort-upgrade|abort-deconfigure|abort-remove)
+	:
+	;;
+    *)
+	echo "Called with unknown argument $1, bailing out."
+	exit 1
+	;;
+esac
+
+#DEBHELPER#
--- mailping-0.0.4.orig/debian/pyversions
+++ mailping-0.0.4/debian/pyversions
@@ -0,0 +1 @@
+2.3-
--- mailping-0.0.4.orig/debian/rules
+++ mailping-0.0.4/debian/rules
@@ -0,0 +1,51 @@
+#!/usr/bin/make -f
+
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f man/*.1
+	rm -f build-stamp
+	dh_clean 
+
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_installdirs
+	dh_install
+	cd man && ./run
+	mkdir -p debian/mailping/usr/share/lintian/overrides
+	cp debian/lintian-overrides debian/mailping/usr/share/lintian/overrides/mailping
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs -X.svn
+	dh_installexamples
+	dh_installman
+	dh_installcron
+	dh_installchangelogs
+	chmod 0700 debian/mailping/var/lib/mailping/Maildir
+	find debian/mailping -name .svn | xargs -r rm -r
+	dh_link
+	dh_pysupport
+	dh_compress
+	dh_fixperms -X/var
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture-dependent files here.
+binary-arch:
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
+
--- mailping-0.0.4.orig/debian/mailping.install
+++ mailping-0.0.4/debian/mailping.install
@@ -0,0 +1,4 @@
+doc/examples/dot-forward	usr/share/mailping
+bin/*				usr/bin
+munin-plugins/*			usr/share/mailping/munin-plugins
+MailPing			usr/share/python-support/mailping
--- mailping-0.0.4.orig/debian/mailping.cron.d
+++ mailping-0.0.4/debian/mailping.cron.d
@@ -0,0 +1,3 @@
+MAILTO=root
+
+*/5 * * * *	mailping if [ -x /usr/bin/mailping-cron ]; then /usr/bin/mailping-cron; fi
--- mailping-0.0.4.orig/debian/mailping.postrm
+++ mailping-0.0.4/debian/mailping.postrm
@@ -0,0 +1,30 @@
+#! /bin/sh
+set -e
+
+remove_plugins() {
+    RELOAD=0
+    echo -n "Removing plugins.."
+    for plugin in success latency; do
+	LINK="/etc/munin/plugins/mailping-$plugin"
+	if [ -L "$LINK" ]; then
+	    TARGET="$(readlink "$LINK")"
+	    if [ "$TARGET" = "/usr/share/mailping/munin-plugins/mailping-$plugin" ]; then
+		RELOAD=1
+		echo -n " '$plugin'"
+		rm "$LINK"
+	    fi
+	fi
+    done
+    echo "."
+    if [ "$RELOAD" = "1" ]; then
+	invoke-rc.d munin-node force-reload
+    fi
+}
+
+if [ "$1" = "remove" ]; then
+    remove_plugins
+elif [ "$1" = "purge" ]; then
+    rm -rf /var/lib/mailping
+fi
+
+#DEBHELPER#
--- mailping-0.0.4.orig/debian/copyright
+++ mailping-0.0.4/debian/copyright
@@ -0,0 +1,32 @@
+This package was debianized by Tommi Virtanen tv@debian.org on
+Wed, 14 Apr 2004 13:45:51 +0300. It is now maintained by
+Thijs Kinkhorst <thijs@debian.org>.
+
+It was originally downloaded from TODO (no upstream web presence yet)
+
+Upstream Author: Tommi Virtanen <tv@havoc.fi>
+
+Copyright:
+
+"""
+Monitor email service availability and functioning.
+"""
+__copyright__ = "Copyright (C) 2004  Tommi Virtanen"
+__license__ = """
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+"""
+
+On Debian Linux systems, the complete text of the GNU General Public
+License can be found in '/usr/share/common-licenses/GPL'.
--- mailping-0.0.4.orig/debian/compat
+++ mailping-0.0.4/debian/compat
@@ -0,0 +1 @@
+6
--- mailping-0.0.4.orig/debian/control
+++ mailping-0.0.4/debian/control
@@ -0,0 +1,24 @@
+Source: mailping
+Section: mail
+Priority: optional
+Maintainer: Thijs Kinkhorst <thijs@debian.org>
+Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 6), python-dev
+Build-Depends-Indep: xsltproc, docbook-xml, docbook-xsl, python-support
+Vcs-Svn: https://svn.kinkhorst.nl/svn/debian/mailping/trunk
+Vcs-Browser: https://aphrodite.kinkhorst.nl/wsvn/debian/mailping/
+
+Package: mailping
+Architecture: all
+Depends: munin-node, adduser, ${python:Depends}
+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
+ SMTP server accepts TCP connections.
+ .
+ Multiple email servers can be tested by creating a remote alias that
+ points back to a local address, and sending test emails to it.
+ .
+ The results of this monitoring are available as graphs via Munin
+ plugins, and can be connected to Nagios to send alerts when the test
+ emails no longer get delivered, or if the delivery takes too long.
--- mailping-0.0.4.orig/debian/mailping.examples
+++ mailping-0.0.4/debian/mailping.examples
@@ -0,0 +1 @@
+doc/examples/*
--- mailping-0.0.4.orig/debian/mailping.dirs
+++ mailping-0.0.4/debian/mailping.dirs
@@ -0,0 +1,9 @@
+etc/mailping
+etc/cron.d
+usr/bin
+usr/share/python-support/mailping
+usr/share/mailping/munin-plugins
+var/lib/mailping/state
+var/lib/mailping/Maildir/new
+var/lib/mailping/Maildir/cur
+var/lib/mailping/Maildir/tmp
--- mailping-0.0.4.orig/debian/mailping.manpages
+++ mailping-0.0.4/debian/mailping.manpages
@@ -0,0 +1 @@
+man/*.1
--- mailping-0.0.4.orig/debian/mailping.docs
+++ mailping-0.0.4/debian/mailping.docs
@@ -0,0 +1 @@
+README
--- mailping-0.0.4.orig/debian/lintian-overrides
+++ mailping-0.0.4/debian/lintian-overrides
@@ -0,0 +1,11 @@
+mailping: package-contains-empty-directory usr/share/doc/mailping/examples/state/incoming/tmp/
+mailping: package-contains-empty-directory usr/share/doc/mailping/examples/state/broken/new/
+mailping: package-contains-empty-directory usr/share/doc/mailping/examples/state/pending/
+mailping: package-contains-empty-directory usr/share/doc/mailping/examples/state/junk/new/
+mailping: package-contains-empty-directory usr/share/doc/mailping/examples/state/broken/tmp/
+mailping: package-contains-empty-directory usr/share/doc/mailping/examples/state/junk/cur/
+mailping: package-contains-empty-directory usr/share/doc/mailping/examples/state/incoming/cur/
+mailping: package-contains-empty-directory usr/share/doc/mailping/examples/state/junk/tmp/
+mailping: package-contains-empty-directory usr/share/doc/mailping/examples/state/incoming/new/
+mailping: package-contains-empty-directory usr/share/doc/mailping/examples/state/broken/cur/
+mailping: non-standard-dir-perm var/lib/mailping/Maildir/ 0700 != 0755
