[ooo-build-commit] .: patches/dev300

[Cédric Bosdonnat]

 patches/dev300/apply                          |    1 -
 patches/dev300/solenv-subsequenttest-fix.diff |   24 ------------------------
 2 files changed, 25 deletions(-)

New commits:
commit cf7770e34ef6f2c4e2c9f6e994fc035b1f26630d
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Tue Sep 21 16:34:56 2010 +0200

    solenv-subsequenttest-fix.diff: was moved to the git repos

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 680cda7..fca9b88 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -711,7 +711,6 @@ pushfont-psstream.diff, i#84481, michael
 libxmlsec-system-nss.diff, i#69368, n#195272, pmladek
 
 [ BuildBits ]
-solenv-subsequenttest-fix.diff, i#112789, thorsten
 
 # do not create '.' subdirectories
 # omit './' in paths
diff --git a/patches/dev300/solenv-subsequenttest-fix.diff b/patches/dev300/solenv-subsequenttest-fix.diff
deleted file mode 100644
index b3849a5..0000000
--- a/patches/dev300/solenv-subsequenttest-fix.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix subsequenttest script looking for .hg
-
-From: Thorsten Behrens <thb at openoffice.org>
-
-
----
-
- solenv/inc/installationtest.mk |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-
-diff --git solenv/inc/installationtest.mk solenv/inc/installationtest.mk
-index 6806e15..322ba4d 100644
---- solenv/inc/installationtest.mk
-+++ solenv/inc/installationtest.mk
-@@ -56,7 +56,7 @@ my_sofficepath = \
-     $(installationtest_instpath)'/opt/OpenOffice.org 3/program/soffice.exe'
- .ELSE
- my_sofficepath = \
--    $(installationtest_instpath)/opt/openoffice.org3/program/soffice
-+    $(installationtest_instpath)/opt/program/soffice
- .END
- 
- .IF "$(OOO_TEST_SOFFICE)" == ""