summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Fritsch <sf@debian.org>2008-01-04 19:40:50 +0000
committerStefan Fritsch <sf@sfritsch.de>2012-01-02 10:36:49 +0100
commitca199040b7cdcfe87f6b16f4d01d79c56d775946 (patch)
treef3a4f2ec10fe5a244ea6c86c21b18270e949a9be
parent348727253be37c3d16c0679dfbc865d7b6df6350 (diff)
downloadapache2-ca199040b7cdcfe87f6b16f4d01d79c56d775946.tar.gz
revert part of r517 that breaks the build
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@523 01b336ce-410b-0410-9a02-a0e7f243c266
-rw-r--r--debian/apache2-mpm-event.dirs1
-rw-r--r--debian/apache2-mpm-prefork.dirs1
-rw-r--r--debian/apache2-mpm-worker.dirs1
-rwxr-xr-xdebian/rules2
4 files changed, 2 insertions, 3 deletions
diff --git a/debian/apache2-mpm-event.dirs b/debian/apache2-mpm-event.dirs
index 00915466..236670a2 100644
--- a/debian/apache2-mpm-event.dirs
+++ b/debian/apache2-mpm-event.dirs
@@ -1,2 +1 @@
usr/sbin
-usr/share/lintian/overrides
diff --git a/debian/apache2-mpm-prefork.dirs b/debian/apache2-mpm-prefork.dirs
index 00915466..236670a2 100644
--- a/debian/apache2-mpm-prefork.dirs
+++ b/debian/apache2-mpm-prefork.dirs
@@ -1,2 +1 @@
usr/sbin
-usr/share/lintian/overrides
diff --git a/debian/apache2-mpm-worker.dirs b/debian/apache2-mpm-worker.dirs
index 00915466..236670a2 100644
--- a/debian/apache2-mpm-worker.dirs
+++ b/debian/apache2-mpm-worker.dirs
@@ -1,2 +1 @@
usr/sbin
-usr/share/lintian/overrides
diff --git a/debian/rules b/debian/rules
index 5ab8a316..500e7e16 100755
--- a/debian/rules
+++ b/debian/rules
@@ -222,6 +222,8 @@ install: build install-worker install-prefork install-common install-dev install
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-mpm-$$i/usr/share/lintian/overrides ;\
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 ;\