[debian-edu-commits] debian-edu/pkg-team/ 18/32: Imported Debian patch 2.7.4-4.1

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository gosa.

commit 9e509837a1699c75c77d9d48cd2c87b21cf8e0ae
Author: Jonathan Wiltshire <jmw at debian.org>
Date:   Sun Jan 27 14:15:17 2013 +0000

    Imported Debian patch 2.7.4-4.1
---
 debian/changelog     | 8 ++++++++
 debian/gosa.postinst | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 372600d..cbb158f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gosa (2.7.4-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/gosa.postinst: add a guard around a2enmod for when
+    gosa is installed without Apache2 (Closes: #698635)
+
+ -- Jonathan Wiltshire <jmw at debian.org>  Sun, 27 Jan 2013 14:15:17 +0000
+
 gosa (2.7.4-4) unstable; urgency=low
 
   * New smarty3 package fixes problems with template loading. This
diff --git a/debian/gosa.postinst b/debian/gosa.postinst
index c48ea12..a9e2288 100644
--- a/debian/gosa.postinst
+++ b/debian/gosa.postinst
@@ -54,7 +54,9 @@ if [ -d /etc/apache2/conf.d ]; then
   fi
   
   # Add support for RequestHeader
-  a2enmod headers
+  if [ -x /usr/sbin/a2enmod ]; then
+    a2enmod headers
+  fi
 
   # Finally restart servers
   if [ -x /usr/sbin/invoke-rc.d ]; then

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa.git