ooo-build r11492 - in trunk: . patches/ooxml patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Sat Feb  2 23:43:57 2008
New Revision: 11492
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11492&view=rev

Log:
2008-02-03  Rene Engelhard  <rene debian org>

        * patches/src680/reportdesign-mention-package.diff: update for
          ooh680-m6
        * patches/src680/apply,
          patches/ooxml/gperf-3-is-needed-m5.diff,
          patches/ooxml/gperf-3-is-needed.diff: ooh680-m6


Added:
   trunk/patches/ooxml/gperf-3-is-needed-m5.diff
      - copied unchanged from r11485, /trunk/patches/ooxml/gperf-3-is-needed.diff
Modified:
   trunk/ChangeLog
   trunk/patches/ooxml/gperf-3-is-needed.diff
   trunk/patches/src680/apply
   trunk/patches/src680/reportdesign-mention-package.diff

Modified: trunk/patches/ooxml/gperf-3-is-needed.diff
==============================================================================
--- trunk/patches/ooxml/gperf-3-is-needed.diff	(original)
+++ trunk/patches/ooxml/gperf-3-is-needed.diff	Sat Feb  2 23:43:57 2008
@@ -1,13 +1,5 @@
 --- config_office/configure.in	16 Jan 2008 14:28:09 -0000	1.241
 +++ config_office/configure.in	25 Jan 2008 15:19:31 -0000
-@@ -761,6 +761,7 @@
- dnl Configure pre-requisites.
- dnl ===================================================================
- cat /dev/null > warn
-+AC_PROG_EGREP
- AC_PROG_AWK
- AC_PATH_PROG( AWK, $AWK)
- if test -z "$AWK"; then
 @@ -2981,6 +2981,12 @@
  if test -z "$GPERF"; then
  	AC_MSG_ERROR([gperf not found but needed. Install it.])

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Sat Feb  2 23:43:57 2008
@@ -1570,8 +1570,13 @@
 
 win32-installer-register-moox-types.diff
 
+[ OOXML < ooh680-m6 ]
+gperf-3-is-needed-m5.diff
+
+[ OOXML >= ooh680-m6 ]
 gperf-3-is-needed.diff
 
+[ OOXML ]
 writerfilter-source-dmapper-domainmapper-debug.diff
 
 writerfilter-source-resourcemodel-util_cxx.diff
@@ -2115,6 +2120,8 @@
 
 [ Fixes ]
 sc-xclimpchangetrack-discard-bogus-formula-size.diff, n#355304, tml
+
+[ Fixes < ooh680-m6 ]
 dmake-heap-corruption.diff, i#85381, tml
 
 [ Glib2 ]

Modified: trunk/patches/src680/reportdesign-mention-package.diff
==============================================================================
--- trunk/patches/src680/reportdesign-mention-package.diff	(original)
+++ trunk/patches/src680/reportdesign-mention-package.diff	Sat Feb  2 23:43:57 2008
@@ -66,7 +66,7 @@
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				13691	ne	ààààààààà ààààà àààààààà ààààààà %RPT_EXTENSION_NAME àààààà ààààà à\n\nààààààà ààààààà à ààààààà àààà 'ààààààà...' ààààà ààààààààà à				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	nl	U hebt de extensie %RPT_EXTENSION_NAME nodig om een rapport te kunnen openen.\n\nKlik op 'Downloaden...' om de extensie te downloaden en installeren.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				13691	nn	Du treng utvidinga %RPT_EXTENSION_NAME for à opna rapportar.\n\nTrykk pà ÂLast ned for à lasta ned og installera utvidinga.				2002-02-02 02:02:02
--dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	pl	Do otwarcia raportu potrzebne jest rozszerzenie %RPT_EXTENSION_NAME.\n\nW celu ÅciÄgniÄcia i zainstalowania rozszerzenia kliknij 'ÅciÄgnij...'.				2002-02-02 02:02:02
+-dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	pl	Do otwarcia raportu potrzebne jest rozszerzenie %RPT_EXTENSION_NAME.\n\nW celu ÅciÄgniÄcia i zainstalowania rozszerzenia kliknij 'Pobierz...'.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	pt	Para abrir um relatÃrio, Ã necessÃrio a extensÃo %RPT_EXTENSION_NAME.\n\nClique em 'Download...' para fazer o download e instalar a extensÃo.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	pt-BR	Para abrir um relatÃrio, Ã necessÃrio a extensÃo %RPT_EXTENSION_NAME.\n\nClique em 'Download...' para fazer o download e instalar a extensÃo.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	ru	ÐÐÑ ÑÐÐÐÐÑÐÑÐÐÐÐÐÑ ÐÑÑÐÑÐ ÑÑÐÐÑÐÑÑÑ ÑÐÑÑÐÑÐÐÐÐ %RPT_EXTENSION_NAME.\n\nÐÐÐÐÐÐÑÐ  "ÐÐÐÑÑÐÐÑÑ..." ÐÐÑ ÐÐÐÑÑÐÐÐ Ð ÑÑÑÐÐÐÐÐÐ ÑÐÑÑÐÑÐÐÐÑ.				2002-02-02 02:02:02