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

[Petr Mladek]

 patches/dev300/apply           |    1 -
 patches/dev300/piece-stax.diff |   12 ------------
 2 files changed, 13 deletions(-)

New commits:
commit d759b6f60eef045b2b67e3aaa5d6b85e9ee90cfe
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Oct 19 14:40:58 2009 +0200

    Bin unneeded piece-stax.diff
    
    * patches/dev300/piece-stax.diff:
    * patches/dev300/apply: stax and external module is part of libs-external, so
      we need not put the prebuilt jsr173_1.0_api.jar into other location

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 6d5c5a2..077a692 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2923,7 +2923,6 @@ piece-cpputools.diff
 piece-connectivity.diff
 piece-bridges.diff
 piece-saxon.diff
-piece-stax.diff
 piece-stoc.diff
 piece-unoil.diff
 piece-javaunohelper.diff
diff --git a/patches/dev300/piece-stax.diff b/patches/dev300/piece-stax.diff
deleted file mode 100644
index e9a461b..0000000
--- a/patches/dev300/piece-stax.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- stax/makefile.mk.old	2009-09-23 10:11:52.000000000 +0200
-+++ stax/makefile.mk	2009-09-24 21:27:33.000000000 +0200
-@@ -55,7 +55,7 @@ EXTERNAL_DIR=$(PRJ)$/..$/external/StAX
- 
- .IF "$(BUILD_STAX)" != "YES"
- 
--$(OUT)$/class$/jsr173_1.0_api.jar : $(EXTERNAL_DIR)$/jsr173_1.0_api.jar
-+$(OUT)$/class$/jsr173_1.0_api.jar : $(PRJ)$/download$/jsr173_1.0_api.jar
- 	+$(COPY) $< $@
- 
- .ELSE 			#  "$(BUILD_STAX)" != "YES"
-