[SCM] Debian packaging for apache2 branch, next, updated. debian/2.4.4-2-17-gadcba8d

[Arno Töll]

The following commit has been merged in the next branch:
commit 0daa8b0e1981738db4cc2c99c33f11c14d0b2b89
Author: Arno Töll <arno at debian.org>
Date:   Mon May 20 15:53:19 2013 +0200

    Fix typo in apache2-suexec.postinst.
    Replace the doc directory by symlink for upgrades of
    libapache2-mod-proxy-html

diff --git a/debian/apache2-suexec.postinst b/debian/apache2-suexec.postinst
index 835e2aa..ac1e831 100644
--- a/debian/apache2-suexec.postinst
+++ b/debian/apache2-suexec.postinst
@@ -1,5 +1,5 @@
 #! /bin/bash
-# preinst script for apache2
+# postinst script for apache2
 #
 # see: dh_installdeb(1)
 
@@ -36,7 +36,7 @@ case "$1" in
     ;;
 
     *)
-        echo "preinst called with unknown argument \`$1'" >&2
+        echo "postinst called with unknown argument \`$1'" >&2
         exit 1
     ;;
 esac
diff --git a/debian/changelog b/debian/changelog
index a82f10c..a0a1ced 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,13 +29,16 @@ apache2 (2.4.4-3) UNRELEASED; urgency=low
     (Closes: #707109)
   * Make the DEBIAN_VERSION parsing in debian/rules more robust. Thanks to
     Ondřej Surý for noticing and providing a patch.
+  * Fix "copyright file missing after upgrade (policy 12.5)" by linking to the
+    apache2 doc-dir when upgrading (Closes: #707795)
 
   [ Stefan Fritsch ]
   * Remove paragraph about MaxMemFree in README.Debian. The issue should be
     fixed in 2.4.
   * Enable mod_authn_core when upgrading from wheezy (Closes: #702866)
 
- -- Arno Töll <arno at debian.org>  Mon, 20 May 2013 14:19:22 +0200
+
+ -- Arno Töll <arno at debian.org>  Mon, 20 May 2013 15:52:20 +0200
 
 apache2 (2.4.4-2) experimental; urgency=low
 
diff --git a/debian/apache2-suexec.postinst b/debian/libapache2-mod-proxy-html.postinst
similarity index 67%
copy from debian/apache2-suexec.postinst
copy to debian/libapache2-mod-proxy-html.postinst
index 835e2aa..1985977 100644
--- a/debian/apache2-suexec.postinst
+++ b/debian/libapache2-mod-proxy-html.postinst
@@ -1,5 +1,5 @@
 #! /bin/bash
-# preinst script for apache2
+# postinst script for libapache2-mod-proxy-html
 #
 # see: dh_installdeb(1)
 
@@ -20,12 +20,12 @@ set -e
 
 case "$1" in
     configure)
-        if [ -n "$2" ] && dpkg --compare-versions "$2" lt "2.4.3" ; then
-                if [ -d /usr/share/doc/apache2-suexec/ ] ; then
+        if [ -n "$2" ] && dpkg --compare-versions "$2" lt "1:2.4.4-2" ; then
+                if [ -d /usr/share/doc/libapache2-mod-proxy-html ] ; then
                         RET=0
-                        rmdir /usr/share/doc/apache2-suexec/ > /dev/null 2>&1|| RET=$?
+                        rmdir /usr/share/doc/libapache2-mod-proxy-html > /dev/null 2>&1|| RET=$?
                         if [ $RET = 0 ] ; then
-                                ln -s /usr/share/doc/apache2-suexec-pristine /usr/share/doc/apache2-suexec
+                                ln -s /usr/share/doc/apache2 /usr/share/doc/libapache2-mod-proxy-html
                         fi
                 fi
         fi
@@ -36,7 +36,7 @@ case "$1" in
     ;;
 
     *)
-        echo "preinst called with unknown argument \`$1'" >&2
+        echo "postinst called with unknown argument \`$1'" >&2
         exit 1
     ;;
 esac
@@ -47,4 +47,3 @@ esac
 #DEBHELPER#
 
 exit 0
-
diff --git a/debian/rules b/debian/rules
index aa24684..7b590f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -116,7 +116,8 @@ override_dh_installdocs-indep:
 override_dh_installdocs-arch:
 	dh_installdocs --link-doc=apache2 -papache2 -papache2-dev -papache2-dbg \
 		-papache2-mpm-worker -papache2-mpm-prefork -papache2-mpm-event \
-		-papache2-mpm-itk -plibapache2-mod-proxy-html -papache2.2-bin
+		-papache2-mpm-itk -plibapache2-mod-proxy-html -papache2.2-bin \
+		-plibapache2-mod-proxy-html
 	dh_installdocs --link-doc=apache2-suexec-pristine -papache2-suexec
 	dh_installdocs -a
 

-- 
Debian packaging for apache2