[SCM] Debian packaging for apache2 branch, master, updated. debian/2.4.4-2-121-gdf90ce1
Arno Töll
arno at debian.org
Fri Jun 7 16:45:35 UTC 2013
The following commit has been merged in the master branch:
commit 20e2f28a32b6fdef29a68b88ea044e8deb73202b
Author: Arno Töll <arno at debian.org>
Date: Fri Jun 7 17:42:51 2013 +0200
apache2.2-bin depends on apache2 because we link docs to it. That happened by accident, as we could just link to apache2-bin too
diff --git a/debian/apache2-mpm.postinst.in b/debian/apache2.2-bin.postinst
similarity index 77%
copy from debian/apache2-mpm.postinst.in
copy to debian/apache2.2-bin.postinst
index 562f846..27a551b 100644
--- a/debian/apache2-mpm.postinst.in
+++ b/debian/apache2.2-bin.postinst
@@ -1,5 +1,5 @@
#! /bin/bash
-# postinst script for apache2-mpm-__TYPE__
+# postinst script for apache2.2-bin
#
# see: dh_installdeb(1)
@@ -20,12 +20,12 @@ set -e
case "$1" in
configure)
- if [ -n "$2" ] && dpkg --compare-versions "$2" lt "2.4.4-4" ; then
- if [ -d /usr/share/doc/apache2-mpm-__TYPE__ ] ; then
+ if [ -n "$2" ] && dpkg --compare-versions "$2" lt "2.4.4-5" ; then
+ if [ -d /usr/share/doc/apache2.2-bin ] ; then
RET=0
- rmdir /usr/share/doc/apache2-mpm-__TYPE__ > /dev/null 2>&1|| RET=$?
+ rmdir /usr/share/doc/apache2.2-bin > /dev/null 2>&1|| RET=$?
if [ $RET = 0 ] ; then
- ln -s /usr/share/doc/apache2 /usr/share/doc/apache2-mpm-__TYPE__
+ ln -s /usr/share/doc/apache2-bin /usr/share/doc/apache2.2-bin
fi
fi
fi
diff --git a/debian/changelog b/debian/changelog
index 2a2b73f..f9c3812 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,8 +29,12 @@ apache2 (2.4.4-6) UNRELEASED; urgency=low
Beckert for demangling shell specifics (Closes: #711479)
* Fix "copyright file missing after upgrade (policy 12.5)" and add these for
MPM transitional packages (Closes: #710914)
+ * Fix "apache2.2-bin transitional package (binaries only) should not
+ depend on apache2 package (which runs a system daemon)". This happened by
+ accident added by debhelper since we are linking docs. We do to
+ apache2-bin instead (Closes: #711127)
- -- Arno Töll <arno at debian.org> Fri, 07 Jun 2013 16:56:44 +0200
+ -- Arno Töll <arno at debian.org> Fri, 07 Jun 2013 17:41:18 +0200
apache2 (2.4.4-5) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 35621eb..a58cae1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -135,8 +135,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 -papache2.2-bin \
+ -papache2-mpm-itk -plibapache2-mod-proxy-html \
-plibapache2-mod-proxy-html
+ dh_installdocs --link-doc=apache2-bin -papache2.2-bin
dh_installdocs --link-doc=apache2-suexec-pristine -papache2-suexec
dh_installdocs -a
--
Debian packaging for apache2
More information about the Pkg-apache-commits
mailing list