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

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue Mar  3 08:28:54 2009
New Revision: 15438
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15438&view=rev

Log:
2009-03-03  Rene Engelhard  <rene debian org>

        * patches/dev300/config_office-openjdk-paths.diff: fix mips:
          s/client/server/ (again?)
        * patches/dev300/configures-explicit-arch.diff: typo


Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/patches/dev300/config_office-openjdk-paths.diff
   branches/ooo-build-3-0-1/patches/dev300/configures-explicit-arch.diff

Modified: branches/ooo-build-3-0-1/patches/dev300/config_office-openjdk-paths.diff
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/config_office-openjdk-paths.diff	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/config_office-openjdk-paths.diff	Tue Mar  3 08:28:54 2009
@@ -87,7 +87,7 @@
 +      # OpenJDK
 +      if ($JDK =~ m/sun/) {
 +        $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH;
-+        $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."client";
++        $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."server";
 +        $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."native_threads";
 +        $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."xawt";
 +      } else {

Modified: branches/ooo-build-3-0-1/patches/dev300/configures-explicit-arch.diff
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/configures-explicit-arch.diff	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/configures-explicit-arch.diff	Tue Mar  3 08:28:54 2009
@@ -142,7 +142,7 @@
  
  #relative to CONFIGURE_DIR
 -CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
-+CONFIGURE_ACTION=configure -host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
++CONFIGURE_ACTION=configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
  CONFIGURE_FLAGS=
  
  BUILD_ACTION=make