From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 12 Jun 2008 06:48:46 +0000 (+0000)
Subject: Update patch
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bb652a8cddc97282aa282e25500c1fe28b891832;p=gosa.git

Update patch


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

diff --git a/gosa-core/debian/patches/04_fix_locale_location.dpatch b/gosa-core/debian/patches/04_fix_locale_location.dpatch
index c86009a65..1f969af3b 100755
--- a/gosa-core/debian/patches/04_fix_locale_location.dpatch
+++ b/gosa-core/debian/patches/04_fix_locale_location.dpatch
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad gosa-core~/include/php_setup.inc gosa-core/include/php_setup.inc
---- gosa-core~/include/php_setup.inc	2008-03-17 23:52:36.000000000 +0100
-+++ gosa-core/include/php_setup.inc	2008-04-09 09:22:55.000000000 +0200
+diff -urNad gosa-2.6.0+svn11288~/include/php_setup.inc gosa-2.6.0+svn11288/include/php_setup.inc
+--- gosa-2.6.0+svn11288~/include/php_setup.inc	2008-06-11 15:55:59.000000000 +0200
++++ gosa-2.6.0+svn11288/include/php_setup.inc	2008-06-11 15:56:00.000000000 +0200
 @@ -20,7 +20,7 @@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
@@ -17,9 +17,9 @@ diff -urNad gosa-core~/include/php_setup.inc gosa-core/include/php_setup.inc
  
  function gosaRaiseError($errno, $errstr, $errfile, $errline)
  {
-diff -urNad gosa-core~/update-gosa gosa-core/update-gosa
---- gosa-core~/update-gosa	2008-04-02 15:58:24.000000000 +0200
-+++ gosa-core/update-gosa	2008-04-09 09:22:31.000000000 +0200
+diff -urNad gosa-2.6.0+svn11288~/update-gosa gosa-2.6.0+svn11288/update-gosa
+--- gosa-2.6.0+svn11288~/update-gosa	2008-06-11 15:55:59.000000000 +0200
++++ gosa-2.6.0+svn11288/update-gosa	2008-06-11 16:02:30.000000000 +0200
 @@ -169,20 +169,20 @@
  
  	/* For each language, merge the target .mo to the compiled directory. */
@@ -27,22 +27,22 @@ diff -urNad gosa-core~/update-gosa gosa-core/update-gosa
 -		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";
-+		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("/var/cache/gosa/locale/compiled/${language}/LC_MESSAGES")){
++			if (!mkdir ("/var/cache/gosa/locale/compiled/${language}/LC_MESSAGES", 0755, TRUE)){
++				echo "Failed to create '/var/cache/gosa/locale/compiled/${language}/LC_MESSAGES'- aborted";
  				exit (3);
  			}
  		}
  
  		/* Cat all these po files into one single file */
--		system ("(cd ".LOCALE_DIR." && msgcat ".implode(" ", $po_files)." > compiled/${language}/LC_MESSAGES/messages.po)", $val);
-+		system ("(cd ".LOCALE_DIR." && msgcat ".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);
++		system ("(cd ".LOCALE_DIR." && msgcat --use-first ".implode(" ", $po_files)." > /var/cache/gosa/locale/compiled/${language}/LC_MESSAGES/messages.po)", $val);
  		if ($val != 0){
  			echo "Merging of message files failed - aborted";
  			exit (4);
  		}
 -		system ("(cd ".LOCALE_DIR."/compiled/${language}/LC_MESSAGES && msgfmt -o messages.mo messages.po && rm messages.po)", $val);
-+		system ("(cd /var/cache/gosa/locale/${language}/LC_MESSAGES && msgfmt -o messages.mo messages.po && rm messages.po)", $val);
++		system ("(cd /var/cache/gosa/locale/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);