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

[Fridrich Strba]

 patches/dev300/apply                         |    2 --
 patches/dev300/scp2_build_extensions.diff    |   17 -----------------
 patches/dev300/scp2_makefile_extensions.diff |   26 --------------------------
 3 files changed, 45 deletions(-)

New commits:
commit 8e85814f29319e93d4de93c517e5366692b6df24
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Sep 14 15:16:20 2010 +0200

    scp2_makefile_extensions.diff: move to git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 506c561..48d80a6 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2418,7 +2418,6 @@ vcl-pluggable-mtf-renderer.diff, thorsten
 emf+-cppcanvas-input-validation.diff, thorsten
 
 [ IntegrateExtensions ]
-scp2_makefile_extensions.diff
 scp2_extensions.diff
 # hack to install the problematic gdocs_2.1.0.oxt; can be removed with new gdocs version
 scp2_extensions-gdocs_2.1.0_modified_installation.diff, pmladek
diff --git a/patches/dev300/scp2_makefile_extensions.diff b/patches/dev300/scp2_makefile_extensions.diff
deleted file mode 100644
index 1a3812b..0000000
--- a/patches/dev300/scp2_makefile_extensions.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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,6 +81,11 @@
-              module_systemint.par          \
-              module_graphicfilter.par      \
-              file_graphicfilter.par        \
-+             module_extensions.par         \
-+             module_extensions_sun_templates.par         \
-+             module_extensions_lightproof.par   \
-+             directory_extensions.par                     \
-+             file_extensions.par           \
-              module_testtool.par           \
-              file_testtool.par             \
-              module_xsltfilter.par         \
-@@ -222,6 +224,11 @@
-              module_systemint.par          \
-              module_graphicfilter.par      \
-              file_graphicfilter.par        \
-+             module_extensions.par         \
-+             module_extensions_sun_templates.par         \
-+             module_extensions_lightproof.par  \
-+             directory_extensions.par                     \
-+             file_extensions.par           \
-              module_testtool.par           \
-              file_testtool.par             \
-              module_xsltfilter.par         \
commit 5ff28cc858ff616757de0401effa53c2c38b8b0f
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Sep 14 15:10:35 2010 +0200

    scp2_build_extensions.diff: move to git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ff10e64..506c561 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2418,7 +2418,6 @@ vcl-pluggable-mtf-renderer.diff, thorsten
 emf+-cppcanvas-input-validation.diff, thorsten
 
 [ IntegrateExtensions ]
-scp2_build_extensions.diff
 scp2_makefile_extensions.diff
 scp2_extensions.diff
 # hack to install the problematic gdocs_2.1.0.oxt; can be removed with new gdocs version
diff --git a/patches/dev300/scp2_build_extensions.diff b/patches/dev300/scp2_build_extensions.diff
deleted file mode 100644
index 1997e27..0000000
--- a/patches/dev300/scp2_build_extensions.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- scp2/prj/build.lst.orig	2008-03-19 07:36:56.000000000 +0100
-+++ scp2/prj/build.lst		2008-03-19 10:16:16.000000000 +0100
-@@ -6,6 +6,7 @@
- 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_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_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
-