ooo-build r13909 - in branches/ooo-build-3-0: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Sep 17 09:16:28 2008
New Revision: 13909
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13909&view=rev

Log:
2008-09-17  Rene Engelhard  <rene debian org>

        * patches/dev300/apply,
          patches/dev300/math-draw-generic-name.diff,
          patches/dev300/math-draw-generic-name-localize.diff: add GenericName
          to Math and Draw .desktop files
        * patches/dev300/config_office-openjdk-paths.diff: really fix ppc
        * patches/dev300/apply,
          patches/dev300/pdfimport-no-license-m5.diff,
          patches/dev300/pdfimport-no-license.diff: ooo300-m6


Added:
   branches/ooo-build-3-0/patches/dev300/math-draw-generic-name-localize.diff
   branches/ooo-build-3-0/patches/dev300/math-draw-generic-name.diff
   branches/ooo-build-3-0/patches/dev300/pdfimport-no-license-m5.diff   (props changed)
      - copied unchanged from r13906, /branches/ooo-build-3-0/patches/dev300/pdfimport-no-license.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply
   branches/ooo-build-3-0/patches/dev300/config_office-openjdk-paths.diff
   branches/ooo-build-3-0/patches/dev300/pdfimport-no-license.diff

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Wed Sep 17 09:16:28 2008
@@ -374,7 +374,10 @@
 [ FixesNotForUpstream < ooo300-m3 ]
 pdfimport-no-license-m2.diff
 
-[ FixesNotForUpstream >= ooo300-m3 ]
+[ FixesNotForUpstream >= ooo300-m3 < ooo300-m6 ]
+pdfimport-no-license-m5.diff
+
+[ FixesNotForUpstream >= ooo300-m6 ]
 pdfimport-no-license.diff
 
 [ swextFixes ]
@@ -500,6 +503,8 @@
 # such directories if they exist on the server's host system.
 win32-invalid-names.diff, n#277603, tml
 
+math-draw-generic-name.diff, i#93909, rengelha
+
 [ Fixes < dev300-m31 < ooo300-m5 ]
 # fixes the realpath buffer size to avoid crash when detecting soffice path
 cppuhelper-findsofficepath-realpath-buffer-size.diff, i#93393, pmladek
@@ -2523,6 +2528,8 @@
 # it is Y axis, not X one [in Spanish]
 chart2-es-eje-Y.diff, i#83821, rengelha
 
+math-draw-generic-name-localize.diff, i#93909, rengelha
+
 
 [ KDE4 ]
 SectionOwner => jholesov

Modified: branches/ooo-build-3-0/patches/dev300/config_office-openjdk-paths.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/config_office-openjdk-paths.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/config_office-openjdk-paths.diff	Wed Sep 17 09:16:28 2008
@@ -41,7 +41,7 @@
 +	 # OpenJDK
 +	 elsif ($JDK =~ m/sun/) {
 +	    $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-+	    $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
++	    $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."server";
 +	    $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
 +	    $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."xawt";
 +	 }

Added: branches/ooo-build-3-0/patches/dev300/math-draw-generic-name-localize.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0/patches/dev300/math-draw-generic-name-localize.diff	Wed Sep 17 09:16:28 2008
@@ -0,0 +1,13 @@
+Index: desktop/share/localize.sdf
+===================================================================
+--- sysui/desktop/share/localize.sdf	(Revision 261918)
++++ sysui/desktop/share/localize.sdf	(Arbeitskopie)
+@@ -3102,6 +3102,8 @@
+ sysui	desktop\share\launcher_genericname.ulf	0	LngText	writer				0	vi	Xá là tá				2002-02-02 02:02:02
+ sysui	desktop\share\launcher_genericname.ulf	0	LngText	writer				0	zh-CN	ååçå				2002-02-02 02:02:02
+ sysui	desktop\share\launcher_genericname.ulf	0	LngText	writer				0	zh-TW	ææèçå				2002-02-02 02:02:02
++sysui	desktop\share\launcher_genericname.ulf	0	LngText	math				0	de	Formeleditor				2002-02-02 02:02:02
++sysui	desktop\share\launcher_genericname.ulf	0	LngText	draw				0	de	Zeichenprogramm				2002-02-02 02:02:02
+ sysui	desktop\share\launcher_name.ulf	0	LngText	printeradmin				0	af	%PRODUCTNAME-drukkeradministrasie				2002-02-02 02:02:02
+ sysui	desktop\share\launcher_name.ulf	0	LngText	printeradmin				0	ar	ØØØØØ ØØØØØØ %PRODUCTNAME				2002-02-02 02:02:02
+ sysui	desktop\share\launcher_name.ulf	0	LngText	printeradmin				0	as-IN	%PRODUCTNAME àààààà ààààààà				2002-02-02 02:02:02

Added: branches/ooo-build-3-0/patches/dev300/math-draw-generic-name.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0/patches/dev300/math-draw-generic-name.diff	Wed Sep 17 09:16:28 2008
@@ -0,0 +1,33 @@
+Index: desktop/menus/math.desktop
+===================================================================
+--- sysui/desktop/menus/math.desktop	(Revision 261918)
++++ sysui/desktop/menus/math.desktop	(Arbeitskopie)
+@@ -7,4 +7,5 @@
+ Exec=openoffice -math %U
+ MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math;
+ Name=%PRODUCTNAME Math
++GenericName=Formula Editor
+ Comment=Create and edit scientific formulas and equations by using Math.
+Index: desktop/menus/draw.desktop
+===================================================================
+--- sysui/desktop/menus/draw.desktop	(Revision 261918)
++++ sysui/desktop/menus/draw.desktop	(Arbeitskopie)
+@@ -7,4 +7,5 @@
+ Exec=openoffice -draw %U
+ MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw;
+ Name=%PRODUCTNAME Draw
++GenericName=Drawing Program
+ Comment=Create and edit drawings, flow charts, and logos by using Draw.
+Index: desktop/share/launcher_genericname.ulf
+===================================================================
+--- sysui/desktop/share/launcher_genericname.ulf	(Revision 261918)
++++ sysui/desktop/share/launcher_genericname.ulf	(Arbeitskopie)
+@@ -10,3 +10,8 @@
+ [base]
+ en-US = "Database Development"
+ 
++[math]
++en-US = "Formula Editor"
++
++[draw]
++en-US = "Drawing Program"

Modified: branches/ooo-build-3-0/patches/dev300/pdfimport-no-license.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/pdfimport-no-license.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/pdfimport-no-license.diff	Wed Sep 17 09:16:28 2008
@@ -15,6 +15,6 @@
 -        </simple-license>
 -    </registration>
 -
-     <version value="0.3" />
+     <version value="0.3.2" />
  
      <platform value="UPDATED_SUPPORTED_PLATFORM" />