- Second upload of gosa 2.6.10

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6@19175 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/debian/changelog b/gosa-core/debian/changelog
index 0abdb00788c0fdeb1ce17658abee5c49371069e2..57fe79e21593c52712780d96bfc4a58368072667 100644 (file)
--- a/gosa-core/debian/changelog
+++ b/gosa-core/debian/changelog
@@ -1,3 +1,11 @@
+gosa (2.6.10-2) unstable; urgency=low
+
+  * Removed faulty patch due to 3.0 source conversion
+  * Prevented /usr/share/doc/gosa.conf to be compressed
+    to make setup configuration file saving work again
+
+ -- Benoit Mortier <benoit.mortier@opensides.be>  Tue, 27 Jul 2010 18:49:07 +0200
+
 gosa (2.6.10-1) unstable; urgency=low
 
   [ Cajus Pollmeier ]

diff --git a/gosa-core/debian/control b/gosa-core/debian/control
index e7b85d0d7291cf63a4df25d84307c08d793545d1..d71ad38d500520c309ea1efc926b3443183dda76 100644 (file)
--- a/gosa-core/debian/control
+++ b/gosa-core/debian/control
@@ -5,7 +5,7 @@ Maintainer: GOsa packages maintainers group <gosa-pkg@oss.gonicus.de>
 Uploaders: Cajus Pollmeier <cajus@debian.org>, Benoit Mortier <benoit.mortier@opensides.be>
 Build-Depends: debhelper (>= 7.0.50~)
 Build-Depends-Indep: po-debconf
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 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/gosa-core/debian/patches/series b/gosa-core/debian/patches/series
index e7a7a7be0e4a718ac1866df4d6b74cf7311a6acb..a6c4382f60a77fb31c250b00d095a6496897ea56 100644 (file)
--- a/gosa-core/debian/patches/series
+++ b/gosa-core/debian/patches/series
@@ -3,4 +3,3 @@
 03_fix_class_mapping.patch
 04_fix_locale_location.patch
 05_fix_online_help_location.patch
-debian-changes-2.6.10-1

diff --git a/gosa-core/debian/rules b/gosa-core/debian/rules
index abde6ef2247c11c22ac217ed285e5a54929f335c..5a9b10e923599548f0f3adb7e698ad455d79e417 100755 (executable)
--- a/gosa-core/debian/rules
+++ b/gosa-core/debian/rules
@@ -3,3 +3,7 @@
 %:
        dh $@
 
+override_dh_compress:
+       dh_compress
+       gzip -d debian/gosa/usr/share/doc/gosa/gosa.conf.gz
+