ooo-build r12371 - in trunk: . patches/dev300 patches/src680

From: rengelhard svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r12371 - in trunk: . patches/dev300 patches/src680
Date: Tue, 29 Apr 2008 12:04:21 +0100 (BST)
Author: rengelhard
Date: Tue Apr 29 11:04:20 2008
New Revision: 12371
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12371&view=rev

Log:
2008-04-29  Rene Engelhard  <rene debian org>

        * patches/src680/reportdesign-mention-package.diff,
          patches/src680/system-lpsolve-rpath.diff: move ...
        * patches/dev300/reportdesign-mention-package.diff,
          patches/dev300/system-lpsolve-rpath.diff: ... here and update
        * patches/dev300/apply: reenable pdfimport-no-license.diff,
          add comment to wiki-publisher-no-license.diff


Added:
   trunk/patches/dev300/reportdesign-mention-package.diff
      - copied, changed from r12369, /trunk/patches/src680/reportdesign-mention-package.diff
   trunk/patches/dev300/system-lpsolve-rpath.diff
      - copied, changed from r12369, /trunk/patches/src680/system-lpsolve-rpath.diff
Removed:
   trunk/patches/src680/reportdesign-mention-package.diff
   trunk/patches/src680/system-lpsolve-rpath.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Apr 29 11:04:20 2008
@@ -323,11 +323,9 @@
 # no bogus license question when registering these extensions
 reportdesigner-no-license.diff
 presentation-minimizer-no-license.diff
-
-# don't show license
 presenterscreen-no-license.diff
-#FIXME dev300-m10: wiki-publisher-no-license.diff
-#FIXME dev300-m10: pdfimport-no-license.diff
+#FIXME: swext not in OpenOffice2 alias#wiki-publisher-no-license.diff
+pdfimport-no-license.diff
 
 
 [ Fixes ]

