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

Fridrich Strba fridrich at kemper.freedesktop.org
Wed Jan 20 03:25:26 PST 2010


 patches/dev300/apply                           |   18 +++++------
 patches/dev300/scp2_dont_build_extensions.diff |   40 -------------------------
 2 files changed, 8 insertions(+), 50 deletions(-)

New commits:
commit 5b9b1ed41e58e7047ec430eb5de52ccc53ecab6c
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Wed Jan 20 12:23:07 2010 +0100

    Move also the bundling of writing aids out of eval build
    
    * patches/dev300/apply:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index b25376a..0ce23c1 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -123,9 +123,9 @@ translate-org-za-win32: translate-org-za-common, Win32Common, Common
 NovellLikeWin32: Win32Common, NovellOnly, NovellLikeOnlyWin32, MultilanguageWin32Only, Fpickers, \
 	CustomUserConfig, LiberationFontsOnWindows
 # Novell
-NovellWin32: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, IntegrateExtensions
+NovellWin32: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, IntegrateExtensions, NovellWin32WritingAids
 NovellWin32Eval: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellEvaluation
-NovellWin32ISO: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, IntegrateExtensions
+NovellWin32ISO: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, IntegrateExtensions, NovellWin32WritingAids
 # go-oo.org Win32
 GoOoWin32: NovellLikeWin32, GoOoOnlyWin32, MultilanguageWin32Only, GoOoSplash
 # Mac OS X
@@ -1203,12 +1203,14 @@ novell-win32-installer-branding.diff
 novell-win32-vrb-branding.diff, n#191913, i#68817
 novell-win32-registry-branding.diff, n#191913
 
-win32-prebuilt-writingaids-zip.diff
-win32-prebuilt-writingaids-zip-scp2.diff
-
 # drop stuff that is needed only on Win9x
 novell-win32-drop-win9x.diff
 
+[ NovellWin32WritingAids ]
+
+win32-prebuilt-writingaids-zip.diff
+win32-prebuilt-writingaids-zip-scp2.diff
+
 [ FrugalwareOnly ]
 
 
commit 937c46ae0d2121e8531534a3fd599bd5f2ce5757
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Wed Jan 20 12:12:06 2010 +0100

    Reshuffle sections to cater for Eval and Full differences
    
    * patches/dev300/apply:
    * patches/dev300/scp2_dont_build_extensions.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 933a87e..b25376a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -121,11 +121,11 @@ Win32 : Win32Common
 translate-org-za-linux: translate-org-za-common, LinuxCommon, Common
 translate-org-za-win32: translate-org-za-common, Win32Common, Common
 NovellLikeWin32: Win32Common, NovellOnly, NovellLikeOnlyWin32, MultilanguageWin32Only, Fpickers, \
-	CustomUserConfig, LiberationFontsOnWindows, IntegrateExtensions
+	CustomUserConfig, LiberationFontsOnWindows
 # Novell
-NovellWin32: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only
+NovellWin32: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, IntegrateExtensions
 NovellWin32Eval: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellEvaluation
-NovellWin32ISO: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only
+NovellWin32ISO: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, IntegrateExtensions
 # go-oo.org Win32
 GoOoWin32: NovellLikeWin32, GoOoOnlyWin32, MultilanguageWin32Only, GoOoSplash
 # Mac OS X
@@ -3473,7 +3473,3 @@ disable-testshl2.diff, i#108080
 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
deleted file mode 100644
index 6f3ddea..0000000
--- a/patches/dev300/scp2_dont_build_extensions.diff
+++ /dev/null
@@ -1,40 +0,0 @@
---- scp2/prj/build.lst		2008-03-19 07:36:56.000000000 +0100
-+++ scp2/prj/build.lst		2008-03-19 10:16:16.000000000 +0100
-@@ -6,7 +6,6 @@
- cp    scp2\source\canvas          nmake    -    all    cp_canvas cp_langmacros cp_langtemplates NULL
- cp    scp2\source\crashrep        nmake    -    all    cp_crashrep cp_langmacros cp_langtemplates NULL
- cp    scp2\source\draw            nmake    -    all    cp_draw cp_langmacros cp_langtemplates NULL
--cp    scp2\source\extensions      nmake    -    all    cp_extensions cp_langmacros cp_langtemplates NULL
- cp    scp2\source\gnome           nmake    -    all    cp_gnome cp_langmacros cp_langtemplates NULL
- cp    scp2\source\graphicfilter   nmake    -    all    cp_graphicfilter cp_langmacros cp_langtemplates NULL
- cp    scp2\source\impress         nmake    -    all    cp_impress cp_langmacros cp_langtemplates NULL
-@@ -26,4 +27,4 @@
- cp    scp2\source\xsltfilter      nmake    -    all    cp_xsltfilter cp_langmacros cp_langtemplates NULL
- cp    scp2\source\winexplorerext  nmake    -    all    cp_winexplorerext cp_langmacros cp_langtemplates NULL
- 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                \


More information about the ooo-build-commit mailing list