[Libreoffice-commits] .: patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                    |    1 -
 patches/dev300/jurt-jnilib-deliver.diff |   19 -------------------
 2 files changed, 20 deletions(-)

New commits:
commit 736284b1a26411b9db7fb388a0f161eb9148e087
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Oct 12 20:05:20 2010 -0400

    Removed jurt-jnilib-deliver.diff; merged upstream.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 320cda5..31f26e8 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2070,7 +2070,6 @@ svtools-update-ole.diff, n#411855, thorsten
 # why? If this really is not needed, let's remove totally then. --tml
 #sw-import-TOC.diff ,n#404254, Amelia Wang
 
-jurt-jnilib-deliver.diff, i#93516, thorsten
 # call unopkg such that java does not require interactive session
 solenv-installer-unopkg-call.diff, thorsten
 
diff --git a/patches/dev300/jurt-jnilib-deliver.diff b/patches/dev300/jurt-jnilib-deliver.diff
deleted file mode 100644
index da9284f..0000000
--- a/patches/dev300/jurt-jnilib-deliver.diff
+++ /dev/null
@@ -1,19 +0,0 @@
----
- jurt/prj/d.lst |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git jurt/prj/d.lst jurt/prj/d.lst
-index 848435f..a55c9fa 100644
---- jurt/prj/d.lst
-+++ jurt/prj/d.lst
-@@ -2,6 +2,6 @@
- ..\%__SRC%\bin\jpipe.dll %_DEST%\bin%_EXT%\jpipe.dll
- ..\%__SRC%\bin\jpipx.dll %_DEST%\bin%_EXT%\jpipx.dll
- ..\%__SRC%\lib\libjpipe*.so %_DEST%\lib%_EXT%\libjpipe*.so
--..\%__SRC%\lib\libjpipe*.dylib %_DEST%\lib%_EXT%\libjpipe*.dylib
-+..\%__SRC%\lib\libjpipe.jnilib %_DEST%\lib%_EXT%\libjpipe.jnilib
- 
- ..\%__SRC%\bin\jurt_src.zip %COMMON_DEST%\bin%_EXT%\jurt_src.zip
--- 
-1.7.0.1
-