Copied: trunk/patches/dev300/reportdesign-mention-package.diff (from r12369, /trunk/patches/src680/reportdesign-mention-package.diff)
==============================================================================
--- /trunk/patches/src680/reportdesign-mention-package.diff	(original)
+++ trunk/patches/dev300/reportdesign-mention-package.diff	Tue Apr 29 11:04:20 2008
@@ -30,29 +30,26 @@
         CancelButton PB_CANCEL
         {
                 Pos = MAP_APPFONT ( DLG_WIDTH / 2 + (CELL_PADDING/2), ACTION_LINE_START) ;
-Index: localize.sdf
-===================================================================
-RCS file: /cvs/dba/dbaccess/source/ui/dlg/localize.sdf,v
-retrieving revision 1.37
-diff -u -u -r1.37 localize.sdf
---- dbaccess/source/ui/dlg/localize.sdf	12 Nov 2007 13:22:41 -0000	1.37
-+++ dbaccess/source/ui/dlg/localize.sdf	24 Nov 2007 13:31:11 -0000
-@@ -6922,42 +6922,8 @@
+--- dbaccess/source/ui/dlg/localize.sdf-old	2008-04-29 12:45:07.000000000 +0200
++++ dbaccess/source/ui/dlg/localize.sdf	2008-04-29 12:47:49.000000000 +0200
+@@ -7013,46 +7013,8 @@
  dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	pushbutton	RID_EXTENSION_NOT_PRESENT_DLG	PB_DOWNLOAD			0	vi	Tái ~vá...				2002-02-02 02:02:02
  dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	pushbutton	RID_EXTENSION_NOT_PRESENT_DLG	PB_DOWNLOAD			0	zh-CN	äè(~D)...				2002-02-02 02:02:02
  dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	pushbutton	RID_EXTENSION_NOT_PRESENT_DLG	PB_DOWNLOAD			0	zh-TW	äè(~D)...				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	ar	ÙÙØØ ØÙØÙØÙØ ØÙØ ØØØØØ ÙØÙØØØØ %RPT_EXTENSION_NAME.\n\nØÙÙØ ' ÙØÙ ...' ÙØÙØÙÙ ÙØØØÙØ ØÙØÙØØØØØ.				2002-02-02 02:02:02
--dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				13691	be-BY	ÐÐÐ ÐÐÐÑÑÑÑ ÐÐÐÐÐÐÐÐÐÐÐÐ, ÐÐÑÑÑÐÐÐÐ ÐÐÑÑÑÑÐÐÐ %RPT_EXTENSION_NAME.\n\nÐÐÑÑÑÐÑÑÐ 'ÐÑÑÑÐÐÑÑ...' ÐÐÐ ÐÑÑÑÐÐÑÑ Ñ ÑÑÑÐÐÐÐÑÑÑ ÐÐÑÑÑÑÐÐÐ.				2002-02-02 02:02:02
--dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				13691	bg	ÐÐ ÐÐ ÐÑÐÐÑÐÑÐ ÑÐÑÐÐÐÐ, ÐÐ Ð ÐÐÐÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐÐÐÐÑÐ %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	be-BY	ÐÐÐ ÐÐÐÑÑÑÑ ÐÐÐÐÐÐÐÐÐÐÐÐ, ÐÐÑÑÑÐÐÐÐ ÐÐÑÑÑÑÐÐÐ %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	bg	ÐÐ ÐÐ ÐÑÐÐÑÐÑÐ ÑÐÑÐÐÐÐ, ÐÐ Ð ÐÐÐÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐÐÐÐÑÐ %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	br	Evit digeriÃ ur marilh ho po ezhomm eus an askouezhad %RPT_EXTENSION_NAME.\n\nKlikaÃ war 'PellgargaÃ...' evit pellgargaÃ ha staliaÃ an askouezhad.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	ca	Per a obrir un informe necessiteu l'extensiÃ %RPT_EXTENSION_NAME.\n\nFeu clic a "Baixa..." per a baixar i instalÂlar l'extensiÃ.				2002-02-02 02:02:02
--dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				13691	cs	Pro otevÅenÃ sestavy je potÅeba rozÅÃÅenÃ %RPT_EXTENSION_NAME.\n\nKlepnÄte na 'StÃhnout...', pokud chcete rozÅÃÅenÃ stÃhnout a nainstalovat.				2002-02-02 02:02:02
--dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	da	To open a report you require the extension %RPT_EXTENSION_NAME.\n\nClick 'Download...' to download and install the extension.				2002-02-02 02:02:02
+-dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	cs	Pro otevÅenÃ sestavy je potÅeba rozÅÃÅenÃ %RPT_EXTENSION_NAME.\n\nKlepnÄte na 'StÃhnout...', pokud chcete rozÅÃÅenÃ stÃhnout a nainstalovat.				2002-02-02 02:02:02
+-dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	da	For at Ãbne en rapport krÃves udvidelsen %RPT_EXTENSION_NAME.\n\nKlik pÃ 'Hent...' for at hente og installere udvidelsen.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	de	Zum Ãffnen eines Berichts wird die Erweiterung %RPT_EXTENSION_NAME benÃtigt.\n\nKlicken Sie auf 'Download...', um die Erweiterung herunterzuladen und zu installieren.				2002-02-02 02:02:02
+-dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	el	ÎÎÎ ÎÎ ÎÎÎÎÎÎÏÎ ÎÎÎ ÎÎÎÏÎÏÎ ÏÏÎÎÎÎÎÏÏÎ ÏÎÎ ÎÏÎÎÏÎÏÎ  %RPT_EXTENSION_NAME.\n\nÎÎÏÎÏÏÎ 'ÎÎÏÎ...' ÎÎÎ ÎÎ ÎÎÎÎÏÎ ÎÎÏÎ ÎÎÎ ÎÎÎÎÏÎÏÏÎÏÎ ÏÎÏ ÎÏÎÎÏÎÏÎÏ.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				1	eo	Por malfermi raporton vi bezonas la etendajxon %RPT_EXTENSION_NAME.\n\nAlklaku 'Elsxuti...' por elsxuti kaj instali la etendajxon.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	es	Para abrir un informe se requiere la extensiÃn %RPT_EXTENSION_NAME.\n\nHaga clic en 'Descargar...' para descargar e instalar la extensiÃn.				2002-02-02 02:02:02
--dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				13691	et	Aruande avamiseks on vaja laiendust %RPT_EXTENSION_NAME.\n\nLaienduse allalaadimiseks ja paigaldamiseks klÃpsa 'Laadi alla...'.				2002-02-02 02:02:02
+-dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	et	Aruande avamiseks on vaja laiendust %RPT_EXTENSION_NAME.\n\nLaienduse allalaadimiseks ja paigaldamiseks klÃpsa 'Laadi alla...'.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	fr	L'ouverture d'un rapport requiert l'extension %RPT_EXTENSION_NAME.\n\nCliquez sur TÃlÃcharger... pour tÃlÃcharger et installer l'extension.				2002-02-02 02:02:02
+-dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	gl	NecesÃtase a extensiÃn %RPT_EXTENSION_NAME para abrir o informe.\n\nPrema 'Descargar...' para descargar e instalar a extensiÃn.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				13691	gu	àààààà ààààà àààà àààà %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	hr	Za otvaranje izvjeÅÄa morate imati %RPT_EXTENSION_NAME proÅirenje.\n\nKliknite na  'Preuzmi...' kako bi preuzeli i instalirali proÅirenje.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	hu	JelentÃs megnyitÃsÃhoz %RPT_EXTENSION_NAME bÅvÃtÃsre van szÃksÃg.\n\nKattintson a âLetÃltÃs...â lehetÅsÃgre a bÅvÃtÃs letÃltÃse Ãs telepÃtÃse ÃrdekÃben.				2002-02-02 02:02:02
@@ -60,25 +57,27 @@
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	ja	To open a report you require the extension %RPT_EXTENSION_NAME.\n\nClick 'Download...' to download and install the extension.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				13691	km	ááááááâáááâáááááááááâááá ááááâááááááááâáááááâáááááá %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	ko	ëêìë ìëë íìì %RPT_EXTENSION_NAMEì(ê) íìíëë.\n\n'ëìëë...'ë íëíê íììë ëìëë ë ììíëë.				2002-02-02 02:02:02
--dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				13691	lt	Ataskaitai atverti reikalingas plÄtinys %RPT_EXTENSION_NAME.\n\nSpustelÄkite âAtsisiÅsti...â, kad atsisiÅstumÄte ir ÄdiegtumÄte plÄtinÄ.				2002-02-02 02:02:02
--dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				13691	mk	ÐÐ ÐÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐÑÑÐÑ ÐÐ ÑÑÐÐÐ ÐÑÐÑÐÑÑÐÐÑÐÑÐ %RPT_EXTENSION_NAME.\n\nÐÐÐÐÐÑÐ ÐÐ 'ÐÐÐÐÐ...' ÐÐ ÐÐ ÐÐ ÑÐÐÐÐÑÐ Ð ÐÐÑÑÐÐÐÑÐÑÐ ÐÑÐÑÐÑÑÐÐÑÐÑÐ.				2002-02-02 02:02:02
--dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				13691	nb	Du trenger utvidelsen %RPT_EXTENSION_NAME for Ã Ãpne rapporter.\n\nTrykk pÃ ÂLast nedÂ for Ã laste ned og installere utvidelsen.				2002-02-02 02:02:02
--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	lt	Ataskaitai atverti reikalingas plÄtinys %RPT_EXTENSION_NAME.\n\nSpustelÄkite âAtsisiÅsti...â, kad atsisiÅstumÄte ir ÄdiegtumÄte plÄtinÄ.				2002-02-02 02:02:02
+-dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	mk	ÐÐ ÐÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐÑÑÐÑ ÐÐ ÑÑÐÐÐ ÐÑÐÑÐÑÑÐÐÑÐÑÐ %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	nb	Du trenger utvidelsen %RPT_EXTENSION_NAME for Ã Ãpne rapporter.\n\nTrykk pÃ ÂLast nedÂ for Ã laste ned og installere utvidelsen.				2002-02-02 02:02:02
+-dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	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	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 '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
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	rw	Kugira ngo ufungure raporo usaba umugereka %RPT_EXTENSION_NAME.\n\nKanda 'Gukurura...' kugira ngo ukurure uninjizemo umugereka.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				13691	sk	Pre otvorenie sprÃvy potrebujete rozÅÃrenie %RPT_EXTENSION_NAME.\n\nKliknite 'StiahnuÅ...' pre stiahnutie a inÅtalÃciu rozÅÃrenia.				2002-02-02 02:02:02
--dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				13691	sl	Äe Åelite odpreti poroÄilo, potrebujete razÅiritev %RPT_EXTENSION_NAME.\n\nKliknite 'Prenesi ...', da prenesete in namestite razÅiritev.				2002-02-02 02:02:02
+-dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	sl	Äe Åelite odpreti poroÄilo, potrebujete razÅiritev %RPT_EXTENSION_NAME.\n\nKliknite 'Prenesi ...', da prenesete in namestite razÅiritev.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	sv	TillÃgget %RPT_EXTENSION_NAME krÃvs fÃr att du ska kunna Ãppna rapporten.\n\nKlicka pÃ "Ladda ner" fÃr att hÃmta och installera tillÃgget.				2002-02-02 02:02:02
--dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				13691	tr	%RPT_EXTENSION_NAME eklentisi raporlarÄ aÃmak iÃin gereklidir.\n\nEklentiyi indirip yÃklemek iÃin "Ändir..." dÃÄmesine tÄklayÄn.				2002-02-02 02:02:02
--dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				1	vi	Khá nÄng má bÃo cÃo nhá phán má ráng %RPT_EXTENSION_NAME.\n\nNhán vÃo Â Tái vá... Â Äá tái vá vÃ cÃi Äát phán má ráng nÃy.				2002-02-02 02:02:02
+-dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	tr	%RPT_EXTENSION_NAME eklentisi raporlarÄ aÃmak iÃin gereklidir.\n\nEklentiyi indirip yÃklemek iÃin "Ändir..." dÃÄmesine tÄklayÄn.				2002-02-02 02:02:02
+-dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	uk	ÐÐÑ ÑÐÐÐÐÑÐÐÐÐÑ ÐÐÑÑÑ ÐÐÑÑÑÐÐÐ ÑÐÐÑÐÑÐÐÐÑ %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	vi	Khá nÄng má bÃo cÃo nhá phán má ráng %RPT_EXTENSION_NAME.\n\nNhán vÃo Â Tái vá... Â Äá tái vá vÃ cÃi Äát phán má ráng nÃy.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	zh-CN	äæåæèæéè %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	zh-TW	æéèææåèé %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	de	Zum Ãffnen eines Berichts wird die Erweiterung %RPT_EXTENSION_NAME benÃtigt.\n\nInstallieren Sie dafÃr das Paket 'openoffice.org-report-builder'.				2002-02-02 02:02:02
 +dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	fr	L'ouverture d'un rapport requiert l'extension %RPT_EXTENSION_NAME.\n\nPour cela, installez le package 'openoffice.org-report-builder'.				2002-02-02 02:02:02
- dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	zh-TW	æéèææåèé %RPT_EXTENSION_NAME æèéååèã\n\nèæää [äè...] ääèååèæåèéã				2002-02-02 02:02:02
  dbaccess	source\ui\dlg\RelationDlg.src	0	fixedline	DLG_REL_PROPERTIES	FL_CASC_DEL			84	af	Skrapopsies				2002-02-02 02:02:02
  dbaccess	source\ui\dlg\RelationDlg.src	0	fixedline	DLG_REL_PROPERTIES	FL_CASC_DEL			84	ar	ØÙØØØØ ØÙØØÙ				2002-02-02 02:02:02
+ dbaccess	source\ui\dlg\RelationDlg.src	0	fixedline	DLG_REL_PROPERTIES	FL_CASC_DEL			84	as-IN	ààààààààà ààààà ààà				2002-02-02 02:02:02

Copied: trunk/patches/dev300/system-lpsolve-rpath.diff (from r12369, /trunk/patches/src680/system-lpsolve-rpath.diff)
==============================================================================
--- /trunk/patches/src680/system-lpsolve-rpath.diff	(original)
+++ trunk/patches/dev300/system-lpsolve-rpath.diff	Tue Apr 29 11:04:20 2008
@@ -1,16 +1,27 @@
---- solenv/inc/libs.mk-old 2006-07-28 01:06:26.000000000 +0000
-+++ solenv/inc/libs.mk     2006-07-28 01:07:12.000000000 +0000
-@@ -254,7 +254,13 @@
- .ELSE
- JVMFWKLIB = -ljvmfwk
- .ENDIF                  # "$(GUI)$(COM)"=="WNTGCC"
+--- solenv/inc/libs.mk-old	2008-04-29 12:50:10.000000000 +0200
++++ solenv/inc/libs.mk	2008-04-29 12:51:27.000000000 +0200
+@@ -337,7 +337,13 @@
+ ULINGULIB=-lulingu
+ MYTHESLIB*=-lmythes
+ PYUNOLIB=-lpyuno
 +.IF "$(SYSTEM_LPSOLVE)" == "YES"
 +# FIXME. Even with -L/usr/lib/lp_solve -llpsolve55 the liblpsolve55.a from
 +# /usr/lib gets picked and we get a static link...
 +LPSOLVELIB = /usr/lib/lp_solve/liblpsolve55.so -Wl,-rpath=/usr/lib/lp_solve
 +.ELSE
- LPSOLVELIB = -llpsolve55
+ LPSOLVELIB=-llpsolve55
 +.ENDIF
-
- # #110743#
- # For BinFilters, some libs were added.
+ SOFFICELIB=-lsoffice
+ UNOPKGLIB=-lunopkg
+ 
+--- config_office/configure.in-old	2008-04-29 12:59:49.000000000 +0200
++++ config_office/configure.in	2008-04-29 13:00:07.000000000 +0200
+@@ -4772,7 +4772,7 @@
+     AC_CHECK_HEADER(lpsolve/lp_lib.h, [],
+        [ AC_MSG_ERROR(lpsolve headers not found.)], [])
+     AC_CHECK_LIB(lpsolve55, make_lp, ,
+-        [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
++        [ AC_MSG_ERROR(lpsolve library not found or too old.)], [-L/usr/lib/lp_solve])
+ else
+     AC_MSG_RESULT([internal])
+     SYSTEM_LPSOLVE=NO
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]