[ooo-build-commit] Branch 'ooo-build-3-1-1' - patches/dev300

[René Engelhard]

 patches/dev300/apply                                 |    7 +++----
 patches/dev300/odk-build-force-openjdks-javadoc.diff |   15 ---------------
 patches/dev300/odk-remove-nonexisting-package.diff   |   12 ++++++++++++
 3 files changed, 15 insertions(+), 19 deletions(-)

New commits:
commit 03b546e751b3bb0ec4526b2ae20d6447164d97fd
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Oct 11 23:42:05 2009 +0200

    add proper gcj buildfix and remove hack
    
    * patches/dev300/apply:
    * patches/dev300/odk-build-force-openjdks-javadoc.diff:
    * patches/dev300/odk-remove-nonexisting-package.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8b48f5b..fcc144b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -979,10 +979,6 @@ ubuntu-javaldx.diff, ccheney
 # to download it from elsewhere
 reportdesign-mention-package.diff, rengelha
 
-# gjdoc seems to not accept -classpath -> build fails.
-# force even gcj builds to use OpenJDKs javadoc
-odk-build-force-openjdks-javadoc.diff
-
 # add JDK paths for MySQL, PostgreSQL, JTDS
 jdbc-driver-classpaths-debian.diff
 
@@ -1256,6 +1252,9 @@ psprint_config-no-orig.diff, jholesov
 # GCC warnings: suggest a space before '; ' or explicit braces around empty body in 'for' statement
 stlport-gcc-warnings.diff, i#100223, gokcen
 
+[ SdkFixes ]
+odk-remove-nonexisting-package.diff, i#105803
+
 [ DebianOnly ]
 seamonkey-is-iceape.diff
 
diff --git a/patches/dev300/odk-build-force-openjdks-javadoc.diff b/patches/dev300/odk-build-force-openjdks-javadoc.diff
deleted file mode 100644
index b508de6..0000000
--- a/patches/dev300/odk-build-force-openjdks-javadoc.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- odk/pack/gendocu/makefile.mk-old	2009-05-04 01:40:41.000000000 -0600
-+++ odk/pack/gendocu/makefile.mk	2009-05-04 01:40:03.000000000 -0600
-@@ -38,6 +38,12 @@
- .INCLUDE: $(PRJ)$/util$/makefile.pmk
- #----------------------------------------------------------------
- 
-+# crude hack; always use OpenJDKs javadoc even when using gcj,
-+# as gjdoc allaprently doesn't want -classpath...
-+.IF "$(JDK)" == "gcj"
-+JAVADOC := /usr/lib/jvm/java-6-openjdk/bin/javadoc
-+.ENDIF
-+
- CPPDOCREFNAME="UDK $(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO) C/C++ API Reference"
- JAVADOCREFNAME="UDK $(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO) Java API Reference"
- 
diff --git a/patches/dev300/odk-remove-nonexisting-package.diff b/patches/dev300/odk-remove-nonexisting-package.diff
new file mode 100644
index 0000000..d60009d
--- /dev/null
+++ b/patches/dev300/odk-remove-nonexisting-package.diff
@@ -0,0 +1,12 @@
+Index: pack/gendocu/makefile.mk
+===================================================================
+--- odk/pack/gendocu/makefile.mk	(revision 276718)
++++ odk/pack/gendocu/makefile.mk	(working copy)
+@@ -52,7 +52,6 @@
+         com.sun.star.comp.helper \
+         com.sun.star.lib.uno.helper \
+         com.sun.star.lib.unoloader \
+-        com.sun.star.tools.uno \
+         com.sun.star.uno \
+         $(JAVA_SRC_DIR)$/com$/sun$/star$/lib$/util$/UrlToFileMapper.java
+ #        com.sun.star.beans \