summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGeorgios M. Zarkadas <gz@member.fsf.org>2012-06-13 22:50:15 +0300
committerGeorgios M. Zarkadas <gz@member.fsf.org>2012-06-13 22:50:15 +0300
commite02e0de1c2c3e9358de50e1565123edb1e8418fe (patch)
tree13238537e772692e4a56637c9a668b524952d4ec /debian
parent0bc623a8278eb1974fe59711e1609976cc24917a (diff)
Use same name for apache2 dhelp configuration (old-style packaging)
as dhelp version 0.6.20.
Diffstat (limited to 'debian')
-rwxr-xr-xdebian/postinst2
-rwxr-xr-xdebian/prerm2
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/postinst b/debian/postinst
index e510981..8ba7fc3 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -167,7 +167,7 @@ configure|abort-upgrade)
# Apache2: copy in both locations, ie for versions < 2.4 and >= 2.4
cp_ucfregister_file dhelp ${DHELP_CONFDIR}/apache-dhelp.conf \
- /etc/apache2/conf.d/dhelp
+ /etc/apache2/conf.d/dhelp.conf
cp_ucfregister_file dhelp ${DHELP_CONFDIR}/apache-dhelp.conf \
/etc/apache2/conf-available/dhelp.conf
diff --git a/debian/prerm b/debian/prerm
index 07cf3be..0e8e3e4 100755
--- a/debian/prerm
+++ b/debian/prerm
@@ -101,7 +101,7 @@ case $1 in
purge)
# Remove and unregister with ucf our web server configuration snippets.
- ucf_unregister_file dhelp /etc/apache2/conf.d/dhelp
+ ucf_unregister_file dhelp /etc/apache2/conf.d/dhelp.conf
ucf_unregister_file dhelp /etc/apache2/conf-available/dhelp.conf
ucf_unregister_file dhelp /etc/lighttpd/conf-available/95-dhelp.conf