* Drop update-alternatives call in postrm

* Update my mail address

4 files changed, 10 insertions, 41 deletions

diff --git a/debian/apache2-suexec.postrm.in b/debian/apache2-suexec.postrm.in
deleted file mode 100755
index 50b552e3..00000000
--- a/debian/apache2-suexec.postrm.in
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-# postrm script for apache2-suexec-__TYPE__
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove|disappear)
-
-        update-alternatives --remove suexec /usr/lib/apache2/suexec-__TYPE__ || true
-    ;;
-    purge|upgrade|failed-upgrade|abort-install|abort-upgrade)
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/changelog b/debian/changelog
index c1c7f6aa..a5c010f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+apache2 (2.4.1-4) experimental; urgency=low
+
+  * NOT RELEASED YET
+  * Drop update-alternative call in postrm. Our prerm script catches them
+    already anyway.
+  * Update my mail address.
+
+ -- Arno Töll <arno@debian.org>  Sun, 01 Apr 2012 22:06:48 +0200
+
 apache2 (2.4.1-3) experimental; urgency=low
 
   [ Arno Töll ]
diff --git a/debian/clean b/debian/clean
index dd77bcc3..650d6475 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,14 +1,12 @@
 debian/apache2-suexec-custom.postinst
 debian/apache2-suexec-custom.preinst
 debian/apache2-suexec-custom.prerm
-debian/apache2-suexec-custom.postrm
 debian/apache2-suexec-custom.links
 debian/apache2-suexec-custom.dirs
 debian/apache2-suexec-custom.lintian-overrides
 debian/apache2-suexec-pristine.postinst
 debian/apache2-suexec-pristine.preinst
 debian/apache2-suexec-pristine.prerm
-debian/apache2-suexec-pristine.postrm
 debian/apache2-suexec-pristine.links
 debian/apache2-suexec-pristine.dirs
 debian/apache2-suexec-pristine.lintian-overrides
diff --git a/debian/control b/debian/control
index 1e6c3e19..c51c5ce9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: apache2
 Section: httpd
 Priority: optional
 Maintainer: Debian Apache Maintainers <debian-apache@lists.debian.org>
-Uploaders: Stefan Fritsch <sf@debian.org>, Steinar H. Gunderson <sesse@debian.org>, Arno Töll <debian@toell.net>
+Uploaders: Stefan Fritsch <sf@debian.org>, Steinar H. Gunderson <sesse@debian.org>, Arno Töll <arno@debian.org>
 Build-Depends: debhelper (>= 8.9.7~), lsb-release, dpkg-dev (>= 1.16.1~),
  libaprutil1-dev (>= 1.4.0), libapr1-dev, libpcre3-dev, zlib1g-dev,
  libssl-dev (>= 0.9.8m), libcap-dev [linux-any], perl,