[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. c9895ecce6d61b2b20a87480d353d303b0cd7b00
Arno Töll
debian at toell.net
Sat Feb 11 02:50:53 UTC 2012
The following commit has been merged in the next branch:
commit 4797dc26cac6a80005daea4f72812b7455b5e18b
Author: Arno Töll <debian at toell.net>
Date: Thu Feb 9 22:55:43 2012 +0100
* More upgrade logic: guess the last MPM which was installed last. If the MPM
package installed previously could be determined, it is enabled as MPM in
postinst. Otherwise we enable the worker module by default.
* Remove obsolete conffiles with help of dpkg-maintainer-scripts
* Add missing modules in config-dir/new-mods-available. They are unchecked and are going to
be examined whether they are a) actually needed b) need a dependency line c)
need a .conf file
diff --git a/debian/apache2.maintscript b/debian/apache2.maintscript
new file mode 100644
index 0000000..27af08b
--- /dev/null
+++ b/debian/apache2.maintscript
@@ -0,0 +1,6 @@
+# version 2.3 does not exist at all, all 2.2 versions feature those files, but
+# no 2.3 package does
+rm_conffile /etc/apache2/mods-available/authz_default.load 2.3 apache2.2-common
+rm_conffile /etc/apache2/mods-available/authn_default.load 2.3 apache2.2-common
+rm_conffile /etc/apache2/mods-available/mem_cache.load 2.3 apache2.2-common
+rm_conffile /etc/apache2/mods-available/mem_cache.conf 2.3 apache2.2-common
diff --git a/debian/apache2.postinst b/debian/apache2.postinst
index 743f614..c21e64f 100755
--- a/debian/apache2.postinst
+++ b/debian/apache2.postinst
@@ -20,7 +20,35 @@ set -e
enable_default_mpm()
{
- a2enmod -q mpm_event
+ mpm="mpm_event"
+ if [ -e /etc/apache2/.apache2_mpm_selected ] ; then
+ tmpmpm=$(grep -v "^#" /etc/apache2/.apache2_mpm_selected | head -n1)
+ case "$tmpmpm" in
+ apache2-mpm-worker)
+ mpm="mpm_worker"
+ ;;
+
+ apache2-mpm-event)
+ mpm="mpm_event"
+ ;;
+
+ apache2-mpm-prefork)
+ mpm="mpm_prefork"
+ ;;
+
+ apache2-mpm-itk)
+ # Houston, we got a problem
+ ;;
+
+ *)
+ # default MPM for upgrading in case we got an unrecognized
+ # hint file
+ mpm="mpm_event"
+ ;;
+ esac
+ rm -f /etc/apache2/.apache2_mpm_selected
+ fi
+ a2enmod -q $mpm
}
enable_default_modules()
@@ -52,9 +80,47 @@ install_default_files()
fi
}
+# XXX: Find out whether I am on crack removing stale modules that way
+# n.b you can't rely on $2 for upgrades, as the user might have been using
+# apache2.2-common only. Let's pretend we're upgrading if there is an
+# obsolete conffile around.
+refresh_modules()
+{
+ if [ -e /etc/apache2/mods-available/authz_default.load ] || dpkg --compare-versions "$2" "le" "2.3" ; then
+ if [ -d /etc/apache2/mods-enabled ] ; then
+ for link in /etc/apache2/mods-enabled/*.load ; do
+ target=$(readlink "$link")
+ module=$(basename "$link" | sed 's/\.load//')
+ if [ ! -e "/etc/apache2/mods-enabled/$target" ] ; then
+ a2dismod -q $module
+ fi
+ # the module is already enabled, however
+ # dependencies could have changed hence re-call
+ # a2enmod again.
+ # Example: the deflate module when upgraded from
+ # Squeeze
+ if [ -e "/etc/apache2/mods-enabled/$target" ] ; then
+ a2enmod -q $module
+ fi
+ done
+ fi
+ fi
+}
+
+
+#DEBHELPER#
+
+# remove dangling symlinks of disabled modules. This needs to be executed after
+# DEBHELPER removing conffiles. dpkg will remove conffiles only if apache2 is
+# installed. If only apache2.2-common was installed instead, the code turns into
+# a no-op. Do we need to take care of that? If yes, we need to write oure own
+# maintainer-scripts-helper
+
case "$1" in
configure)
+ refresh_modules $@
+
enable_default_mpm
install_default_files
@@ -77,7 +143,4 @@ case "$1" in
;;
esac
-
-#DEBHELPER#
-
exit 0
diff --git a/debian/apache2.preinst b/debian/apache2.preinst
new file mode 100644
index 0000000..6b6f0e1
--- /dev/null
+++ b/debian/apache2.preinst
@@ -0,0 +1,47 @@
+#! /bin/bash
+# preinst script for apache2
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <new-preinst> `install'
+# * <new-preinst> `install' <old-version>
+# * <new-preinst> `upgrade' <old-version>
+# * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ install|upgrade)
+
+ if [ ! -z "$2" ] && [ -d "/etc/apache2/" ] ; then
+ mpm=$(dpkg-query -f '${Package}\t${Status}\n' -W 'apache2-mpm-*' 2>/dev/null) || true
+ if [ $? -eq 0 ] ; then
+ mpm=$(echo "$mpm" | grep "install ok" | cut -f1)
+ if [ ! -f /etc/apache2/.apache2_mpm_selected ] ; then
+ echo "# automatically created during upgrade" >> /etc/apache2/.apache2_mpm_selected
+ echo "# it can be safely removed anytime" >> /etc/apache2/.apache2_mpm_selected
+ echo "$mpm" >> /etc/apache2/.apache2_mpm_selected
+ fi
+ fi
+ fi
+ ;;
+
+ abort-upgrade)
+ ;;
+
+ *)
+ echo "preinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/changelog b/debian/changelog
index 5a8c6a2..5063001 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,8 +60,11 @@ apache2 (2.3.16-beta-1) experimental; urgency=low
* Changes in a2enmod:
+ Parse "Conflicts: " header to denote conflicts between modules which
cannot be loaded into the same Apache server.
+ * The following modules and associated configuration files were removed:
+ + mod_authz_default and mod_authn_default: Please use a proper authentication module instead
+ + mod_mem_cache: Use mod_cache_disk instead
- -- Arno Töll <debian at toell.net> Mon, 06 Feb 2012 00:03:57 +0100
+ -- Arno Töll <debian at toell.net> Thu, 09 Feb 2012 22:42:05 +0100
apache2 (2.2.22-1) unstable; urgency=low
diff --git a/debian/config-dir/new-mods-available/access_compat.load b/debian/config-dir/new-mods-available/access_compat.load
new file mode 100644
index 0000000..51e644b
--- /dev/null
+++ b/debian/config-dir/new-mods-available/access_compat.load
@@ -0,0 +1 @@
+LoadModule access_compat_module /usr/lib/apache2/modules/mod_access_compat.so
diff --git a/debian/config-dir/new-mods-available/allowmethods.load b/debian/config-dir/new-mods-available/allowmethods.load
new file mode 100644
index 0000000..e5bbe59
--- /dev/null
+++ b/debian/config-dir/new-mods-available/allowmethods.load
@@ -0,0 +1 @@
+LoadModule allowmethods_module /usr/lib/apache2/modules/mod_allowmethods.so
diff --git a/debian/config-dir/new-mods-available/auth_form.load b/debian/config-dir/new-mods-available/auth_form.load
new file mode 100644
index 0000000..fa136e9
--- /dev/null
+++ b/debian/config-dir/new-mods-available/auth_form.load
@@ -0,0 +1 @@
+LoadModule auth_form_module /usr/lib/apache2/modules/mod_auth_form.so
diff --git a/debian/config-dir/new-mods-available/authn_core.load b/debian/config-dir/new-mods-available/authn_core.load
new file mode 100644
index 0000000..446074f
--- /dev/null
+++ b/debian/config-dir/new-mods-available/authn_core.load
@@ -0,0 +1 @@
+LoadModule authn_core_module /usr/lib/apache2/modules/mod_authn_core.so
diff --git a/debian/config-dir/new-mods-available/authn_socache.load b/debian/config-dir/new-mods-available/authn_socache.load
new file mode 100644
index 0000000..786232d
--- /dev/null
+++ b/debian/config-dir/new-mods-available/authn_socache.load
@@ -0,0 +1 @@
+LoadModule authn_socache_module /usr/lib/apache2/modules/mod_authn_socache.so
diff --git a/debian/config-dir/new-mods-available/authz_dbd.load b/debian/config-dir/new-mods-available/authz_dbd.load
new file mode 100644
index 0000000..ee3122b
--- /dev/null
+++ b/debian/config-dir/new-mods-available/authz_dbd.load
@@ -0,0 +1 @@
+LoadModule authz_dbd_module /usr/lib/apache2/modules/mod_authz_dbd.so
diff --git a/debian/config-dir/new-mods-available/buffer.load b/debian/config-dir/new-mods-available/buffer.load
new file mode 100644
index 0000000..f5e7423
--- /dev/null
+++ b/debian/config-dir/new-mods-available/buffer.load
@@ -0,0 +1 @@
+LoadModule buffer_module /usr/lib/apache2/modules/mod_buffer.so
diff --git a/debian/config-dir/new-mods-available/cache_disk.load b/debian/config-dir/new-mods-available/cache_disk.load
new file mode 100644
index 0000000..1cb49b1
--- /dev/null
+++ b/debian/config-dir/new-mods-available/cache_disk.load
@@ -0,0 +1 @@
+LoadModule cache_disk_module /usr/lib/apache2/modules/mod_cache_disk.so
diff --git a/debian/config-dir/new-mods-available/data.load b/debian/config-dir/new-mods-available/data.load
new file mode 100644
index 0000000..ef488a4
--- /dev/null
+++ b/debian/config-dir/new-mods-available/data.load
@@ -0,0 +1 @@
+LoadModule data_module /usr/lib/apache2/modules/mod_data.so
diff --git a/debian/config-dir/new-mods-available/dialup.load b/debian/config-dir/new-mods-available/dialup.load
new file mode 100644
index 0000000..3c4a636
--- /dev/null
+++ b/debian/config-dir/new-mods-available/dialup.load
@@ -0,0 +1 @@
+LoadModule dialup_module /usr/lib/apache2/modules/mod_dialup.so
diff --git a/debian/config-dir/new-mods-available/echo.load b/debian/config-dir/new-mods-available/echo.load
new file mode 100644
index 0000000..42cae85
--- /dev/null
+++ b/debian/config-dir/new-mods-available/echo.load
@@ -0,0 +1 @@
+LoadModule echo_module /usr/lib/apache2/modules/mod_echo.so
diff --git a/debian/config-dir/new-mods-available/heartbeat.load b/debian/config-dir/new-mods-available/heartbeat.load
new file mode 100644
index 0000000..59d25ce
--- /dev/null
+++ b/debian/config-dir/new-mods-available/heartbeat.load
@@ -0,0 +1 @@
+LoadModule heartbeat_module /usr/lib/apache2/modules/mod_heartbeat.so
diff --git a/debian/config-dir/new-mods-available/heartmonitor.load b/debian/config-dir/new-mods-available/heartmonitor.load
new file mode 100644
index 0000000..e71423d
--- /dev/null
+++ b/debian/config-dir/new-mods-available/heartmonitor.load
@@ -0,0 +1 @@
+LoadModule heartmonitor_module /usr/lib/apache2/modules/mod_heartmonitor.so
diff --git a/debian/config-dir/new-mods-available/lbmethod_bybusyness.load b/debian/config-dir/new-mods-available/lbmethod_bybusyness.load
new file mode 100644
index 0000000..d6d64b0
--- /dev/null
+++ b/debian/config-dir/new-mods-available/lbmethod_bybusyness.load
@@ -0,0 +1 @@
+LoadModule lbmethod_bybusyness_module /usr/lib/apache2/modules/mod_lbmethod_bybusyness.so
diff --git a/debian/config-dir/new-mods-available/lbmethod_byrequests.load b/debian/config-dir/new-mods-available/lbmethod_byrequests.load
new file mode 100644
index 0000000..44661b1
--- /dev/null
+++ b/debian/config-dir/new-mods-available/lbmethod_byrequests.load
@@ -0,0 +1 @@
+LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so
diff --git a/debian/config-dir/new-mods-available/lbmethod_bytraffic.load b/debian/config-dir/new-mods-available/lbmethod_bytraffic.load
new file mode 100644
index 0000000..8b234ec
--- /dev/null
+++ b/debian/config-dir/new-mods-available/lbmethod_bytraffic.load
@@ -0,0 +1 @@
+LoadModule lbmethod_bytraffic_module /usr/lib/apache2/modules/mod_lbmethod_bytraffic.so
diff --git a/debian/config-dir/new-mods-available/lbmethod_heartbeat.load b/debian/config-dir/new-mods-available/lbmethod_heartbeat.load
new file mode 100644
index 0000000..d7ece79
--- /dev/null
+++ b/debian/config-dir/new-mods-available/lbmethod_heartbeat.load
@@ -0,0 +1 @@
+LoadModule lbmethod_heartbeat_module /usr/lib/apache2/modules/mod_lbmethod_heartbeat.so
diff --git a/debian/config-dir/new-mods-available/log_debug.load b/debian/config-dir/new-mods-available/log_debug.load
new file mode 100644
index 0000000..1a27fa8
--- /dev/null
+++ b/debian/config-dir/new-mods-available/log_debug.load
@@ -0,0 +1 @@
+LoadModule log_debug_module /usr/lib/apache2/modules/mod_log_debug.so
diff --git a/debian/config-dir/new-mods-available/lua.load b/debian/config-dir/new-mods-available/lua.load
new file mode 100644
index 0000000..0b639f5
--- /dev/null
+++ b/debian/config-dir/new-mods-available/lua.load
@@ -0,0 +1 @@
+LoadModule lua_module /usr/lib/apache2/modules/mod_lua.so
diff --git a/debian/config-dir/new-mods-available/proxy_express.load b/debian/config-dir/new-mods-available/proxy_express.load
new file mode 100644
index 0000000..74b3fb2
--- /dev/null
+++ b/debian/config-dir/new-mods-available/proxy_express.load
@@ -0,0 +1 @@
+LoadModule proxy_express_module /usr/lib/apache2/modules/mod_proxy_express.so
diff --git a/debian/config-dir/new-mods-available/proxy_fcgi.load b/debian/config-dir/new-mods-available/proxy_fcgi.load
new file mode 100644
index 0000000..49c81b3
--- /dev/null
+++ b/debian/config-dir/new-mods-available/proxy_fcgi.load
@@ -0,0 +1 @@
+LoadModule proxy_fcgi_module /usr/lib/apache2/modules/mod_proxy_fcgi.so
diff --git a/debian/config-dir/new-mods-available/proxy_fdpass.load b/debian/config-dir/new-mods-available/proxy_fdpass.load
new file mode 100644
index 0000000..30c9394
--- /dev/null
+++ b/debian/config-dir/new-mods-available/proxy_fdpass.load
@@ -0,0 +1 @@
+LoadModule proxy_fdpass_module /usr/lib/apache2/modules/mod_proxy_fdpass.so
diff --git a/debian/config-dir/new-mods-available/proxy_html.load b/debian/config-dir/new-mods-available/proxy_html.load
new file mode 100644
index 0000000..ebe6a20
--- /dev/null
+++ b/debian/config-dir/new-mods-available/proxy_html.load
@@ -0,0 +1 @@
+LoadModule proxy_html_module /usr/lib/apache2/modules/mod_proxy_html.so
diff --git a/debian/config-dir/new-mods-available/ratelimit.load b/debian/config-dir/new-mods-available/ratelimit.load
new file mode 100644
index 0000000..93601cf
--- /dev/null
+++ b/debian/config-dir/new-mods-available/ratelimit.load
@@ -0,0 +1 @@
+LoadModule ratelimit_module /usr/lib/apache2/modules/mod_ratelimit.so
diff --git a/debian/config-dir/new-mods-available/reflector.load b/debian/config-dir/new-mods-available/reflector.load
new file mode 100644
index 0000000..91701d8
--- /dev/null
+++ b/debian/config-dir/new-mods-available/reflector.load
@@ -0,0 +1 @@
+LoadModule reflector_module /usr/lib/apache2/modules/mod_reflector.so
diff --git a/debian/config-dir/new-mods-available/remoteip.load b/debian/config-dir/new-mods-available/remoteip.load
new file mode 100644
index 0000000..a771554
--- /dev/null
+++ b/debian/config-dir/new-mods-available/remoteip.load
@@ -0,0 +1 @@
+LoadModule remoteip_module /usr/lib/apache2/modules/mod_remoteip.so
diff --git a/debian/config-dir/mods-available/reqtimeout.load b/debian/config-dir/new-mods-available/reqtimeout.load
similarity index 100%
copy from debian/config-dir/mods-available/reqtimeout.load
copy to debian/config-dir/new-mods-available/reqtimeout.load
diff --git a/debian/config-dir/new-mods-available/request.load b/debian/config-dir/new-mods-available/request.load
new file mode 100644
index 0000000..6727f5a
--- /dev/null
+++ b/debian/config-dir/new-mods-available/request.load
@@ -0,0 +1 @@
+LoadModule request_module /usr/lib/apache2/modules/mod_request.so
diff --git a/debian/config-dir/new-mods-available/sed.load b/debian/config-dir/new-mods-available/sed.load
new file mode 100644
index 0000000..cf5d9af
--- /dev/null
+++ b/debian/config-dir/new-mods-available/sed.load
@@ -0,0 +1 @@
+LoadModule sed_module /usr/lib/apache2/modules/mod_sed.so
diff --git a/debian/config-dir/new-mods-available/session.load b/debian/config-dir/new-mods-available/session.load
new file mode 100644
index 0000000..f518c96
--- /dev/null
+++ b/debian/config-dir/new-mods-available/session.load
@@ -0,0 +1 @@
+LoadModule session_module /usr/lib/apache2/modules/mod_session.so
diff --git a/debian/config-dir/new-mods-available/session_cookie.load b/debian/config-dir/new-mods-available/session_cookie.load
new file mode 100644
index 0000000..1db987f
--- /dev/null
+++ b/debian/config-dir/new-mods-available/session_cookie.load
@@ -0,0 +1 @@
+LoadModule session_cookie_module /usr/lib/apache2/modules/mod_session_cookie.so
diff --git a/debian/config-dir/new-mods-available/session_crypto.load b/debian/config-dir/new-mods-available/session_crypto.load
new file mode 100644
index 0000000..66a7cc4
--- /dev/null
+++ b/debian/config-dir/new-mods-available/session_crypto.load
@@ -0,0 +1 @@
+LoadModule session_crypto_module /usr/lib/apache2/modules/mod_session_crypto.so
diff --git a/debian/config-dir/new-mods-available/session_dbd.load b/debian/config-dir/new-mods-available/session_dbd.load
new file mode 100644
index 0000000..f6b936d
--- /dev/null
+++ b/debian/config-dir/new-mods-available/session_dbd.load
@@ -0,0 +1 @@
+LoadModule session_dbd_module /usr/lib/apache2/modules/mod_session_dbd.so
diff --git a/debian/config-dir/new-mods-available/slotmem_plain.load b/debian/config-dir/new-mods-available/slotmem_plain.load
new file mode 100644
index 0000000..0a68121
--- /dev/null
+++ b/debian/config-dir/new-mods-available/slotmem_plain.load
@@ -0,0 +1 @@
+LoadModule slotmem_plain_module /usr/lib/apache2/modules/mod_slotmem_plain.so
diff --git a/debian/config-dir/new-mods-available/socache_dbm.load b/debian/config-dir/new-mods-available/socache_dbm.load
new file mode 100644
index 0000000..c759d35
--- /dev/null
+++ b/debian/config-dir/new-mods-available/socache_dbm.load
@@ -0,0 +1 @@
+LoadModule socache_dbm_module /usr/lib/apache2/modules/mod_socache_dbm.so
diff --git a/debian/config-dir/new-mods-available/socache_memcache.load b/debian/config-dir/new-mods-available/socache_memcache.load
new file mode 100644
index 0000000..15d1ad0
--- /dev/null
+++ b/debian/config-dir/new-mods-available/socache_memcache.load
@@ -0,0 +1 @@
+LoadModule socache_memcache_module /usr/lib/apache2/modules/mod_socache_memcache.so
diff --git a/debian/config-dir/new-mods-available/watchdog.load b/debian/config-dir/new-mods-available/watchdog.load
new file mode 100644
index 0000000..1fd19ea
--- /dev/null
+++ b/debian/config-dir/new-mods-available/watchdog.load
@@ -0,0 +1 @@
+LoadModule watchdog_module /usr/lib/apache2/modules/mod_watchdog.so
diff --git a/debian/config-dir/new-mods-available/xml2enc.load b/debian/config-dir/new-mods-available/xml2enc.load
new file mode 100644
index 0000000..98cfa18
--- /dev/null
+++ b/debian/config-dir/new-mods-available/xml2enc.load
@@ -0,0 +1 @@
+LoadModule xml2enc_module /usr/lib/apache2/modules/mod_xml2enc.so
diff --git a/debian/control b/debian/control
index 45270ce..2fbb0a0 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Apache Maintainers <debian-apache at lists.debian.org>
Uploaders: Stefan Fritsch <sf at debian.org>, Steinar H. Gunderson <sesse at debian.org>, Arno Töll <debian at toell.net>
#missing dependencies: openssl, mawk, sharutils, autoconf
-Build-Depends: debhelper (>= 8), lsb-release, dpkg-dev (>= 1.16.1~),
+Build-Depends: debhelper (>= 8.1.0~), 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],
liblua5.1-0-dev, libxml2-dev
@@ -19,8 +19,9 @@ Architecture: any
Depends: ${misc:Depends}, lsb-base, procps [!hurd-i386],
perl, mime-support, apache2-bin (= ${binary:Version}),
apache2-data (= ${source:Version})
-Replaces: apache2.2-common (<< 2.3.16-beta-1~)
-Breaks: apache2.2-common (<< 2.3.16-beta-1~)
+Pre-Depends: ${misc:Pre-Depends}
+Replaces: apache2.2-common (<< 2.3~)
+Breaks: apache2.2-common (<< 2.3~)
Provides: apache2.2-common
Recommends: ssl-cert
Suggests: www-browser, apache2-doc, apache2-suexec-pristine | apache2-suexec-custom
@@ -50,9 +51,10 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
# MODULE_MAGIC_NUMBER_MAJOR from apache2/include/ap_mmn.h
Provides: apache2-api-20111203
-Replaces: apache2.2-bin (<< 2.3.16-beta-1~), apache2.2-common (<< 2.3.16-beta-1~),
+Suggests: www-browser, apache2-doc, apache2-suexec-pristine | apache2-suexec-custom
+Replaces: apache2.2-bin (<< 2.3~), apache2.2-common (<< 2.3~),
apache2-mpm-worker, apache2-mpm-prefork, apache2-mpm-event
-Breaks: apache2.2-bin (<< 2.3.16-beta-1~), apache2.2-common (<< 2.3.16-beta-1~),
+Breaks: apache2.2-bin (<< 2.3~), apache2.2-common (<< 2.3~),
apache2-mpm-worker, apache2-mpm-prefork, apache2-mpm-event, apache2-mpm-itk
Description: Apache HTTP Server common binary files
The Apache Software Foundation's goal is to build a secure, efficient and
@@ -68,7 +70,7 @@ Package: apache2.2-common
Architecture: any
Section: oldlibs
Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, apache2 (>= 2.3.16-beta-1~)
+Depends: ${shlibs:Depends}, ${misc:Depends}, apache2 (>= 2.3~)
Description: Transitional package for apache2
This is a transitional package for apache2, and can be safely removed
after the installation is complete.
@@ -77,7 +79,7 @@ Package: apache2.2-bin
Architecture: any
Section: oldlibs
Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-bin (>= 2.3.16-beta-1~)
+Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-bin (>= 2.3~)
Description: Transitional package for apache2-bin
This is a transitional package for apache2-bin, and can be safely removed
after the installation is complete.
@@ -107,8 +109,10 @@ Depends: ${misc:Depends}, ${shlibs:Depends}
#Depends: ${misc:Depends}, ${shlibs:Depends}, apache2.2-common
#Conflicts: apache2-suexec
Replaces: apache2-suexec
+Conflicts: apache2-suexec
+Provides: apache2-suexec
Description: Standard suexec program for Apache 2 mod_suexec
- Provides the standard suexec helper program for mod_suexec. This version is
+ Provides the standard suexec helper program for mod_suexec. This version is
compiled with document root /var/www and userdir suffix public_html. If you
need different settings, use the package apache2-suexec-custom.
@@ -117,9 +121,9 @@ Priority: extra
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
#Depends: ${misc:Depends}, ${shlibs:Depends}, apache2.2-common
-#Provides: apache2-suexec
-#Conflicts: apache2-suexec
-#Replaces: apache2-suexec
+Replaces: apache2-suexec
+Conflicts: apache2-suexec
+Provides: apache2-suexec
Description: Configurable suexec program for Apache 2 mod_suexec
Provides a customizable version of the suexec helper program for mod_suexec.
This is not the version from upstream, but can be configured with a
--
Debian packaging for apache2 (Apache HTTPD 2.x)
More information about the Pkg-apache-commits
mailing list