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

[rengelhard svn gnome org]

Author: rengelhard
Date: Sun Sep 21 21:45:11 2008
New Revision: 13979
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13979&view=rev

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

        * patches/dev300/build-java-target-swext.diff: move ...
        * patches/dev300/build-java-target-extensions.diff: ...here
        * patches/dev300/buid-java-target.diff: remove jfreereport here ...
        * patches/dev300/build-java-target-extensions.diff: .. and add it here


Added:
   branches/ooo-build-3-0/patches/dev300/build-java-target-extensions.diff   (contents, props changed)
      - copied, changed from r13975, /branches/ooo-build-3-0/patches/dev300/build-java-target-swext.diff
Removed:
   branches/ooo-build-3-0/patches/dev300/build-java-target-swext.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply
   branches/ooo-build-3-0/patches/dev300/build-java-target.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	Sun Sep 21 21:45:11 2008
@@ -393,7 +393,7 @@
 
 [ ExtensionFixes ]
 wiki-publisher-no-license.diff
-build-java-target-swext.diff, i#93115, pmladek
+build-java-target-extensions.diff, i#93115, pmladek
 
 [ NovellOnlyExtensionFixes ]
 # allow build with ant-1.6

Copied: branches/ooo-build-3-0/patches/dev300/build-java-target-extensions.diff (from r13975, /branches/ooo-build-3-0/patches/dev300/build-java-target-swext.diff)
==============================================================================
--- /branches/ooo-build-3-0/patches/dev300/build-java-target-swext.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/build-java-target-extensions.diff	Sun Sep 21 21:45:11 2008
@@ -35,3 +35,14 @@
  
  # --- Targets ------------------------------------------------------
  
+--- jfreereport/java/sac/makefile.mk.old        2008-07-17 15:36:54.000000000 +0200
++++ jfreereport/java/sac/makefile.mk    2008-08-25 16:25:41.000000000 +0200
+@@ -61,7 +61,7 @@ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+ BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all
+ .ELSE
+-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) all
++BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) all
+ .ENDIF
+
+ .ENDIF # $(SOLAR_JAVA)!= ""

Modified: branches/ooo-build-3-0/patches/dev300/build-java-target.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/build-java-target.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/build-java-target.diff	Sun Sep 21 21:45:11 2008
@@ -194,14 +194,3 @@
  .ENDIF
  
  # --- Targets ------------------------------------------------------
---- jfreereport/java/sac/makefile.mk.old	2008-07-17 15:36:54.000000000 +0200
-+++ jfreereport/java/sac/makefile.mk	2008-08-25 16:25:41.000000000 +0200
-@@ -61,7 +61,7 @@ JAVA_HOME=
- .EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all
- .ELSE
--BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) all
-+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) all
- .ENDIF
- 
- .ENDIF # $(SOLAR_JAVA)!= ""