[debian-edu-commits] debian-edu/pkg-team/ 15/32: Imported Debian patch 2.7.4-2

[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 1c162a7cbda2adc44ed31dccbd18bd5a0aa06131
Author: Cajus Pollmeier <cajus at debian.org>
Date:   Thu May 17 20:29:09 2012 +0200

    Imported Debian patch 2.7.4-2
---
 debian/changelog                      |  7 +++++++
 debian/control                        |  2 +-
 debian/gosa.postinst                  | 15 +++++++++------
 debian/patches/no-image-warning.patch | 11 +++++++++++
 debian/patches/series                 |  1 +
 5 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3f5ed14..f25f601 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gosa (2.7.4-2) unstable; urgency=low
+
+  * More robustness for the postinst scripts. Closes: #673168.
+  * Hide duplicate message of update-gosa.
+
+ -- Cajus Pollmeier <cajus at debian.org>  Thu, 17 May 2012 20:29:09 +0200
+
 gosa (2.7.4-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 204a78e..2b0b084 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: GOsa packages maintainers group <gosa-pkg at oss.gonicus.de>
 Uploaders: Cajus Pollmeier <cajus at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), dh-apache2
 Build-Depends-Indep: po-debconf
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Homepage: https://oss.gonicus.de/labs/gosa/
 Vcs-Browser: https://oss.gonicus.de/repositories/gosa/trunk
 Vcs-Svn: https://oss.gonicus.de/repositories/gosa/trunk
diff --git a/debian/gosa.postinst b/debian/gosa.postinst
index a801999..ea6789c 100644
--- a/debian/gosa.postinst
+++ b/debian/gosa.postinst
@@ -40,17 +40,20 @@ if [ -d /etc/apache2 ]; then
 	if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
 		. /usr/share/apache2/apache2-maintscript-helper
 		apache2_invoke enconf $CONF
+
+		# Add support for RequestHeader
+		if ! apache2_invoke enmod headers ; then
+			echo "Failed to enable the apache2 headers module!"
+		fi
 	elif  dpkg-query -f '${Version}'  -W 'apache2.2-common' > /dev/null 2>&1 ; then
 		[ -d /etc/apache2/conf.d/ ] && [ ! -L /etc/apache2/conf.d/$CONF.conf ] && ln -s ../conf-available/$CONF.conf /etc/apache2/conf.d/$CONF.conf
-	fi
-  
-	# Add support for RequestHeader
-	if ! apache2_invoke enmod headers ; then
-		echo "Failed to enable the apache2 headers module!"
+		if [ -e /usr/sbin/a2enmod ]; then
+			a2enmod headers
+		fi
 	fi
 fi
 
-if [ -d /etc/lighttpd/conf-available ]; then
+if [ -d /etc/lighttpd/conf-available -a -e /etc/init.d/lighttpd ]; then
 
   # Copy GOsa configuration to conf-available directories /etc/lighttpd/conf-available
   if [ ! -L /etc/lighttpd/conf-enabled/99gosa-lighttpd.conf ]; then
diff --git a/debian/patches/no-image-warning.patch b/debian/patches/no-image-warning.patch
new file mode 100644
index 0000000..9ecb1ca
--- /dev/null
+++ b/debian/patches/no-image-warning.patch
@@ -0,0 +1,11 @@
+--- a/gosa-core/update-gosa
++++ b/gosa-core/update-gosa
+@@ -547,7 +547,7 @@
+          // Is this image already there?
+          $checksum= md5_file($path);
+          if (in_array($checksum, $checksums)) {
+-           $warnings[]= "! Warning: images $indexPath seems to be a duplicate of ".array_search($checksum, $checksums);
++           #$warnings[]= "! Warning: images $indexPath seems to be a duplicate of ".array_search($checksum, $checksums);
+            $duplicates[$indexPath]= array_search($checksum, $checksums);
+            $duplicates[$greyIndexPath]= preg_replace('/\.png$/', '-grey.png', array_search($checksum, $checksums));
+            continue;
diff --git a/debian/patches/series b/debian/patches/series
index 61987cb..e452262 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02_fix_template_location.patch
 03_fix_class_mapping.patch
 04_fix_locale_location.patch
+no-image-warning.patch

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