[Pkg-apache-commits] r931 - in /trunk/apache2: apache2.2-bin.dirs apache2.2-bin.install apache2.2-common.install changelog control rules
sf at alioth.debian.org
sf at alioth.debian.org
Thu May 21 11:38:38 UTC 2009
Author: sf
Date: Thu May 21 11:38:37 2009
New Revision: 931
URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=931
Log:
move binaries into apache2.2-bin package
Added:
trunk/apache2/apache2.2-bin.dirs
trunk/apache2/apache2.2-bin.install
Modified:
trunk/apache2/apache2.2-common.install
trunk/apache2/changelog
trunk/apache2/control
trunk/apache2/rules
Added: trunk/apache2/apache2.2-bin.dirs
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2.2-bin.dirs?rev=931&op=file
==============================================================================
--- trunk/apache2/apache2.2-bin.dirs (added)
+++ trunk/apache2/apache2.2-bin.dirs Thu May 21 11:38:37 2009
@@ -1,0 +1,3 @@
+usr/lib/apache2/mpm-worker
+usr/lib/apache2/mpm-prefork
+usr/lib/apache2/mpm-event
Added: trunk/apache2/apache2.2-bin.install
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2.2-bin.install?rev=931&op=file
==============================================================================
--- trunk/apache2/apache2.2-bin.install (added)
+++ trunk/apache2/apache2.2-bin.install Thu May 21 11:38:37 2009
@@ -1,0 +1,2 @@
+usr/lib/apache2/modules
+usr/sbin/httxt2dbm
Modified: trunk/apache2/apache2.2-common.install
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2.2-common.install?rev=931&op=diff
==============================================================================
--- trunk/apache2/apache2.2-common.install (original)
+++ trunk/apache2/apache2.2-common.install Thu May 21 11:38:37 2009
@@ -1,7 +1,5 @@
usr/share/apache2/icons
usr/sbin/apache2ctl
usr/share/apache2/error
-usr/lib/apache2/modules
usr/sbin/envvars-std usr/share/apache2/build
-usr/sbin/httxt2dbm
etc/apache2 usr/share/doc/apache2.2-common/examples
Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=931&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Thu May 21 11:38:37 2009
@@ -1,3 +1,14 @@
+apache2 (2.2.11-5) UNRELEASED; urgency=low
+
+ * Move all binaries into a new package apache2.2-bin and make
+ apache2.2-common depend on it. This allows to
+ - run apache as user process only, e.g. with gnome-user-share.
+ Closes: #468690
+ - run multiple instances of apache with different MPMs. This configuration
+ is not supported in any way, though. Closes: #517572
+
+ -- Stefan Fritsch <sf at debian.org> Wed, 20 May 2009 20:22:48 +0200
+
apache2 (2.2.11-4) unstable; urgency=low
[ Stefan Fritsch ]
Modified: trunk/apache2/control
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/control?rev=931&op=diff
==============================================================================
--- trunk/apache2/control (original)
+++ trunk/apache2/control Thu May 21 11:38:37 2009
@@ -10,8 +10,8 @@
Homepage: http://httpd.apache.org/
Package: apache2.2-common
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-utils, net-tools, libmagic1, mime-support, lsb-base, procps [!hurd-i386], perl
+Architecture: all
+Depends: apache2.2-bin (= ${binary:Version}), apache2-utils, net-tools, libmagic1, mime-support, lsb-base, procps [!hurd-i386], perl
Recommends: ssl-cert
Suggests: www-browser, apache2-doc, apache2-suexec | apache2-suexec-custom
Conflicts: apache2-common, libapache2-mod-php5 (<= 5.1.6-3), libapache2-mod-php4 (<= 4:4.4.4-2), libapache2-mod-mime-xattr (<= 0.3-2), libapache2-mod-mono (<= 1.1.17-3), libapache2-mod-proxy-html (<= 2.4.3-2), libapache2-mod-scgi (<= 1.11-1), libapache2-mod-speedycgi (<= 2.22-3), libapache2-modxslt (<= 2005072700-1), libapache2-redirtoservername (<= 0.1-1), libapache2-webauth (<= 3.5.3-1), libapache2-webkdc (<= 3.5.3-1)
@@ -21,13 +21,28 @@
extensible HTTP server as standards-compliant open source software. The
result has long been the number one web server on the Internet.
.
- This package contains all the standard apache2 modules, including SSL support.
+ This package contains the configuration and support scripts.
However, it does *not* include the server itself; for this you need to
install one of the apache2-mpm-* packages, such as worker or prefork.
+Package: apache2.2-bin
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: apache2.2-common (<< 2.2.11-5~)
+Replaces: apache2.2-common (<< 2.2.11-5~)
+Description: Apache HTTP Server common binary files
+ The Apache Software Foundation's goal is to build a secure, efficient and
+ extensible HTTP server as standards-compliant open source software. The
+ result has long been the number one web server on the Internet.
+ .
+ This package contains all binaries but no configuration or support scripts.
+ To get a stand-alone server, you need to install one of the apache2-mpm-*
+ packages, such as worker or prefork. Other packages like gnome-user-share
+ may bring their own Apache configuration, though.
+
Package: apache2-mpm-worker
-Architecture: any
-Depends: ${shlibs:Depends}, apache2.2-common (= ${binary:Version})
+Architecture: all
+Depends: apache2.2-common (= ${binary:Version}), apache2.2-bin (= ${binary:Version})
Provides: apache2-mpm, apache2, httpd, httpd-cgi
Conflicts: apache2-mpm, apache2-common
Replaces: apache2-mpm-threadpool (<< 2.0.53), apache2-mpm-perchild (<< 2.2.0)
@@ -40,8 +55,8 @@
and has a smaller memory footprint than the traditional prefork MPM.
Package: apache2-mpm-prefork
-Architecture: any
-Depends: ${shlibs:Depends}, apache2.2-common (= ${binary:Version})
+Architecture: all
+Depends: apache2.2-common (= ${binary:Version}), apache2.2-bin (= ${binary:Version})
Provides: apache2-mpm, apache2, httpd, httpd-cgi
Conflicts: apache2-mpm, apache2-common
Description: Apache HTTP Server - traditional non-threaded model
@@ -57,8 +72,8 @@
other.
Package: apache2-mpm-event
-Architecture: any
-Depends: ${shlibs:Depends}, apache2.2-common (= ${binary:Version})
+Architecture: all
+Depends: apache2.2-common (= ${binary:Version}), apache2.2-bin (= ${binary:Version})
Provides: apache2-mpm, apache2, httpd, httpd-cgi
Conflicts: apache2-mpm, apache2-common
Description: Apache HTTP Server - event driven model
@@ -119,7 +134,7 @@
Package: apache2
Architecture: all
-Depends: apache2-mpm-worker (>= ${source:Version}) | apache2-mpm-prefork (>= ${source:Version}) | apache2-mpm-event (>= ${source:Version}) | apache2-mpm-itk
+Depends: apache2-mpm-worker (>= ${source:Version}) | apache2-mpm-prefork (>= ${source:Version}) | apache2-mpm-event (>= ${source:Version}) | apache2-mpm-itk, apache2.2-common (= ${binary:Version})
Description: Apache HTTP Server metapackage
The Apache Software Foundation's goal is to build a secure, efficient and
extensible HTTP server as standards-compliant open source software. The
@@ -171,6 +186,6 @@
Section: debug
Priority: extra
Architecture: any
-Depends: apache2.2-common (= ${binary:Version})
+Depends: apache2.2-bin (= ${binary:Version})
Description: Apache debugging symbols
This package includes the debugging symbols for Apache 2.
Modified: trunk/apache2/rules
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/rules?rev=931&op=diff
==============================================================================
--- trunk/apache2/rules (original)
+++ trunk/apache2/rules Thu May 21 11:38:37 2009
@@ -151,7 +151,6 @@
dh_testdir
dh_testroot
dh_installdirs
-
for i in worker prefork; do \
if [ "$$i" = "prefork" ]; then \
TARGET=prefork ;\
@@ -220,7 +219,7 @@
chmod 4754 debian/apache2-suexec/usr/lib/apache2/suexec
chgrp www-data debian/apache2-suexec/usr/lib/apache2/suexec
- chmod 644 debian/apache2.2-common/usr/lib/apache2/modules/mod_suexec.so
+ chmod 644 debian/apache2.2-bin/usr/lib/apache2/modules/mod_suexec.so
# configurable suexec
mkdir -p debian/apache2-suexec-custom/usr/lib/apache2 debian/apache2-suexec-custom/etc/apache2/suexec
@@ -269,15 +268,11 @@
for i in worker prefork event; do \
rm -rf debian/apache2-mpm-$$i/ ;\
mkdir -p debian/apache2-mpm-$$i/usr/sbin ;\
+ mkdir -p debian/apache2.2-bin/usr/lib/apache2/mpm-$$i ;\
+ install -m 755 $(BUILD)/$$i/apache2 debian/apache2.2-bin/usr/lib/apache2/mpm-$$i/apache2 ;\
+ ln -s /usr/lib/apache2/mpm-$$i/apache2 debian/apache2-mpm-$$i/usr/sbin/apache2 ;\
mkdir -p debian/apache2-mpm-$$i/usr/share/lintian/overrides ;\
mkdir -p debian/apache2-mpm-$$i/usr/share/bug/apache2-mpm-$$i ;\
- install -m 755 $(BUILD)/$$i/apache2 debian/apache2-mpm-$$i/usr/sbin/apache2 ;\
- if [ "$(LSB_RELEASE)" != "Ubuntu" ] && [ -n "$(DEB_BUILD_STRIP)" ] ; then \
- objcopy --only-keep-debug debian/apache2-mpm-$$i/usr/sbin/apache2 debian/apache2-dbg/usr/lib/debug/usr/sbin/apache2-mpm-$$i ;\
- chmod 644 debian/apache2-dbg/usr/lib/debug/usr/sbin/apache2-mpm-$$i ;\
- dh_strip -papache2-mpm-$$i ;\
- objcopy --add-gnu-debuglink=debian/apache2-dbg/usr/lib/debug/usr/sbin/apache2-mpm-$$i debian/apache2-mpm-$$i/usr/sbin/apache2 ;\
- fi ;\
perl -p -e "s/^/apache2-mpm-$$i: /" < debian/mpms.lintian-overrides > debian/apache2-mpm-$$i/usr/share/lintian/overrides/apache2-mpm-$$i ;\
ln -s ../apache2.2-common/script debian/apache2-mpm-$$i/usr/share/bug/apache2-mpm-$$i ;\
done
@@ -292,16 +287,23 @@
dh_testdir -i
dh_testroot -i
dh_installdirs -i
- dh_installdocs -i
- ln -sf ../apache2.2-common/README.Debian.gz debian/apache2/usr/share/doc/apache2/
+ dh_installdocs -i debian/README.backtrace
mkdir -p debian/apache2/usr/share/bug/apache2
ln -sf ../apache2.2-common/script debian/apache2/usr/share/bug/apache2
install -m644 debian/apache2.bug.control debian/apache2/usr/share/bug/apache2/control
cp debian/README.Debian debian/apache2-doc/usr/share/doc/apache2-doc/
- dh_installchangelogs -i CHANGES -Napache2 -Napache2-suexec -Napache2-suexec-custom
+ dh_installman -i
+ dh_installinit -i --no-start -r --name=apache2 -- defaults 91 09
+ dh_installcron -i -r --name=apache2
+ dh_installchangelogs -i CHANGES -Napache2
dh_installchangelogs -papache2 -papache2-suexec -papache2-suexec-custom
dh_lintian -i
+ for p in apache2-mpm-prefork apache2-mpm-event apache2-mpm-worker apache2; do \
+ rm -rf debian/$$p/usr/share/doc/$$p ;\
+ ln -s apache2.2-common debian/$$p/usr/share/doc/$$p ;\
+ done
dh_compress -i
+ dh_link -i
dh_fixperms -i -Xsuexec
dh_installdeb -i
dh_gencontrol -i
@@ -312,22 +314,20 @@
dh_testdir -a
dh_testroot -a
dh_installdirs -a
- dh_installdocs -a debian/README.backtrace
- # always compress to make the symlink work
- gzip -9 debian/apache2.2-common/usr/share/doc/apache2.2-common/README.Debian
+ dh_installdocs -a
dh_installman -a
- dh_installchangelogs -a CHANGES
+ dh_installchangelogs -a CHANGES -Napache2-suexec -Napache2-suexec-custom
+ dh_installchangelogs -a -papache2-suexec -papache2-suexec-custom
dh_lintian -a
- rm -f debian/apache2-dbg/usr/share/doc/apache2-dbg/changelog
- rm -f debian/apache2-dbg/usr/share/doc/apache2-dbg/NEWS.Debian
+ rm -f debian/apache2.2-bin/usr/share/doc/apache2.2-bin/NEWS.Debian
rm -f debian/apache2-utils/usr/share/doc/apache2-utils/NEWS.Debian
- dh_installinit -a --no-start -r --name=apache2 -- defaults 91 09
- dh_installcron -a -r --name=apache2
- if [ "$(LSB_RELEASE)" = "Ubuntu" ]; then \
- dh_strip -a; \
- else \
- dh_strip -a --dbg-package=apache2-dbg -Napache2-mpm-worker -Napache2-mpm-event -Napache2-mpm-prefork -Napache2-dbg; \
- fi
+ dh_strip -a --dbg-package=apache2-dbg -Napache2-dbg;
+ for p in apache2-prefork-dev apache2-threaded-dev; do \
+ rm -rf debian/$$p/usr/share/doc/$$p ;\
+ ln -s apache2.2-common debian/$$p/usr/share/doc/$$p ;\
+ done
+ rm -rf debian/apache2-dbg/usr/share/doc/apache2-dbg
+ ln -s apache2.2-bin debian/apache2-dbg/usr/share/doc/apache2-dbg
dh_link -a
dh_compress -a
dh_fixperms -a -Xsuexec
More information about the Pkg-apache-commits
mailing list