[debian-edu-commits] debian-edu/pkg-team/ 03/32: Imported Debian patch 2.6.10-2
Mike Gabriel
sunweaver at debian.org
Tue Apr 1 16:51:58 UTC 2014
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository gosa.
commit 8906fc841fbb5e1e3e167fc7568c09437fe42a69
Author: Benoit Mortier <benoit.mortier at opensides.be>
Date: Tue Jul 27 18:49:07 2010 +0200
Imported Debian patch 2.6.10-2
---
debian/changelog | 8 +++
debian/control | 2 +-
debian/patches/debian-changes-2.6.10-1 | 125 ---------------------------------
debian/patches/series | 1 -
debian/rules | 4 ++
5 files changed, 13 insertions(+), 127 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0abdb00..57fe79e 100644
--- a/debian/changelog
+++ b/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 at opensides.be> Tue, 27 Jul 2010 18:49:07 +0200
+
gosa (2.6.10-1) unstable; urgency=low
[ Cajus Pollmeier ]
diff --git a/debian/control b/debian/control
index e7b85d0..d71ad38 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>, Benoit Mortier <benoit.mortier at 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/debian/patches/debian-changes-2.6.10-1 b/debian/patches/debian-changes-2.6.10-1
deleted file mode 100644
index 1d4902f..0000000
--- a/debian/patches/debian-changes-2.6.10-1
+++ /dev/null
@@ -1,125 +0,0 @@
-Description: Upstream changes introduced in version 2.6.10-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- gosa (2.6.10-1) unstable; urgency=low
- .
- [ Cajus Pollmeier ]
- * New upstream release
- .
- [ Benoit Mortier ]
- * Switch to dpkg-source 3.0 (quilt) format
- * gosa fails with: "Fatal error: Call to undefined function
- print_array() (Closes: #573220)
- * GOSa fails to add IP and MAC addresses to samba created hosts
- (Closes: #582896)
- .
- The person named in the Author field signed this changelog entry.
-Author: Benoit Mortier <benoit.mortier at opensides.be>
-Bug-Debian: http://bugs.debian.org/573220
-Bug-Debian: http://bugs.debian.org/582896
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- gosa-2.6.10.orig/gosa-core/update-gosa
-+++ gosa-2.6.10/gosa-core/update-gosa
-@@ -21,7 +21,7 @@
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
--define ("GOSA_HOME", "/usr/share/gosa");
-+define ("GOSA_HOME", dirname(__FILE__));
- define ("LOCALE_DIR", GOSA_HOME."/locale");
- define ("PLUGSTATE_DIR", GOSA_HOME."/state");
-
-@@ -122,8 +122,8 @@ function get_classes($folder= ".")
- function rescan_classes()
- {
- echo "Updating class cache...\n";
-- $class_mapping= get_classes("/usr/share/gosa");
-- $filename= "/var/cache/gosa/class.cache";
-+ $class_mapping= get_classes();
-+ $filename= GOSA_HOME."/include/class_location.inc";
-
- /* Sanity checks */
- if (!file_exists($filename) || is_writable($filename)) {
-@@ -169,20 +169,20 @@ function rescan_i18n()
-
- /* For each language, merge the target .mo to the compiled directory. */
- foreach ($languages as $language => $po_files){
-- if (!is_dir("/var/cache/gosa/locale/${language}/LC_MESSAGES")){
-- if (!mkdir ("/var/cache/gosa/locale/${language}/LC_MESSAGES", 0755, TRUE)){
-- echo "Failed to create '/var/cache/gosa/locale/${language}/LC_MESSAGES'- aborted";
-+ if (!is_dir(LOCALE_DIR."/compiled/${language}/LC_MESSAGES")){
-+ if (!mkdir (LOCALE_DIR."/compiled/${language}/LC_MESSAGES", 0755, TRUE)){
-+ echo "Failed to create '".LOCALE_DIR."/compiled/${language}/LC_MESSAGES'- aborted";
- exit (3);
- }
- }
-
- /* Cat all these po files into one single file */
-- system ("(cd ".LOCALE_DIR." && msgcat --use-first ".implode(" ", $po_files)." > /var/cache/gosa/locale/${language}/LC_MESSAGES/messages.po)", $val);
-+ system ("(cd ".LOCALE_DIR." && msgcat --use-first ".implode(" ", $po_files)." > compiled/${language}/LC_MESSAGES/messages.po)", $val);
- if ($val != 0){
- echo "Merging of message files failed - aborted";
- exit (4);
- }
-- system ("(cd /var/cache/gosa/locale/${language}/LC_MESSAGES && msgfmt -o messages.mo messages.po && rm messages.po)", $val);
-+ system ("(cd ".LOCALE_DIR."/compiled/${language}/LC_MESSAGES && msgfmt -o messages.mo messages.po && rm messages.po)", $val);
- if ($val != 0){
- echo "Compiling of message files failed - aborted";
- exit (5);
-@@ -195,7 +195,7 @@ function rescan_i18n()
-
- function rescan_guide()
- {
-- $master_guide= "/etc/gosa/guide.xml";
-+ $master_guide= "doc/guide.xml";
- echo "Updating Online Help Index...\n";
- $master_guide_content="<?xml version=\"1.0\"?>\n".
- "<!--\n".
---- gosa-2.6.10.orig/gosa-core/html/helpviewer.php
-+++ gosa-2.6.10/gosa-core/html/helpviewer.php
-@@ -104,7 +104,7 @@ $helpdir ="";
- if(session::global_is_set('current_class_for_help')){
-
- /* Create new XML parser with the path to the Xml file */
-- $xml = new parseXml("/etc/gosa/guide.xml");
-+ $xml = new parseXml("../doc/guide.xml");
-
- /* Generate help array */
- $str = $xml->parse();
---- gosa-2.6.10.orig/gosa-core/include/php_setup.inc
-+++ gosa-2.6.10/gosa-core/include/php_setup.inc
-@@ -20,7 +20,7 @@
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
--define ("LOCALE_DIR", "/var/cache/gosa/locale");
-+define ("LOCALE_DIR", dirname(dirname(__FILE__))."/locale/compiled");
-
- function gosaRaiseError($errno, $errstr, $errfile, $errline)
- {
---- gosa-2.6.10.orig/gosa-core/include/functions.inc
-+++ gosa-2.6.10/gosa-core/include/functions.inc
-@@ -73,7 +73,7 @@ $svn_path = '$HeadURL: https://oss.gonic
- $svn_revision = '$Revision: 17589 $';
-
- /* Include required files */
--require_once("/var/cache/gosa/class.cache");
-+require_once("class_location.inc");
- require_once ("functions_debug.inc");
- require_once ("accept-to-gettext.inc");
-
diff --git a/debian/patches/series b/debian/patches/series
index e7a7a7b..a6c4382 100644
--- a/debian/patches/series
+++ b/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/debian/rules b/debian/rules
index abde6ef..5a9b10e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,3 +3,7 @@
%:
dh $@
+override_dh_compress:
+ dh_compress
+ gzip -d debian/gosa/usr/share/doc/gosa/gosa.conf.gz
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa.git
More information about the debian-edu-commits
mailing list