- Tool will do everything automatically

[gosa.git] / gosa-core / debian / patches / 04_fix_locale_location.dpatch

diff --git a/gosa-core/debian/patches/04_fix_locale_location.dpatch b/gosa-core/debian/patches/04_fix_locale_location.dpatch
index c86009a6549a0ad9b9a9d3a76c5b5cb55046f46d..6ed0165acda9340da26ff7b75740659a088284f4 100755 (executable)
--- a/gosa-core/debian/patches/04_fix_locale_location.dpatch
+++ b/gosa-core/debian/patches/04_fix_locale_location.dpatch
@@ -1,13 +1,13 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_fix_locale_location.dpatch by  <cajus@localhost>
+## 04_fix_locale_location.dpatch by  <cajus@debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Fixed location of auto-generated locales
 
 @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. */
@@ -35,8 +35,8 @@ diff -urNad gosa-core~/update-gosa gosa-core/update-gosa
                }
  
                /* 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/${language}/LC_MESSAGES/messages.po)", $val);
                if ($val != 0){
                        echo "Merging of message files failed - aborted";
                        exit (4);