summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Fritsch <sf@debian.org>2008-01-01 12:59:11 +0000
committerStefan Fritsch <sf@sfritsch.de>2012-01-02 10:36:49 +0100
commitf33c469d2055d6094f345289751d30acef039718 (patch)
treef753ab1607ac3c3937afcc06cfe3c56c153862e6
parentf29ae32a584c442e41a940b8b95ab7e42c73bac8 (diff)
downloadapache2-f33c469d2055d6094f345289751d30acef039718.tar.gz
don't install /var/www/apache2-default in the first place instead of deleting it later
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@519 01b336ce-410b-0410-9a02-a0e7f243c266
-rw-r--r--debian/apache2.2-common.install3
-rwxr-xr-xdebian/rules1
2 files changed, 0 insertions, 4 deletions
diff --git a/debian/apache2.2-common.install b/debian/apache2.2-common.install
index 1834086a..511ddbbb 100644
--- a/debian/apache2.2-common.install
+++ b/debian/apache2.2-common.install
@@ -9,6 +9,3 @@ usr/sbin/envvars etc/apache2
usr/sbin/envvars-std usr/share/apache2/build
usr/sbin/httxt2dbm
etc/apache2 usr/share/doc/apache2.2-common/examples
-usr/share/apache2/default-site/htdocs/*.gif /var/www/apache2-default
-usr/share/apache2/default-site/htdocs/*.png /var/www/apache2-default
-usr/share/apache2/default-site/htdocs/*.html /var/www/apache2-default \ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 868ef483..1f7a1770 100755
--- a/debian/rules
+++ b/debian/rules
@@ -212,7 +212,6 @@ install: build install-worker install-prefork install-common install-dev install
do install -m755 $$i debian/apache2.2-common/usr/sbin; \
rm -f debian/apache2.2-common/usr/sbin/update-apache2-modules debian/apache2.2-common/usr/sbin/modhandler.py; \
done
- rm -r debian/apache2.2-common/var/www/apache2-default
cp debian/default-index.html debian/apache2.2-common/usr/share/apache2/default-site/index.html
for i in worker event; do \
install -m755 debian/mpm-postinst-threaded debian/apache2-mpm-$$i.postinst ;\