[SCM] Debian packaging for apache2 branch, master, updated. debian/2.4.4-6-42-gab192f2

[Arno Töll]

The following commit has been merged in the master branch:
commit ce6a19965cbebc7a6f813fc530c718b9ee36eead
Author: Arno Töll <arno at debian.org>
Date:   Sun Jul 21 19:57:15 2013 +0200

    Link to the correct package

diff --git a/debian/libapache2-mod-macro.postinst b/debian/libapache2-mod-macro.postinst
index daa079c..0ed55d7 100644
--- a/debian/libapache2-mod-macro.postinst
+++ b/debian/libapache2-mod-macro.postinst
@@ -25,7 +25,7 @@ case "$1" in
                         RET=0
                         rmdir /usr/share/doc/libapache2-mod-macro > /dev/null 2>&1|| RET=$?
                         if [ $RET = 0 ] ; then
-                                ln -s /usr/share/doc/apache2 /usr/share/doc/libapache2-mod-macro
+                                ln -s /usr/share/doc/apache2-bin /usr/share/doc/libapache2-mod-macro
                         fi
                 fi
         fi
diff --git a/debian/libapache2-mod-proxy-html.postinst b/debian/libapache2-mod-proxy-html.postinst
index 1985977..c97c8ad 100644
--- a/debian/libapache2-mod-proxy-html.postinst
+++ b/debian/libapache2-mod-proxy-html.postinst
@@ -25,7 +25,7 @@ case "$1" in
                         RET=0
                         rmdir /usr/share/doc/libapache2-mod-proxy-html > /dev/null 2>&1|| RET=$?
                         if [ $RET = 0 ] ; then
-                                ln -s /usr/share/doc/apache2 /usr/share/doc/libapache2-mod-proxy-html
+                                ln -s /usr/share/doc/apache2-doc /usr/share/doc/libapache2-mod-proxy-html
                         fi
                 fi
         fi
diff --git a/debian/rules b/debian/rules
index 0ad8ffb..817b512 100755
--- a/debian/rules
+++ b/debian/rules
@@ -134,9 +134,9 @@ override_dh_installdocs-indep:
 override_dh_installdocs-arch:
 	dh_installdocs --link-doc=apache2 -papache2 -papache2-dbg \
 		-papache2-mpm-worker -papache2-mpm-prefork -papache2-mpm-event \
-		-papache2-mpm-itk -plibapache2-mod-proxy-html \
-		-plibapache2-mod-macro
-	dh_installdocs --link-doc=apache2-bin -papache2.2-bin
+		-papache2-mpm-itk
+	dh_installdocs --link-doc=apache2-bin -papache2.2-bin -plibapache2-mod-proxy-html \
+	    -plibapache2-mod-macro
 	dh_installdocs --link-doc=apache2-suexec-pristine -papache2-suexec
 	dh_installdocs -a
 

-- 
Debian packaging for apache2