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

[Fridrich Strba]

 patches/dev300/apply                           |   18 +++++++++---------
 patches/dev300/scp2_dont_build_extensions.diff |   25 ++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 10 deletions(-)

New commits:
commit cbe24b758a2b95e134fae507164957c8c7e5ef50
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Tue Jan 19 15:54:26 2010 +0100

    When I say "Don't build", I mean "Don't build"!!!
    
    * patches/dev300/apply:
    * patches/dev300/scp2_dont_build_extensions.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8bbfaf1..e3607ab 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -981,15 +981,6 @@ solenv-really-use-unsinged-char-on-ppc.diff, i#81127, n#169875, pmladek
 # the possibility to add a Subscription menu
 novell-subscription.diff, jholesov
 
-[ NovellEvaluation ]
-# enable the Subscription menu
-novell-subscription-enable-in-menu.diff
-# back to the up-stream row limit
-evaluation-row-limit.diff
-# don't bundle extensions
-scp2_dont_build_extensions.diff
-
-
 [ NotDebian ]
 
 # Disable the printer properties which are unused#583
@@ -3474,3 +3465,12 @@ disable-python.diff
 # disable qadevooo => disable testshl2
 disable-testshl2.diff, i#108080
 
+[ NovellEvaluation ]
+# enable the Subscription menu
+novell-subscription-enable-in-menu.diff
+# back to the up-stream row limit
+evaluation-row-limit.diff
+# don't bundle extensions
+scp2_dont_build_extensions.diff
+
+
diff --git a/patches/dev300/scp2_dont_build_extensions.diff b/patches/dev300/scp2_dont_build_extensions.diff
index fcd95db..6f3ddea 100644
--- a/patches/dev300/scp2_dont_build_extensions.diff
+++ b/patches/dev300/scp2_dont_build_extensions.diff
@@ -14,4 +14,27 @@
  cp    scp2\source\onlineupdate    nmake    -    all    cp_update cp_langmacros cp_langtemplates NULL
 -cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
 +cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
-
+--- scp2/util/makefile.mk.orig	2008-03-19 07:37:00.000000000 +0100
++++ scp2/util/makefile.mk	2008-03-19 10:24:18.000000000 +0100
+@@ -81,10 +81,6 @@
+              module_systemint.par          \
+              module_graphicfilter.par      \
+              file_graphicfilter.par        \
+-             module_extensions.par         \
+-             module_extensions_sun_templates.par         \
+-             module_extensions_lightproof.par   \
+-             file_extensions.par           \
+              module_testtool.par           \
+              file_testtool.par             \
+              file_lingu.par                \
+@@ -224,10 +222,6 @@
+              module_systemint.par          \
+              module_graphicfilter.par      \
+              file_graphicfilter.par        \
+-             module_extensions.par         \
+-             module_extensions_sun_templates.par         \
+-             module_extensions_lightproof.par  \
+-             file_extensions.par           \
+              module_testtool.par           \
+              file_testtool.par             \
+              file_lingu.par                \