remove obsolete piece patches

53 files changed, 0 insertions, 2758 deletions

diff --git a/patches/dev300/piece-ant.diff b/patches/dev300/piece-ant.diff
deleted file mode 100644
index 7f036f77c..000000000
--- a/patches/dev300/piece-ant.diff
+++ /dev/null
@@ -1,42 +0,0 @@
---- solenv/inc/antsettings.mk.old	2010-03-05 19:59:19.000000000 +0100
-+++ solenv/inc/antsettings.mk	2010-03-05 20:26:18.000000000 +0100
-@@ -86,6 +86,7 @@ ANT_FLAGS!:=$(ANT_COMPILER_FLAGS) -Dprj=
-  -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) \
-  -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
-  -Dcommon.doc=$(SOLARCOMMONDOCDIR) -Dsolar.sourceversion=$(SOURCEVERSION) \
-+ -Dsplit.install=$(SPLITINSTALLDIR) -Dsplit.dev=$(SPLITDEVDIR) -Dsplit.ure=$(SPLITUREDIR) \
-  -Dsolar.lastminor=$(LAST_MINOR) -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs
- .ELSE # No java
- ANT=
---- scripting/examples/java/build.xml.old	2010-02-02 12:49:41.000000000 +0100
-+++ scripting/examples/java/build.xml	2010-03-05 20:26:18.000000000 +0100
-@@ -42,6 +42,10 @@
-     <pathelement location="${solar.jar}/juh.jar"/>
-     <pathelement location="${solar.jar}/ridl.jar"/>
-     <pathelement location="${out}/class/ScriptFramework.jar"/>
-+    <pathelement location="${split.install}/classes/unoil.jar"/>
-+    <pathelement location="${split.ure}/share/java/jurt.jar"/>
-+    <pathelement location="${split.ure}/share/java/juh.jar"/>
-+    <pathelement location="${split.ure}/share/java/ridl.jar"/>
-   </path> 
- 
-   <!-- ===================== HelloWorld example =========================== -->
---- scripting/java/build.xml.old	2010-02-02 12:49:41.000000000 +0100
-+++ scripting/java/build.xml	2010-03-05 20:26:18.000000000 +0100
-@@ -59,6 +59,16 @@
-     <pathelement location="${env.BSH_JAR}"/>
-     <pathelement location="${solar.jar}/js.jar"/>
-     <pathelement location="${jardir}"/>
-+    <pathelement location="${split.ure}/share/java/jurt.jar"/>
-+    <pathelement location="${split.install}/classes/unoil.jar"/>
-+    <pathelement location="${split.install}/classes/jut.jar"/>
-+    <pathelement location="${split.ure}/share/java/juh.jar"/>
-+    <pathelement location="${split.ure}/share/java/java_uno.jar"/>
-+    <pathelement location="${split.ure}/share/java/ridl.jar"/>
-+    <pathelement location="${split.install}/classes/js.jar"/>
-+    <pathelement location="${split.install}/classes/bsh.jar"/>
-+    <pathelement location="${split.install}/classes"/>
-+    <pathelement location="${split.ure}/share/java"/>
-   </path> 
- 
-   <path id="idesupport.class.path">
diff --git a/patches/dev300/piece-apache-commons.diff b/patches/dev300/piece-apache-commons.diff
deleted file mode 100644
index d8cef1cd6..000000000
--- a/patches/dev300/piece-apache-commons.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- apache-commons/java/logging/makefile.mk.old	2008-07-17 15:40:13.000000000 +0200
-+++ apache-commons/java/logging/makefile.mk	2008-09-25 23:15:12.000000000 +0200
-@@ -57,7 +57,7 @@ CONVERTFILES=build.xml
- .EXPORT : ANT_OPTS
- 
- .IF "$(SYSTEM_TOMCAT)" != "YES"
--SERVLETAPI_JAR := $(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/servlet-api.jar
-+SERVLETAPI_JAR := $(SOLARPIECE)$/$(INPATH)$/bin$/servlet-api.jar
- .ENDIF
- 
- .IF "$(JAVACISGCJ)"=="yes"
diff --git a/patches/dev300/piece-automation.diff b/patches/dev300/piece-automation.diff
deleted file mode 100644
index 507349172..000000000
--- a/patches/dev300/piece-automation.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: automation/packimages/makefile.mk
-===================================================================
-RCS file: /cvs/util/automation/packimages/makefile.mk,v
-retrieving revision 1.12
-diff -u -r1.12 makefile.mk
---- automation/packimages/makefile.mk	11 Apr 2008 09:53:44 -0000	1.12
-+++ automation/packimages/makefile.mk	13 Aug 2008 12:23:42 -0000
-@@ -53,7 +53,7 @@
- #common_outdir = common
- #solarresdir = j:\so-cwsserv04\gh7\SRC680\wntmsci10\res.m50
- 
--
-+IMGSRC=$(SOLARVER)
- $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/images_tt.zip .PHONY:
-     @echo ------------------------------
-     @echo Making: $@
-@@ -63,5 +63,5 @@
-     $(COPY) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SOLARRESDIR))$/img$/vcl*.ilst $(MISC) 
-     $(COPY) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SOLARRESDIR))$/img$/sb*.ilst $(MISC) 
-     -$(MKDIR) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))
--    $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(MISC) -o $@
-+    $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(IMGSRC)$/$(RSCDEFIMG) -m $(IMGSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(MISC) -o $@
- 
diff --git a/patches/dev300/piece-basic.diff b/patches/dev300/piece-basic.diff
deleted file mode 100644
index 8adcf6681..000000000
--- a/patches/dev300/piece-basic.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- basic/source/classes/makefile.mk.old	2010-03-05 19:59:21.000000000 +0100
-+++ basic/source/classes/makefile.mk	2010-03-05 20:08:02.000000000 +0100
-@@ -45,8 +45,9 @@ ALLTAR .SEQUENTIAL : \
-         $(MISC)$/$(TARGET).don \
-         $(MISC)$/$(TARGET).slo
- 
--$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
--        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-+OOVBADIR=$(SOLARPIECE)$/$(INPATH)$/bin
-+$(MISC)$/$(TARGET).don : $(OOVBADIR)$/oovbaapi.rdb
-+        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(OOVBADIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-         echo $@
- 
- $(MISC)$/$(TARGET).slo : $(SLOTARGET)
diff --git a/patches/dev300/piece-binary-path.diff b/patches/dev300/piece-binary-path.diff
deleted file mode 100644
index d660d090c..000000000
--- a/patches/dev300/piece-binary-path.diff
+++ /dev/null
@@ -1,205 +0,0 @@
---- solenv/inc/settings.mk
-+++ solenv/inc/settings.mk
-@@ -716,7 +693,7 @@ CLASSDIR=$(OUT)/class
- CLASSPATH!:=.$(PATH_SEPERATOR)$(CLASSDIR)$(PATH_SEPERATOR)$(CLASSPATH)
- STARJAR=java -classpath $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARENV)/bin/jtools.jar com.sun.star.tool.starjar.StarJar
- 
--STARDEP=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/javadep
-+STARDEP=$(AUGMENT_LIBRARY_PATH) javadep
- .IF "$(PRJNAME)"=="sj2"
- CLASSPATH!:=$(CLASSPATH:s/sj2/no/)
- .ENDIF
-@@ -958,7 +960,7 @@ MKDEPFLAGS+=$(MKDEPLOCAL)
- BISON*=bison
- YACCFLAGS*=-d 
- 
--SVIDL=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/svidl
-+SVIDL=$(AUGMENT_LIBRARY_PATH) svidl
- 
- LDUMP2*=$(SOLARBINDIR)/ldump4
- 
-@@ -974,9 +976,9 @@ SCPLINKFLAGS+=-v $(SCPLINKVERSION)
- .ENDIF			# "$(SCPLINKVERSION)"!=""
- 
- .IF "$(make_srs_deps)"!=""
--RSC=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/rscdep
-+RSC=$(AUGMENT_LIBRARY_PATH) rscdep
- .ELSE # "$(make_srs_deps)"!=""
--RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)/rsc
-+RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) rsc
- .ENDIF # "$(make_srs_deps)"!=""
- 
- .IF "$(VERBOSE)" == "TRUE"
-@@ -1050,28 +1050,28 @@ EXTMAXPROCESS*=$(MAXPROCESS)
- 
- GDBTRACE=gdb -nx --command=$(SOLARENV)/bin/gdbtrycatchtrace --args
- 
--IDLC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/idlc
--REGMERGE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/regmerge
--REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/regcompare
-+IDLC*=$(AUGMENT_LIBRARY_PATH) idlc
-+REGMERGE*=$(AUGMENT_LIBRARY_PATH) regmerge
-+REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) regcompare
- 
- .IF "$(DEBUGREGCOMP)" != "" || "$(debugregcomp)" != ""
- GDBREGCOMPTRACE=$(GDBTRACE)
- .ENDIF
- 
--REGCOMP*=$(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBREGCOMPTRACE) $(SOLARBINDIR)/regcomp
--CPPUMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cppumaker
--JAVAMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/javamaker
--RDBMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/rdbmaker
--CLIMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/climaker
-+REGCOMP*=$(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBREGCOMPTRACE) regcomp
-+CPPUMAKER*=$(AUGMENT_LIBRARY_PATH) cppumaker
-+JAVAMAKER*=$(AUGMENT_LIBRARY_PATH) javamaker
-+RDBMAKER*=$(AUGMENT_LIBRARY_PATH) rdbmaker
-+CLIMAKER*=$(AUGMENT_LIBRARY_PATH) climaker
- 
- .IF "$(DEBUGCPPUNIT)" != "" || "$(debugcppunit)" != ""
- GDBCPPUNITTRACE=$(GDBTRACE)
- .ENDIF
- 
--CPPUNITTESTER=$(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBCPPUNITTRACE) $(SOLARBINDIR)/cppunittester
--HELPEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/helpex
--LNGCONVEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/lngconvex
--HELPLINKER=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/HelpLinker
-+CPPUNITTESTER=$(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBCPPUNITTRACE) cppunittester
-+HELPEX=$(AUGMENT_LIBRARY_PATH) helpex
-+LNGCONVEX=$(AUGMENT_LIBRARY_PATH) lngconvex
-+HELPLINKER=$(AUGMENT_LIBRARY_PATH) HelpLinker
- 
- .IF "$(JAVAINTERPRETER)" == ""
- JAVA*:=java
-@@ -1080,7 +1082,7 @@ JAVA*:=$(JAVAINTERPRETER)
- SCPCOMP=$(PERL) $(SOLARENV)/bin/pre2par.pl
- SCPLINK=$(PERL) $(SOLARENV)/bin/par2script.pl
- LZIP*=lzip
--CPPLCC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpplcc
-+CPPLCC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpplcc
- 
- .IF "$(DISABLE_ENHANCED_COMID)"==""
- .INCLUDE : tg_compv.mk
-@@ -1335,47 +1335,47 @@ TRUSTED_MANIFEST_LOCATION*=$(SOLARENV)/i
- 
- .IF "$(COMP1TYPELIST)"!=""
- .INCLUDE .IGNORE : $(MISC)/$(COMP1TYPELIST).mk
--$(COMP1TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP1TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-+$(COMP1TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)/$(COMP1TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
- .ENDIF
- 
- .IF "$(COMP2TYPELIST)"!=""
- .INCLUDE .IGNORE : $(MISC)/$(COMP2TYPELIST).mk
--$(COMP2TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP2TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-+$(COMP2TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)/$(COMP2TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
- .ENDIF
- 
- .IF "$(COMP3TYPELIST)"!=""
- .INCLUDE .IGNORE : $(MISC)/$(COMP3TYPELIST).mk
--$(COMP3TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP3TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-+$(COMP3TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)/$(COMP3TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
- .ENDIF
- 
- .IF "$(COMP4TYPELIST)"!=""
- .INCLUDE .IGNORE : $(MISC)/$(COMP4TYPELIST).mk
--$(COMP4TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP4TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-+$(COMP4TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)/$(COMP4TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
- .ENDIF
- 
- .IF "$(COMP5TYPELIST)"!=""
- .INCLUDE .IGNORE : $(MISC)/$(COMP5TYPELIST).mk
--$(COMP5TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP5TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-+$(COMP5TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)/$(COMP5TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
- .ENDIF
- 
- .IF "$(COMP6TYPELIST)"!=""
- .INCLUDE .IGNORE : $(MISC)/$(COMP6TYPELIST).mk
--$(COMP6TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP6TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-+$(COMP6TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)/$(COMP6TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
- .ENDIF
- 
- .IF "$(COMP7TYPELIST)"!=""
- .INCLUDE .IGNORE : $(MISC)/$(COMP7TYPELIST).mk
--$(COMP7TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP7TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-+$(COMP7TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)/$(COMP7TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
- .ENDIF
- 
- .IF "$(COMP8TYPELIST)"!=""
- .INCLUDE .IGNORE : $(MISC)/$(COMP8TYPELIST).mk
--$(COMP8TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP8TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-+$(COMP8TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)/$(COMP8TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
- .ENDIF
- 
- .IF "$(COMP9TYPELIST)"!=""
- .INCLUDE .IGNORE : $(MISC)/$(COMP9TYPELIST).mk
--$(COMP9TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP9TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-+$(COMP9TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)/$(COMP9TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
- .ENDIF
- 
- # some place to define these jars for SO environment
---- solenv/inc/pstrules.mk.old	2009-10-19 17:42:41.000000000 +0200
-+++ solenv/inc/pstrules.mk	2009-10-19 19:40:01.000000000 +0200
-@@ -151,7 +151,7 @@ $(PAR)/%.par :
-     $(CPPLCC) -+ -P -I..\..\inc -I..\..\os2gcci.pro\inc $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
- .ENDIF
- .IF "$(GUI)"=="UNX"
--    $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre
-+    $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre
- .ENDIF
- .IF "$(common_build_srs)"!=""
-     $(COMMAND_ECHO)$(SCPCOMP) -l {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(TARGET)/$(@:b).$(LANGFILEEXT)} -s $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre -o $@
---- solenv/inc/unitools.mk.old	2009-10-19 17:42:41.000000000 +0200
-+++ solenv/inc/unitools.mk	2009-10-19 19:35:46.000000000 +0200
-@@ -30,24 +30,24 @@
- #*************************************************************************
- 
- # Common tools - move this to the end / consolidate
--TRANSEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/transex3
--ULFEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/ulfex
--XMLEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xmlex
--XRMEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xrmex
--CFGEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cfgex
--AUTODOC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/autodoc
--LOCALIZE_SL*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/localize_sl
--GSICHECK*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/gsicheck
-+TRANSEX*=$(AUGMENT_LIBRARY_PATH) transex3
-+ULFEX*=$(AUGMENT_LIBRARY_PATH) ulfex
-+XMLEX*=$(AUGMENT_LIBRARY_PATH) xmlex
-+XRMEX*=$(AUGMENT_LIBRARY_PATH) xrmex
-+CFGEX*=$(AUGMENT_LIBRARY_PATH) cfgex
-+AUTODOC*=$(AUGMENT_LIBRARY_PATH) autodoc
-+LOCALIZE_SL*=$(AUGMENT_LIBRARY_PATH) localize_sl
-+GSICHECK*=$(AUGMENT_LIBRARY_PATH) gsicheck
- 
- .IF "$(SYSTEM_LIBXSLT)"!="YES"
--XSLTPROC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xsltproc
-+XSLTPROC*=$(AUGMENT_LIBRARY_PATH) xsltproc
- .ELSE			# "$(SYSTEM_LIBXSLT)"!="YES"
- XSLTPROC*=$(AUGMENT_LIBRARY_PATH) xsltproc
- .ENDIF			# "$(SYSTEM_LIBXSLT)"!="YES"
- 
--ULFCONV*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/ulfconv
-+ULFCONV*=$(AUGMENT_LIBRARY_PATH) ulfconv
- 
--MAKEDEPEND*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/makedepend
-+MAKEDEPEND*=$(AUGMENT_LIBRARY_PATH) makedepend
- 
- SCP_CHECK_TOOL:=checkscp$E
- 
-@@ -191,7 +191,7 @@ GNUTAR*:=tar
- GNUTAR*:=tar
- 
- RM+=$(RMFLAGS)
--ADJUSTVISIBILITY*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/adjustvisibility
-+ADJUSTVISIBILITY*=$(AUGMENT_LIBRARY_PATH) adjustvisibility
- CONVERT*:=$(PERL) $(SOLARENV)/bin/leconvert.pl
- EXECTEST := $(PERL) -w $(SOLARENV)/bin/exectest.pl
- GCCINSTLIB:=$(PERL) -w $(SOLARENV)/bin/gccinstlib.pl
---- solenv/inc/layout.mk.old	2009-10-19 17:42:41.000000000 +0200
-+++ solenv/inc/layout.mk	2009-10-19 19:39:23.000000000 +0200
-@@ -1,4 +1,4 @@
--TRALAY=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/tralay
-+TRALAY=$(AUGMENT_LIBRARY_PATH) tralay
- XML_DEST=$(DLLDEST)
- XML_LANGS=$(alllangiso)
- 
diff --git a/patches/dev300/piece-bridges.diff b/patches/dev300/piece-bridges.diff
deleted file mode 100644
index 073be21b9..000000000
--- a/patches/dev300/piece-bridges.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- bridges/unotypes/makefile.mk
-+++ bridges/unotypes/makefile.mk
-@@ -40,8 +40,8 @@
- #-------------------------------------------------------------------
- 
- CPPUMAKERFLAGS += -C
--UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
--UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb 
-+UNOUCRDEP=$(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb
-+UNOUCRRDB=$(UNOUCRDEP)
- UNOUCROUT=$(OUT)$/inc
- 
- UNOTYPES = \
diff --git a/patches/dev300/piece-build.diff b/patches/dev300/piece-build.diff
deleted file mode 100644
index 2e01152bd..000000000
--- a/patches/dev300/piece-build.diff
+++ /dev/null
@@ -1,92 +0,0 @@
---- solenv/bin/build.pl.old	2010-05-19 19:57:28.000000000 +0200
-+++ solenv/bin/build.pl	2010-06-22 16:03:40.000000000 +0200
-@@ -129,6 +129,7 @@
-     $all_dependent = 1;  # a flag indicating if the hash has independent keys
-     $build_from_with_branches = '';
-     $build_all_cont = '';
-+    $build_all_dirs = '';
-     $build_since = '';
-     $dlv_switch = '';
-     $child = 0;
-@@ -628,7 +629,14 @@ sub reverse_dependensies {
- sub build_all {
-     if ($build_all_parents) {
-         my ($Prj, $PrjDir, $orig_prj);
-+    if ($build_all_dirs) {
-+        print "Using crazy new --subdirs build for '$build_all_dirs'\n";
-+        for my $d (split ':', $build_all_dirs) {
-+        get_parent_deps( $d, \%global_deps_hash);
-+        }
-+    } else {
-         get_parent_deps( $initial_module, \%global_deps_hash);
-+    }
-         if (scalar keys %active_modules) {
-             $active_modules{$initial_module}++;
-             $modules_types{$initial_module} = 'mod';
-@@ -1151,6 +1151,18 @@ sub get_stand_dir {
-         $ENV{mk_tmp} = '';
-         die "No environment set\n";
-     };
-+    if ($build_all_dirs) {
-+	# build all modules => it is enough to return curent directory; no other things need to be computed
-+	# the below code is similar to the one in RepositoryHelper:new
-+	if ( defined $ENV{PWD} ) {
-+    	    $StandDir = $ENV{PWD};
-+	} elsif (defined $ENV{_cwd}) {
-+    	    $StandDir = $ENV{_cwd};
-+        } else {
-+    	    $StandDir = cwd();
-+	}
-+	return $StandDir;
-+    };
-     my $repository_helper = RepositoryHelper->new();
-     my $StandDir = $repository_helper->get_repository_root();
-     my $initial_dir = $repository_helper->get_initial_directory();
-@@ -1472,6 +1483,8 @@ sub get_options {
-                                 and $build_all_cont = $1            and next;
-         $arg =~ /^-a:(\S+)$/ and $build_all_parents = 1
-                                 and $build_all_cont = $1            and next;
-+        $arg =~ /^--subdirs:(.+)$/ and $build_all_parents = 1
-+                                and $build_all_dirs = $1            and next;
-         if ($arg =~ /^--from$/ || $arg =~ /^-f$/) {
-                                     $build_all_parents = 1;
-                                     get_modules_passed(\%incompatibles);
-@@ -2226,24 +2239,31 @@ sub get_tmp_dir {
- sub retrieve_build_list {
-     my $module = shift;
-     my $old_fh = select(STDOUT);
--    
-+
-     # Try to get global depencies from solver's build.lst if such exists
-+    my @search_dirs;
-     my $solver_inc_dir = "$ENV{SOLARVER}/common";
-     $solver_inc_dir .= $ENV{PROEXT} if (defined $ENV{PROEXT});
-     $solver_inc_dir .= '/inc';
-     $solver_inc_dir .= $ENV{UPDMINOREXT} if (defined $ENV{UPDMINOREXT});
-     $solver_inc_dir .= "/$module";
--    $solver_inc_dir = CorrectPath($solver_inc_dir);
-     $dead_parents{$module}++;
--    print "Fetching dependencies for module $module from solver...";
-+    push @search_dirs, CorrectPath($solver_inc_dir);
-+    if (defined $ENV{SOLARPIECEVERSION}) {
-+    push (@search_dirs, CorrectPath($ENV{SOLARPIECEVERSION}."/inc/$module"));
-+    }
-+
-+    print "Fetching dependencies for module $module from solvers @search_dirs...\n";
-+    foreach my $dir (@search_dirs) {
-     foreach (@possible_build_lists) {
--        my $possible_build_lst = "$solver_inc_dir/$_";
-+        my $possible_build_lst = "$dir/$_";
-         if (-e $possible_build_lst) {
--            print " ok\n";
--            select($old_fh);
--            return $possible_build_lst;
-+        print " ok\n";
-+        select($old_fh);
-+        return $possible_build_lst;
-         };
-     }
-+    }
-     print " failed\n";
- 
-     if (!defined $dead_parents{$module}) {
diff --git a/patches/dev300/piece-checkdll.diff b/patches/dev300/piece-checkdll.diff
deleted file mode 100644
index d677e0372..000000000
--- a/patches/dev300/piece-checkdll.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- solenv/bin/checkdll.sh
-+++ solenv/bin/checkdll.sh
-@@ -37,7 +37,7 @@
-     exit 1
- }
- 
--checkdll="$SOLARVERSION/$INPATH/bin$UPDMINOREXT/checkdll"
-+checkdll=`which checkdll`
- 
- if [ -x $checkdll ]; then
-     while :
diff --git a/patches/dev300/piece-cli_ure.diff b/patches/dev300/piece-cli_ure.diff
deleted file mode 100644
index 5a0cb90c3..000000000
--- a/patches/dev300/piece-cli_ure.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- cli_ure/unotypes/makefile.mk.old	2009-10-14 15:38:06.000000000 +0200
-+++ cli_ure/unotypes/makefile.mk	2009-10-15 11:53:52.000000000 +0200
-@@ -44,7 +44,7 @@ TARGET = unotypes
- .IF "$(BUILD_FOR_CLI)" != "" && ("$(GUI)" == "WNT" || "$(ENABLE_MONO_CLIMAKER)" == "YES")
- 
- .IF "$(ENABLE_MONO_CLIMAKER)" == "YES"
--WRAPCMD=MONO_PATH=$(OUT)/bin:$(MONO_PATH) LD_LIBRARY_PATH=$(SOLARLIBDIR):$(OUT)/lib
-+WRAPCMD=MONO_PATH=$(OUT)/bin:$(MONO_PATH) LD_LIBRARY_PATH=$(SOLARLIBDIR):$(SOLARPIECE)$/$(INPATH)$/lib:$(OUT)/lib
- CLIMAKER=$(BIN)$/climaker
- .ELSE
- CLIMAKER=climaker.exe
-@@ -64,14 +64,14 @@ CLIMAKERFLAGS += --verbose
- .ENDIF
- 
- #When changing the assembly version then this must also be done in scp2
--$(OUT)$/bin$/cli_uretypes.dll : $(CLIMAKER) $(SOLARBINDIR)$/types.rdb $(BIN)$/cliureversion.mk
-+$(OUT)$/bin$/cli_uretypes.dll : $(CLIMAKER) $(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb $(BIN)$/cliureversion.mk
- 	$(WRAPCMD) $(CLIMAKER) $(CLIMAKERFLAGS) \
-         --out $@ \
-         --keyfile $(BIN)$/cliuno.snk \
-         --assembly-version $(CLI_URETYPES_NEW_VERSION) \
-         --assembly-description "This assembly contains metadata for the StarOffice/OpenOffice.org API." \
-         --assembly-company "OpenOffice.org" \
--        $(SOLARBINDIR)$/udkapi.rdb
-+        $(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb
- 
- #do not forget to deliver cli_uretypes.config. It is NOT embedded in the policy file.
- #see i62886 for the dependency on cli_uretypes.dll
---- cli_ure/qa/climaker/makefile.mk.old	2008-06-25 14:05:37.000000000 +0200
-+++ cli_ure/qa/climaker/makefile.mk	2008-08-29 13:50:49.000000000 +0200
-@@ -106,7 +106,7 @@ $(OUTDIR)$/types.rdb: $(OUTDIR)$/types.u
- $(OUTDIR)$/cli_test_types.dll: $(OUTDIR)$/types.rdb $(BIN)$/climaker.exe $(BIN)$/cli_uretypes.dll
-     $(CLIMAKER) $(CLIMAKERFLAGS) --out $@  \
- 		-r $(BIN)$/cli_uretypes.dll \
--		-X $(SOLARBINDIR)$/types.rdb \
-+        -X $(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb \
- 		$(OUTDIR)$/types.rdb
- 
- 
diff --git a/patches/dev300/piece-connectivity.diff b/patches/dev300/piece-connectivity.diff
deleted file mode 100644
index 282981668..000000000
--- a/patches/dev300/piece-connectivity.diff
+++ /dev/null
@@ -1,40 +0,0 @@
---- connectivity/source/drivers/hsqldb/makefile.mk.old	2008-04-10 11:21:52.000000000 +0200
-+++ connectivity/source/drivers/hsqldb/makefile.mk	2008-10-08 15:52:20.000000000 +0200
-@@ -59,7 +59,7 @@ RES1FILELIST=\
- 	$(SRS)$/$(TARGET).srs
- 
- RESLIB1NAME=$(TARGET)
--RESLIB1IMAGES=$(SOLARDEFIMG)$/database
-+RESLIB1IMAGES=$(IMGSRC)$/$(RSCDEFIMG)$/database
- RESLIB1SRSFILES=$(RES1FILELIST)
- 
- # Note that the resource file built here is currently *not* included
---- connectivity/makefile.pmk.old	2009-10-21 14:39:24.000000000 +0200
-+++ connectivity/makefile.pmk	2009-10-21 14:42:46.000000000 +0200
-@@ -29,13 +29,13 @@
- #
- #*************************************************************************
- 
--XSLDIR=$(SOLARXMLDIR)$/processing
-+XSLDIR=$(SOLARPIECE)$/$(INPATH)$/xml$(EXT_UPDMINOR)$/processing
- ABSXCSROOT=$(PWD)$/$(MISC)
- # ABSXCSROOT=$(MISC)
- XCSROOT=..
- # XCSROOT=$(SOLARXMLDIR)
- # ABSXCSROOT=$(SOLARXMLDIR)
--DTDDIR=$(SOLARXMLDIR)
-+DTDDIR=$(SOLARPIECE)$/$(INPATH)$/xml$(EXT_UPDMINOR)
- PROCESSOUT=$(MISC)
- PROCESSORDIR=$(SOLARBINDIR)
- 
---- connectivity/target.pmk.old	2009-10-08 08:11:52.000000000 +0200
-+++ connectivity/target.pmk	2009-10-21 14:41:41.000000000 +0200
-@@ -34,7 +34,7 @@
- COMPONENT_CONFIG_SCHEMA*=$(TARGET).xcs
- 
- ALLTAR: "$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(COMPONENT_CONFIG_SCHEMA)"
--"$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(COMPONENT_CONFIG_SCHEMA)" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Drivers.xcs
-+"$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(COMPONENT_CONFIG_SCHEMA)" : $(SOLARPIECE)$/$(INPATH)$/xml$(EXT_UPDMINOR)$/registry$/schema$/$(PACKAGEDIR)$/Drivers.xcs
-     @@-$(MKDIRHIER) $(@:d)
-     $(COPY) $< $@
- 
diff --git a/patches/dev300/piece-cppuhelper.diff b/patches/dev300/piece-cppuhelper.diff
deleted file mode 100644
index e01aa1418..000000000
--- a/patches/dev300/piece-cppuhelper.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- cppuhelper/unotypes/makefile.mk	2008-07-17 10:47:46.000000000 +0100
-+++ cppuhelper/unotypes/makefile.mk	2008-07-17 10:47:46.000000000 +0100
-@@ -40,7 +40,7 @@
- UNOUCRDEP = $(UNOUCRRDB)
- UNOUCROUT = $(OUT)$/inc$/private
- 
--CPPUMAKERFLAGS += -C -X$(SOLARBINDIR)$/types.rdb
-+CPPUMAKERFLAGS += -C -X$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb
- 
- UNOTYPES = \
- 	cppuhelper.detail.XExceptionThrower
-@@ -50,7 +50,7 @@
- 
- .INCLUDE : target.mk
- 
--$(UNOUCRRDB) : $(ALLIDLFILES) $(SOLARBINDIR)$/types.rdb
--	$(IDLC) -I. -I$(SOLARIDLDIR) -O$(UCR) $(ALLIDLFILES)
-+$(UNOUCRRDB) : $(ALLIDLFILES) $(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb
-+    $(IDLC) -I. $(SOLARIDLINC) -O$(UCR) $(ALLIDLFILES)
- 	$(REGMERGE) $@ /UCR $(UCR)$/{$(?:f:s/.idl/.urd/)}
- 	touch $@
-
---- cppuhelper/source/makefile.mk
-+++ cppuhelper/source/makefile.mk
-@@ -51,7 +51,7 @@
- 
- # --- Files --------------------------------------------------------
- 
--UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
-+UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb
- UNOUCRDEP=$(UNOUCRRDB)
- UNOUCROUT=$(OUT)$/inc$/$(TARGET)
- INCPRE+=$(OUT)$/inc$/$(TARGET) $(OUT)$/inc$/private
diff --git a/patches/dev300/piece-cpputools.diff b/patches/dev300/piece-cpputools.diff
deleted file mode 100644
index 7b1388584..000000000
--- a/patches/dev300/piece-cpputools.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- cpputools/source/registercomponent/makefile.mk.old	2010-02-02 12:49:41.000000000 +0100
-+++ cpputools/source/registercomponent/makefile.mk	2010-03-05 20:11:19.000000000 +0100
-@@ -39,8 +39,8 @@ ENABLE_EXCEPTIONS=TRUE
- # --- Settings -----------------------------------------------------
- .INCLUDE :  settings.mk
- 
--UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb 
--UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
-+UNOUCRDEP=$(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb 
-+UNOUCRRDB=$(UNOUCRDEP)
- 
- NO_OFFUH=TRUE
- CPPUMAKERFLAGS += -C
---- cpputools/source/regsingleton/makefile.mk.old	2010-02-02 12:49:41.000000000 +0100
-+++ cpputools/source/regsingleton/makefile.mk	2010-03-05 20:11:19.000000000 +0100
-@@ -39,8 +39,8 @@ ENABLE_EXCEPTIONS=TRUE
- 
- .INCLUDE :  settings.mk
- 
--UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb 
--UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
-+UNOUCRDEP=$(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb 
-+UNOUCRRDB=$(UNOUCRDEP)
- 
- NO_OFFUH=TRUE
- CPPUMAKERFLAGS+= -C
---- cpputools/source/unoexe/makefile.mk.old	2010-02-02 12:49:41.000000000 +0100
-+++ cpputools/source/unoexe/makefile.mk	2010-03-05 20:11:19.000000000 +0100
-@@ -39,8 +39,8 @@ ENABLE_EXCEPTIONS=TRUE
- 
- .INCLUDE :  settings.mk
- 
--UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb 
--UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
-+UNOUCRDEP=$(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb 
-+UNOUCRRDB=$(UNOUCRDEP)
- 
- NO_OFFUH=TRUE
- CPPUMAKERFLAGS+= -C
diff --git a/patches/dev300/piece-cui.diff b/patches/dev300/piece-cui.diff
deleted file mode 100644
index 36a800a25..000000000
--- a/patches/dev300/piece-cui.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- cui/util/makefile.mk.old	2010-07-19 18:10:32.000000000 +0200
-+++ cui/util/makefile.mk	2010-07-20 13:47:49.000000000 +0200
-@@ -97,7 +97,7 @@ SRSFILELIST=\
- 
- 
- RESLIB1NAME=cui
--RESLIB1IMAGES=$(SOLARDEFIMG)/svx/res
-+RESLIB1IMAGES=$(SOLARVER)/$(RSCDEFIMG)/svx/res
- RESLIB1SRSFILES= $(SRSFILELIST)
- 
- # --- Targets -------------------------------------------------------
diff --git a/patches/dev300/piece-deliver.diff b/patches/dev300/piece-deliver.diff
deleted file mode 100644
index f3f233853..000000000
--- a/patches/dev300/piece-deliver.diff
+++ /dev/null
@@ -1,40 +0,0 @@
---- solenv/bin/deliver.pl.old	2010-05-19 19:57:28.000000000 +0200
-+++ solenv/bin/deliver.pl	2010-06-22 16:09:23.000000000 +0200
-@@ -443,6 +443,13 @@ sub parse_options 
-     $opt_force = 1 if $opt_delete;
- }
- 
-+# return the base directory to install to
-+sub get_dest_base()
-+{
-+    return $ENV{'SOLARPIECEVERSION'} if (defined $ENV{'SOLARPIECEVERSION'});
-+    return $ENV{'SOLARVERSION'};
-+}
-+
- sub init_globals 
- {
-     my $ext;
-@@ -461,11 +468,11 @@ sub init_globals 
-     my $build_sosl    = $ENV{'BUILD_SOSL'};
-     my $common_outdir = $ENV{'COMMON_OUTDIR'};
-     my $inpath        = $ENV{'INPATH'};
--    my $solarversion  = $ENV{'SOLARVERSION'};
-     my $updater       = $ENV{'UPDATER'};
-     my $updminor      = $ENV{'UPDMINOR'};
-     my $updminorext   = $ENV{'UPDMINOREXT'};
-     my $work_stamp    = $ENV{'WORK_STAMP'};
-+    my $solarversion  = get_dest_base();
-     
-     # special security check for release engineers
-     if ( defined($updater) && !defined($build_sosl) && !$opt_force) {
-@@ -1165,8 +1172,8 @@ sub push_on_loglist
-         warn "Neither common nor platform tree?";
-         return;
-     }
--    # make 'to' relative to SOLARVERSION
--    my $solarversion  = $ENV{'SOLARVERSION'};
-+    # make 'to' relative to the base path
-+    my $solarversion  = get_dest_base();
-     $solarversion =~ s#\\#/#g;
-     $entry[2] =~ s/^\Q$solarversion\E\///;
-     # strip minor from 'to'
diff --git a/patches/dev300/piece-desktop-avoid-user-conf-symlinks.diff b/patches/dev300/piece-desktop-avoid-user-conf-symlinks.diff
deleted file mode 100644
index efb87b7c8..000000000
--- a/patches/dev300/piece-desktop-avoid-user-conf-symlinks.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- desktop/source/app/userinstall.cxx.old	2008-11-06 21:17:38.000000000 +0100
-+++ desktop/source/app/userinstall.cxx	2008-11-10 17:16:57.000000000 +0100
-@@ -178,7 +178,8 @@ namespace desktop {
- 
-     static osl::FileBase::RC copy_recursive( const rtl::OUString& srcUnqPath, const rtl::OUString& dstUnqPath)
-     {
--
-+        // will be used for getAbsoluteFileURL just to resolve symbolic links
-+        static rtl::OUString aBaseDirectoryURL=rtl::OUString::createFromAscii("file://");
-         FileBase::RC err;
-         DirectoryItem aDirItem;
-         DirectoryItem::get(srcUnqPath, aDirItem);
-@@ -223,8 +224,12 @@ namespace desktop {
-         }
-         else
-         {
-+            // resolve symbolic links
-+            ::rtl::OUString srcAbsUnqPath;
-+            err = File::getAbsoluteFileURL( aBaseDirectoryURL, srcUnqPath, srcAbsUnqPath );
-             // copy single file - foldback
--            err = File::copy( srcUnqPath,dstUnqPath );
-+            if ( err == osl::FileBase::E_None )
-+                err = File::copy( srcAbsUnqPath,dstUnqPath );
-         }
-         return err;
-     }
diff --git a/patches/dev300/piece-desktop.diff b/patches/dev300/piece-desktop.diff
deleted file mode 100644
index f0233d7cb..000000000
--- a/patches/dev300/piece-desktop.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- desktop/prj/build.lst.old	2009-10-14 15:37:58.000000000 +0200
-+++ desktop/prj/build.lst	2009-10-14 15:46:50.000000000 +0200
-@@ -38,7 +38,6 @@ dt	desktop\source\deployment\registry\he
- dt	desktop\source\deployment\registry\executable		nmake	-	all	dt_dp_registry_executable dt_inc NULL
- dt	desktop\scripts 						nmake	-	u	dt_scripts dt_inc NULL
- dt	desktop\util							nmake	-	all	dt_util dt_app dt_pagein.u dt_so_comp dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr dt_rebase.w NULL
--dt	desktop\zipintro							nmake	-	all	dt_zipintro NULL
- dt  desktop\registry\data\org\openoffice\Office                     nmake   -  all sn_regconfig NULL
- dt  desktop\source\registration\com\sun\star\servicetag\resources   get     -  all sn_svctagres NULL
- dt  desktop\source\registration\com\sun\star\servicetag             nmake   -  all sn_svctag NULL
diff --git a/patches/dev300/piece-forms.diff b/patches/dev300/piece-forms.diff
deleted file mode 100644
index da072840d..000000000
--- a/patches/dev300/piece-forms.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- forms/source/misc/makefile.mk	2008-07-21 16:59:48.000000000 +0100
-+++ forms/source/misc/makefile.mk	2008-07-25 02:42:27.000000000 +0100
-@@ -67,7 +67,7 @@
- 
- $(SLOFILES) : $(MISC)$/$(TARGET).don
- 
--$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
--        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-+$(MISC)$/$(TARGET).don : $(SPLITINSTALLDIR)$/oovbaapi.rdb
-+        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SPLITINSTALLDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-         echo $@
- 
diff --git a/patches/dev300/piece-helpcontent2.diff b/patches/dev300/piece-helpcontent2.diff
deleted file mode 100644
index 24dd5e79e..000000000
--- a/patches/dev300/piece-helpcontent2.diff
+++ /dev/null
@@ -1,38 +0,0 @@
---- helpcontent2/source/auxiliary/makefile.mk.old	2010-02-02 12:49:41.000000000 +0100
-+++ helpcontent2/source/auxiliary/makefile.mk	2010-03-09 11:27:48.000000000 +0100
-@@ -86,7 +86,7 @@ aux_dirs .PHONY :
- 
- $(COMMONBIN)$/helpimg.ilst .PHONY:
-     -$(RM) $@
--    $(PERL) $(PRJ)$/helpers$/create_ilst.pl -dir=$(SOLARSRC)/default_images/res/helpimg > $@.$(INPATH)
-+    $(PERL) $(PRJ)$/helpers$/create_ilst.pl -dir=$(SOLARVER)/default_images/res/helpimg > $@.$(INPATH)
-     $(RENAME) $@.$(INPATH) $@
-     
- 
---- helpcontent2/settings.pmk.old	2010-02-02 12:49:41.000000000 +0100
-+++ helpcontent2/settings.pmk	2010-03-09 11:27:48.000000000 +0100
-@@ -1,11 +1,11 @@
- .INCLUDE : $(LOCAL_COMMON_OUT)/inc$/aux_langs.mk
- 
--my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/juh.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/HelpIndexerTool.jar$
-+my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SPLITUREDIR)$/share$/java$/juh.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/unoil.jar$(PATH_SEPERATOR)$(SPLITUREDIR)$/share$/java$/ridl.jar$(PATH_SEPERATOR)$(SPLITUREDIR)$/share$/java$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/LuceneHelpWrapper.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/HelpIndexerTool.jar$
- 
- .IF "$(SYSTEM_LUCENE)" == "YES"
- my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
- .ELSE
--my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-analyzers-2.3.jar
-+my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/lucene-core-2.3.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/lucene-analyzers-2.3.jar
- .ENDIF
-  
- .IF "$(SYSTEM_DB)" != "YES"
---- solenv/inc/extension_helplink.mk.old	2010-10-13 16:28:44.000000000 +0200
-+++ solenv/inc/extension_helplink.mk	2010-10-13 17:27:08.000000000 +0200
-@@ -30,7 +30,7 @@ my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SO
- .IF "$(SYSTEM_LUCENE)" == "YES"
- my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
- .ELSE
--my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-analyzers-2.3.jar
-+my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SPLITINSTALLDIR)/classes/lucene-core-2.3.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)/classes/lucene-analyzers-2.3.jar
- .ENDIF
- 
- .IF "$(SYSTEM_DB)" != "YES"
diff --git a/patches/dev300/piece-icons.diff b/patches/dev300/piece-icons.diff
deleted file mode 100644
index f9e235aea..000000000
--- a/patches/dev300/piece-icons.diff
+++ /dev/null
@@ -1,366 +0,0 @@
---- solenv/inc/settings.mk.old	2008-10-08 13:41:29.000000000 +0200
-+++ solenv/inc/settings.mk	2008-10-08 14:49:03.000000000 +0200
-@@ -982,6 +982,7 @@ RSCDEFS=-D$(GUI) -D$(GVER) -D$(COM) -D$(
- RSCDEFS+=-DBUILD_SPECIAL=$(BUILD_SPECIAL)
- .ENDIF
- 
-+IMGSRC=$(SOLARVER)
- RSCDEFIMG*=default_images
- 
- RSCEXTINC=.
---- solenv/inc/tg_rslb.mk.old	2008-10-08 13:41:29.000000000 +0200
-+++ solenv/inc/tg_rslb.mk	2008-10-08 14:44:02.000000000 +0200
-@@ -62,11 +62,11 @@ $(RSC_MULTI$(TNR)) : \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
- 	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB$(TNR)NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
-+    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
-     -lip={$j} ) \
--    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
--    -subMODULE=$(SOLARDEFIMG) \
--    -subGLOBALRES=$(SOLARDEFIMG)/res \
-+    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
-+    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
-+    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-     -ft=$@ \
- 	$(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \
-@@ -77,11 +77,11 @@ $(RSC_MULTI$(TNR)) : \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
- 	-fs={$(BIN)/$(RESLIB$(TNR)NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
-+    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
-     -lip={$j} ) \
--    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
--	-subMODULE=$(SOLARDEFIMG) \
--	-subGLOBALRES=$(SOLARDEFIMG)/res \
-+    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
-+    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
-+    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-     -oil=$(BIN) \
-     -ft=$@ \
- 	$(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \
---- solenv/inc/_tg_rslb.mk.old	2008-10-08 13:41:29.000000000 +0200
-+++ solenv/inc/_tg_rslb.mk	2008-10-08 14:42:50.000000000 +0200
-@@ -30,11 +30,11 @@ $(RSC_MULTI1) : \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
- 	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB1NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
-+    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
-     -lip={$j} ) \
--    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
--	-subMODULE=$(SOLARDEFIMG) \
--	-subGLOBALRES=$(SOLARDEFIMG)/res \
-+    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
-+    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
-+    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-     -ft=$@ \
- 	$(RSC1HEADER) $(RESLIB1SRSFILES) \
-@@ -45,11 +45,11 @@ $(RSC_MULTI1) : \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
- 	-fs={$(BIN)/$(RESLIB1NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
-+    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
-     -lip={$j} ) \
--    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
--	-subMODULE=$(SOLARDEFIMG) \
--	-subGLOBALRES=$(SOLARDEFIMG)/res \
-+    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
-+    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
-+    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-     -oil=$(BIN) \
-     -ft=$@ \
- 	$(RSC1HEADER) $(RESLIB1SRSFILES) \
-@@ -108,11 +108,11 @@ $(RSC_MULTI2) : \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
- 	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB2NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
-+    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
-     -lip={$j} ) \
--    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
--	-subMODULE=$(SOLARDEFIMG) \
--	-subGLOBALRES=$(SOLARDEFIMG)/res \
-+    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
-+    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
-+    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-     -ft=$@ \
- 	$(RSC2HEADER) $(RESLIB2SRSFILES) \
-@@ -123,11 +123,11 @@ $(RSC_MULTI2) : \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
- 	-fs={$(BIN)/$(RESLIB2NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
-+    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
-     -lip={$j} ) \
--    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
--	-subMODULE=$(SOLARDEFIMG) \
--	-subGLOBALRES=$(SOLARDEFIMG)/res \
-+    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
-+    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
-+    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-     -oil=$(BIN) \
-     -ft=$@ \
- 	$(RSC2HEADER) $(RESLIB2SRSFILES) \
-@@ -186,11 +186,11 @@ $(RSC_MULTI3) : \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
- 	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB3NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
-+    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
-     -lip={$j} ) \
--    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
--	-subMODULE=$(SOLARDEFIMG) \
--	-subGLOBALRES=$(SOLARDEFIMG)/res \
-+    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
-+    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
-+    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-     -ft=$@ \
- 	$(RSC3HEADER) $(RESLIB3SRSFILES) \
-@@ -201,11 +201,11 @@ $(RSC_MULTI3) : \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
- 	-fs={$(BIN)/$(RESLIB3NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
-+    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
-     -lip={$j} ) \
--    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
--	-subMODULE=$(SOLARDEFIMG) \
--	-subGLOBALRES=$(SOLARDEFIMG)/res \
-+    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
-+    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
-+    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-     -oil=$(BIN) \
-     -ft=$@ \
- 	$(RSC3HEADER) $(RESLIB3SRSFILES) \
-@@ -264,11 +264,11 @@ $(RSC_MULTI4) : \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
- 	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB4NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
-+    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
-     -lip={$j} ) \
--    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
--	-subMODULE=$(SOLARDEFIMG) \
--	-subGLOBALRES=$(SOLARDEFIMG)/res \
-+    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
-+    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
-+    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-     -ft=$@ \
- 	$(RSC4HEADER) $(RESLIB4SRSFILES) \
-@@ -279,11 +279,11 @@ $(RSC_MULTI4) : \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
- 	-fs={$(BIN)/$(RESLIB4NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
-+    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
-     -lip={$j} ) \
--    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
--	-subMODULE=$(SOLARDEFIMG) \
--	-subGLOBALRES=$(SOLARDEFIMG)/res \
-+    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
-+    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
-+    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-     -oil=$(BIN) \
-     -ft=$@ \
- 	$(RSC4HEADER) $(RESLIB4SRSFILES) \
-@@ -342,11 +342,11 @@ $(RSC_MULTI5) : \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
- 	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB5NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
-+    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
-     -lip={$j} ) \
--    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
--	-subMODULE=$(SOLARDEFIMG) \
--	-subGLOBALRES=$(SOLARDEFIMG)/res \
-+    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
-+    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
-+    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-     -ft=$@ \
- 	$(RSC5HEADER) $(RESLIB5SRSFILES) \
-@@ -357,11 +357,11 @@ $(RSC_MULTI5) : \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
- 	-fs={$(BIN)/$(RESLIB5NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
-+    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
-     -lip={$j} ) \
--    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
--	-subMODULE=$(SOLARDEFIMG) \
--	-subGLOBALRES=$(SOLARDEFIMG)/res \
-+    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
-+    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
-+    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-     -oil=$(BIN) \
-     -ft=$@ \
- 	$(RSC5HEADER) $(RESLIB5SRSFILES) \
-@@ -420,11 +420,11 @@ $(RSC_MULTI6) : \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
- 	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB6NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
-+    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
-     -lip={$j} ) \
--    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
--	-subMODULE=$(SOLARDEFIMG) \
--	-subGLOBALRES=$(SOLARDEFIMG)/res \
-+    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
-+    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
-+    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-     -ft=$@ \
- 	$(RSC6HEADER) $(RESLIB6SRSFILES) \
-@@ -435,11 +435,11 @@ $(RSC_MULTI6) : \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
- 	-fs={$(BIN)/$(RESLIB6NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
-+    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
-     -lip={$j} ) \
--    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
--	-subMODULE=$(SOLARDEFIMG) \
--	-subGLOBALRES=$(SOLARDEFIMG)/res \
-+    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
-+    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
-+    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-     -oil=$(BIN) \
-     -ft=$@ \
- 	$(RSC6HEADER) $(RESLIB6SRSFILES) \
-@@ -498,11 +498,11 @@ $(RSC_MULTI7) : \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
- 	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB7NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
-+    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
-     -lip={$j} ) \
--    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
--	-subMODULE=$(SOLARDEFIMG) \
--	-subGLOBALRES=$(SOLARDEFIMG)/res \
-+    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
-+    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
-+    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-     -ft=$@ \
- 	$(RSC7HEADER) $(RESLIB7SRSFILES) \
-@@ -513,11 +513,11 @@ $(RSC_MULTI7) : \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
- 	-fs={$(BIN)/$(RESLIB7NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
-+    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
-     -lip={$j} ) \
--    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
--	-subMODULE=$(SOLARDEFIMG) \
--	-subGLOBALRES=$(SOLARDEFIMG)/res \
-+    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
-+    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
-+    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-     -oil=$(BIN) \
-     -ft=$@ \
- 	$(RSC7HEADER) $(RESLIB7SRSFILES) \
-@@ -576,11 +576,11 @@ $(RSC_MULTI8) : \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
- 	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB8NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
-+    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
-     -lip={$j} ) \
--    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
--	-subMODULE=$(SOLARDEFIMG) \
--	-subGLOBALRES=$(SOLARDEFIMG)/res \
-+    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
-+    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
-+    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-     -ft=$@ \
- 	$(RSC8HEADER) $(RESLIB8SRSFILES) \
-@@ -591,11 +591,11 @@ $(RSC_MULTI8) : \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
- 	-fs={$(BIN)/$(RESLIB8NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
-+    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
-     -lip={$j} ) \
--    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
--	-subMODULE=$(SOLARDEFIMG) \
--	-subGLOBALRES=$(SOLARDEFIMG)/res \
-+    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
-+    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
-+    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-     -oil=$(BIN) \
-     -ft=$@ \
- 	$(RSC8HEADER) $(RESLIB8SRSFILES) \
-@@ -654,11 +654,11 @@ $(RSC_MULTI9) : \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
- 	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB9NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
-+    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
-     -lip={$j} ) \
--    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
--	-subMODULE=$(SOLARDEFIMG) \
--	-subGLOBALRES=$(SOLARDEFIMG)/res \
-+    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
-+    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
-+    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-     -ft=$@ \
- 	$(RSC9HEADER) $(RESLIB9SRSFILES) \
-@@ -669,11 +669,11 @@ $(RSC_MULTI9) : \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
- 	-fs={$(BIN)/$(RESLIB9NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
-+    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
-     -lip={$j} ) \
--    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
--	-subMODULE=$(SOLARDEFIMG) \
--	-subGLOBALRES=$(SOLARDEFIMG)/res \
-+    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
-+    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
-+    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-     -oil=$(BIN) \
-     -ft=$@ \
- 	$(RSC9HEADER) $(RESLIB9SRSFILES) \
-@@ -732,11 +732,11 @@ $(RSC_MULTI10) : \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
- 	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB10NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
-+    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
-     -lip={$j} ) \
--    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
--	-subMODULE=$(SOLARDEFIMG) \
--	-subGLOBALRES=$(SOLARDEFIMG)/res \
-+    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
-+    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
-+    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-     -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-     -ft=$@ \
- 	$(RSC10HEADER) $(RESLIB10SRSFILES) \
-@@ -747,11 +747,11 @@ $(RSC_MULTI10) : \
- 	$(foreach,i,$(alllangiso) -lg$i \
- 	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
- 	-fs={$(BIN)/$(RESLIB10NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
-+    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
-     -lip={$j} ) \
--    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
--	-subMODULE=$(SOLARDEFIMG) \
--	-subGLOBALRES=$(SOLARDEFIMG)/res \
-+    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
-+    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
-+    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-     -oil=$(BIN) \
-     -ft=$@ \
- 	$(RSC10HEADER) $(RESLIB10SRSFILES) \
diff --git a/patches/dev300/piece-io.diff b/patches/dev300/piece-io.diff
deleted file mode 100644
index 9c2a77053..000000000
--- a/patches/dev300/piece-io.diff
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -u -r io/source/acceptor/makefile.mk io/source/acceptor/makefile.mk
---- io/source/acceptor/makefile.mk	2008-04-11 12:43:42.000000000 +0100
-+++ io/source/acceptor/makefile.mk	2008-07-17 11:16:04.000000000 +0100
-@@ -36,16 +36,16 @@
- ENABLE_EXCEPTIONS=TRUE
- NO_BSYMBOLIC=TRUE
- COMP1TYPELIST = acceptor
--COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
-+COMPRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb 
- 
- # --- Settings -----------------------------------------------------
- .INCLUDE :  settings.mk
- .IF "$(L10N_framework)"==""
- DLLPRE =
- # ------------------------------------------------------------------
- 
--UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
--UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
-+UNOUCRDEP=$(COMPRDB)
-+UNOUCRRDB=$(COMPRDB)
- UNOUCROUT=$(OUT)$/inc$/acceptor
- INCPRE+= $(UNOUCROUT)
- 
-Only in io/source/acceptor: makefile.mk~
-diff -u -r io/source/connector/makefile.mk io/source/connector/makefile.mk
---- io/source/connector/makefile.mk	2008-04-11 12:45:15.000000000 +0100
-+++ io/source/connector/makefile.mk	2008-07-17 11:15:19.000000000 +0100
-@@ -36,16 +36,16 @@
- ENABLE_EXCEPTIONS=TRUE
- NO_BSYMBOLIC=TRUE
- COMP1TYPELIST = connectr
--COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
-+COMPRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb 
- 
- # --- Settings -----------------------------------------------------
- .INCLUDE :  settings.mk
- .IF "$(L10N_framework)"==""
- DLLPRE =
- # ------------------------------------------------------------------
- 
--UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
--UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
-+UNOUCRDEP=$(COMPRDB)
-+UNOUCRRDB=$(COMPRDB)
- UNOUCROUT=$(OUT)$/inc$/connector
- INCPRE+= $(UNOUCROUT)
- 
-Only in io/source/connector: makefile.mk~
-diff -u -r io/source/stm/makefile.mk io/source/stm/makefile.mk
---- io/source/stm/makefile.mk	2008-04-11 12:46:07.000000000 +0100
-+++ io/source/stm/makefile.mk	2008-07-17 11:16:32.000000000 +0100
-@@ -35,15 +35,15 @@
- ENABLE_EXCEPTIONS=TRUE
- NO_BSYMBOLIC=TRUE
- COMP1TYPELIST = stm
--COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
-+COMPRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb 
- 
- # --- Settings -----------------------------------------------------
- .INCLUDE :  settings.mk
- .IF "$(L10N_framework)"==""
- DLLPRE =
- # --- Files --------------------------------------------------------
--UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
--UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
-+UNOUCRDEP=$(COMPRDB)
-+UNOUCRRDB=$(COMPRDB)
- UNOUCROUT=$(OUT)$/inc$/stm
- INCPRE+= $(UNOUCROUT)
- 
-Only in io/source/stm: makefile.mk~
diff --git a/patches/dev300/piece-javaunohelper.diff b/patches/dev300/piece-javaunohelper.diff
deleted file mode 100644
index 965bc25e3..000000000
--- a/patches/dev300/piece-javaunohelper.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- javaunohelper/source/makefile.mk	2008-07-17 11:12:47.000000000 +0100
-+++ javaunohelper/source/makefile.mk	2008-07-17 11:12:47.000000000 +0100
-@@ -48,8 +48,8 @@
- 
- # ------------------------------------------------------------------
- 
--UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
--UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
-+UNOUCRDEP=$(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb
-+UNOUCRRDB=$(UNOUCRDEP)
- 
- UNOUCROUT=$(OUT)$/inc$/comprehensive
- INCPRE+=$(OUT)$/inc$/comprehensive
diff --git a/patches/dev300/piece-jfreereport.diff b/patches/dev300/piece-jfreereport.diff
deleted file mode 100644
index 82a57974d..000000000
--- a/patches/dev300/piece-jfreereport.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- jfreereport/java/libbase/makefile.mk.old	2009-03-20 11:50:30.000000000 +0100
-+++ jfreereport/java/libbase/makefile.mk	2009-03-20 12:05:18.000000000 +0100
-@@ -76,7 +76,7 @@ $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) :
- 
- $(CLASSDIR)$/commons-logging.jar : 
- .IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
--	$(COPY) $(SOLARBINDIR)$/commons-logging-1.1.1.jar $(CLASSDIR)$/commons-logging.jar
-+    $(COPY) $(SOLARPIECE)$/$(INPATH)$/bin$/commons-logging-1.1.1.jar $(CLASSDIR)$/commons-logging.jar
- .ELSE
- 	$(COPY) $(COMMONS_LOGGING_JAR) $(CLASSDIR)$/commons-logging.jar
- .ENDIF
diff --git a/patches/dev300/piece-jvmfwk.diff b/patches/dev300/piece-jvmfwk.diff
deleted file mode 100644
index b400537de..000000000
--- a/patches/dev300/piece-jvmfwk.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- jvmfwk/source/fwkutil.hxx.old	2008-06-13 16:12:18.000000000 +0200
-+++ jvmfwk/source/fwkutil.hxx	2008-10-07 22:38:51.000000000 +0200
-@@ -40,7 +40,9 @@
- #if OSL_DEBUG_LEVEL >=2
- #include <stdio.h>
- #endif
--
-+#include <limits.h>
-+#include <stdlib.h>
-+#include <string.h>
- 
- namespace jfw
- {
-@@ -56,9 +58,14 @@ rtl::OUString getLibraryLocation();
- struct Bootstrap :
- 	public ::rtl::StaticWithInit< const rtl::Bootstrap *, Bootstrap > {
- 		const rtl::Bootstrap * operator () () {
--            ::rtl::OUStringBuffer buf(256);
--            buf.append(getLibraryLocation());
--            buf.appendAscii(SAL_CONFIGFILE("/jvmfwk3"));
-+            ::rtl::OUStringBuffer buf(PATH_MAX);
-+            const char * pJVMFWK_CONFIGFILE = getenv("JVMFWK_CONFIGFILE");
-+            if (pJVMFWK_CONFIGFILE && strlen(pJVMFWK_CONFIGFILE)) {
-+            buf.appendAscii(pJVMFWK_CONFIGFILE);
-+            } else {
-+            buf.append(getLibraryLocation());
-+            buf.appendAscii(SAL_CONFIGFILE("/jvmfwk3"));
-+            }
-             ::rtl::OUString sIni = buf.makeStringAndClear();
-             ::rtl::Bootstrap *  bootstrap = new ::rtl::Bootstrap(sIni);
- #if OSL_DEBUG_LEVEL >=2
diff --git a/patches/dev300/piece-l10n.diff b/patches/dev300/piece-l10n.diff
deleted file mode 100644
index 5764c4b61..000000000
--- a/patches/dev300/piece-l10n.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- l10n/source/makefile.mk.old	2009-12-01 17:12:34.000000000 +0100
-+++ l10n/source/makefile.mk	2009-12-01 17:12:01.000000000 +0100
-@@ -107,6 +107,6 @@ $(COMMONMISC)$/merge.done : $(all_sdfs)
-     -rm -rf $(COMMONMISC)/sdf$(INPATH)_begone
-     -$(MKDIRHIER) $(COMMONMISC)/sdf
- .ENDIF			# "$(L10n_LOCK)" != "YES"
--    $(PERL) $(SOLARVER)/$(INPATH)/bin$(UPDMINOREXT)/fast_merge.pl -sdf_files $(mktmp $<) -merge_dir $(COMMONMISC)/sdf && $(TOUCH) $@
-+    $(PERL) $(SOLARPIECE)/$(INPATH)/bin$(UPDMINOREXT)/fast_merge.pl -sdf_files $(mktmp $<) -merge_dir $(COMMONMISC)/sdf && $(TOUCH) $@
-     $(COPY) $(PRJ)/localization_present.mk $(PRJ)/$(COMMON_OUTDIR)$(PROEXT)/inc
- .ENDIF
diff --git a/patches/dev300/piece-mysqlc.diff b/patches/dev300/piece-mysqlc.diff
deleted file mode 100644
index 508375be8..000000000
--- a/patches/dev300/piece-mysqlc.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- mysqlc/source/makefile.mk.old	2010-04-28 11:35:17.000000000 +0200
-+++ mysqlc/source/makefile.mk	2010-05-11 10:30:58.000000000 +0200
-@@ -264,7 +264,7 @@ EXTENSION_PACKDEPS+=$(COMPONENT_MYSQL_CP
- .INCLUDE : target.mk
- .INCLUDE : extension_post.mk
- 
--$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
-+$(COMPONENT_IMAGES) : $(SOLARVER)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
-     @@-$(MKDIRHIER) $(@:d)
-     $(COPY) $< $@
- 
diff --git a/patches/dev300/piece-nlpsolver.diff b/patches/dev300/piece-nlpsolver.diff
deleted file mode 100644
index 3fddb31f7..000000000
--- a/patches/dev300/piece-nlpsolver.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- nlpsolver/makefile.mk.old	2009-10-26 22:34:07.000000000 +0100
-+++ nlpsolver/makefile.mk	2009-10-26 22:10:36.000000000 +0100
-@@ -50,7 +50,7 @@ TARFILE_ROOTDIR=nlpsolver-0.9
- 
- PATCH_FILES=nlpsolver-0.9.patch
- 
--ANT_FLAGS+=-Dplatforms.JDK_1.5.home=$(JAVA_HOME) -Doffice.program.dir=$(SOLARBINDIR)
-+ANT_FLAGS+=-Dplatforms.JDK_1.5.home=$(JAVA_HOME) -Doffice.program.dir=$(SPLITINSTALLDIR)
- 
- CONFIGURE_ACTION=cp -rpv ../../../../locale src/
- 
---- nlpsolver/nlpsolver-0.9.patch.old	2009-10-26 22:32:49.000000000 +0100
-+++ nlpsolver/nlpsolver-0.9.patch	2009-10-26 22:03:52.000000000 +0100
-@@ -17,10 +17,10 @@
-  javac.classpath=\

- -    ${libs.StarOffice 9.classpath}:\

- -    ${libs.OpenOffice.org 3.0.classpath}:\

--+    ${solar.jar}/juh.jar:\

--+    ${solar.jar}/jurt.jar:\

--+    ${solar.jar}/ridl.jar:\

--+    ${solar.jar}/unoil.jar:\

-++    ${split.ure}/share/java/juh.jar:\

-++    ${split.ure}/share/java/jurt.jar:\

-++    ${split.ure}/share/java/ridl.jar:\

-++    ${split.install}/classes/unoil.jar:\

-      ${reference.EvolutionarySolver.jar}

-  # Space-separated list of extra javac options

-  javac.compilerargs=

diff --git a/patches/dev300/piece-odk.diff b/patches/dev300/piece-odk.diff
deleted file mode 100644
index 339342572..000000000
--- a/patches/dev300/piece-odk.diff
+++ /dev/null
@@ -1,53 +0,0 @@
---- odk/pack/gendocu/makefile.mk.old	2009-04-02 12:54:49.000000000 +0200
-+++ odk/pack/gendocu/makefile.mk	2009-04-14 17:28:52.000000000 +0200
-@@ -81,7 +81,7 @@ AUTODOCPARAMS= -lg c++ \
-         -p salhelper $(INCOUT) -t salhelper \
-         -p bridges $(INCOUT) -t bridges
- 
--JAVADOCPARAMS= -use -splitindex -windowtitle "Java UNO Runtime Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.4.1/docs/api ./java $(JAVA_PACKAGES)
-+JAVADOCPARAMS= -use -splitindex -windowtitle "Java UNO Runtime Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARPIECE)$/$(INPATH)$/bin$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.4.1/docs/api ./java $(JAVA_PACKAGES)
- 
- JAVADOCLOG = $(MISC)$/javadoc_log.txt
- 
---- odk/util/makefile.pmk.old	2009-04-02 12:54:49.000000000 +0200
-+++ odk/util/makefile.pmk	2009-04-14 17:35:01.000000000 +0200
-@@ -68,7 +68,7 @@ CONVERTTAGSCRIPT=$(SOLARENV)/bin/convert
- CONVERTTAGFLAGNAME=converttags_html_files.flag
- CONVERTTAGFLAG = $(MISC)/$(CONVERTTAGFLAGNAME)
- 
--MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/autodoc
-+MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARPIECE)/$(INPATH)/bin/autodoc
- 
- .IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="MACOSX" || "$(OS)"=="AIX"
- MY_COPY=$(GNUCOPY)
---- odk/util/odk_rules.pmk.old	2009-04-02 12:54:49.000000000 +0200
-+++ odk/util/odk_rules.pmk	2009-04-15 16:52:42.000000000 +0200
-@@ -54,13 +54,13 @@ $(DESTDIR)/configure.pl : $(PRJ)/configu
-     @@-rm -f $@
-     $(MY_TEXTCOPY) $(PRJ)/configure.pl $@
- 
--$(DESTDIR)/config.guess : $(SRC_ROOT)/config.guess
-+$(DESTDIR)/config.guess : $(SOLARVER)/bin/config.guess
-     @@-rm -f $@
--    $(MY_TEXTCOPY) $(SRC_ROOT)/config.guess $@
-+    $(MY_TEXTCOPY) $(SOLARVER)/bin/config.guess $@
- 
--$(DESTDIR)/config.sub : $(SRC_ROOT)/config.sub
-+$(DESTDIR)/config.sub : $(SOLARVER)/bin/config.sub
-     @@-rm -f $@
--    $(MY_TEXTCOPY) $(SRC_ROOT)/config.sub $@
-+    $(MY_TEXTCOPY) $(SOLARVER)/bin/config.sub $@
- 
- $(DESTDIR)/setsdkenv_unix : $(PRJ)/setsdkenv_unix
-     @@-rm -f $@
-@@ -105,6 +105,10 @@ $(DESTDIRBIN)/%$(EXEPOSTFIX) : $(BINOUT)
-     @@-rm -f $@
-     $(GNUCOPY) $(BINOUT)/$(@:f) $@
- 
-+$(DESTDIRBIN)/%$(EXEPOSTFIX) : $(SOLARPIECE)/$(INPATH)/bin/%$(EXEPOSTFIX)
-+    @@-rm -f $@
-+    $(GNUCOPY) $(SOLARPIECE)/$(INPATH)/bin/$(@:f) $@
-+
- $(DESTDIRBIN)/%.bin : $(BINOUT)/%.bin
-     @@-rm -f $@
-     $(GNUCOPY) $(BINOUT)/$(@:f) $@
diff --git a/patches/dev300/piece-offapi.diff b/patches/dev300/piece-offapi.diff
deleted file mode 100644
index 5213a07ab..000000000
--- a/patches/dev300/piece-offapi.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- offapi/util/makefile.mk.orig	2009-10-16 20:01:41.000000000 +0200
-+++ offapi/util/makefile.mk	2009-10-19 14:59:28.000000000 +0200
-@@ -154,7 +154,7 @@ REGISTRYCHECKFLAG=$(MISC)$/registrycheck
- 
- UNOTYPE_STATISTICS=$(MISC)$/unotype_statistics.txt
- 
--REGVIEWTOOL=$(SOLARBINDIR)$/regview$(EXECPOST)
-+REGVIEWTOOL=$(SOLARPIECE)/$(INPATH)/bin/regview$(EXECPOST)
- 
- # --- Targets ------------------------------------------------------
- 
-@@ -163,15 +163,16 @@ ALLTAR : $(UCR)$/types.db \
-        $(REGISTRYCHECKFLAG) \
-        $(UNOTYPE_STATISTICS)
- 
--$(UCR)$/types.db : $(UCR)$/offapi.db $(SOLARBINDIR)$/udkapi.rdb
-+UDKRDB=$(SOLARPIECE)$/$(INPATH)$/bin
-+$(UCR)$/types.db : $(UCR)$/offapi.db $(UDKRDB)$/udkapi.rdb
-     @-$(RM) $(REGISTRYCHECKFLAG)
-     @$(GNUCOPY) -f $(UCR)$/offapi.db $@
--    $(COMMAND_ECHO)$(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi.rdb
-+    $(COMMAND_ECHO)$(REGMERGE) $@ / $(UDKRDB)$/udkapi.rdb
- 
--$(OUT)$/ucrdoc$/types_doc.db : $(OUT)$/ucrdoc$/offapi_doc.db $(SOLARBINDIR)$/udkapi_doc.rdb
-+$(OUT)$/ucrdoc$/types_doc.db : $(OUT)$/ucrdoc$/offapi_doc.db $(UDKRDB)$/udkapi_doc.rdb
-     @-$(RM) $(REGISTRYCHECKFLAG)
-     @$(GNUCOPY) -f $(OUT)$/ucrdoc$/offapi_doc.db $@
--    $(COMMAND_ECHO)$(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi_doc.rdb
-+    $(COMMAND_ECHO)$(REGMERGE) $@ / $(UDKRDB)$/udkapi_doc.rdb
- 
- #JSC: The type library has changed, all temporary not checked types are removed
- #     and will be check from now on.
diff --git a/patches/dev300/piece-offuh.diff b/patches/dev300/piece-offuh.diff
deleted file mode 100644
index 1eebc3dd5..000000000
--- a/patches/dev300/piece-offuh.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- offuh/source/makefile.mk	2008-07-17 10:29:04.000000000 +0100
-+++ offuh/source/makefile.mk	2008-07-17 10:29:04.000000000 +0100
-@@ -39,6 +39,7 @@
- 
- # ------------------------------------------------------------------
- 
-+UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb
- $(MISC)$/$(TARGET).don : $(UNOUCRRDB)
- 	@@-$(RM) $@
- 	$(CPPUMAKER) -E$(UNOUCROUT)/linking_catch.hxx -Gc $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) $(UNOUCRRDB) && echo > $@
diff --git a/patches/dev300/piece-packimages.diff b/patches/dev300/piece-packimages.diff
deleted file mode 100644
index 383a5ba2d..000000000
--- a/patches/dev300/piece-packimages.diff
+++ /dev/null
@@ -1,54 +0,0 @@
---- packimages/pack/makefile.mk.old	2010-11-11 16:35:27.000000000 +0100
-+++ packimages/pack/makefile.mk	2011-02-18 19:17:04.000000000 +0100
-@@ -34,18 +34,19 @@ TARGET=packimages
- RSCCUSTOMIMG*=$(PRJ)
- .INCLUDE: target.mk
- 
-+IMGSRC=$(SOLARVER)
- IMAGES := $(COMMONBIN)$/images.zip
- SORTED_LIST=$(RES)$/img$/sorted.lst
- # Custom sets, at 24x24 & 16x16 fall-back to Tango preferentially
- # (Tango fallbacks to Industrial for the missing icons)
- CUSTOM_IMAGE_SETS=hicontrast crystal oxygen tango classic
- CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i)
--CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/ooo_custom_images$/tango
--CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/ooo_custom_images$/industrial
-+CUSTOM_PREFERRED_FALLBACK_1*=-c $(IMGSRC)$/ooo_custom_images$/tango
-+CUSTOM_PREFERRED_FALLBACK_2*=-c $(IMGSRC)$/ooo_custom_images$/industrial
- 
--CRYSTAL_TARBALL=$(SOLARSRC)$/external_images$/ooo_crystal_images-1.tar.gz
--OXYGEN_TARBALL=$(SOLARSRC)$/external_images$/ooo_oxygen_images-2009-06-17.tar.gz
--CLASSIC_TARBALL=$(SOLARSRC)$/ooo_custom_images$/classic/classic_images.tar.gz
-+CRYSTAL_TARBALL=$(IMGSRC)$/external_images$/ooo_crystal_images-1.tar.gz
-+OXYGEN_TARBALL=$(IMGSRC)$/external_images$/ooo_oxygen_images-2009-06-17.tar.gz
-+CLASSIC_TARBALL=$(IMGSRC)$/ooo_custom_images$/classic/classic_images.tar.gz
- 
- ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip
- 
-@@ -58,14 +59,14 @@ $(SORTED_LIST) : image-sort.lst
- $(RES)$/img$/commandimagelist.ilst .PHONY : $(SORTED_LIST)
-     @@-$(MKDIR) $(RES)$/img
- #+-$(RM) $@ $@.$(INPATH)
--    $(FIND) $(SOLARSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s#$(SOLARSRC)$/$(RSCDEFIMG)/res#%GLOBALRES%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH)
-+    $(FIND) $(IMGSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s#$(IMGSRC)$/$(RSCDEFIMG)/res#%GLOBALRES%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH)
-     $(PERL) $(SOLARENV)$/bin$/diffmv.pl $@.$(INPATH) $@
- 
- $(COMMONBIN)$/images.zip .PHONY: $(RES)$/img$/commandimagelist.ilst
--    $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@
-+    $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(IMGSRC)$/$(RSCDEFIMG) -m $(IMGSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@
- 
- images_% : $(RES)$/img$/commandimagelist.ilst
--    $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(SOLARSRC)$/ooo_custom_images$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip
-+    $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(IMGSRC)$/$(RSCDEFIMG) -m $(IMGSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(IMGSRC)$/ooo_custom_images$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip
- 
- # make sure to have one to keep packing happy
- $(COMMONBIN)$/images_brand.zip:
-@@ -73,7 +74,7 @@ $(COMMONBIN)$/images_brand.zip:
- 
- # generate the HiContrast icon set
- $(MISC)$/hicontrast.flag .PHONY :
--    $(PERL) $(SOLARENV)$/bin$/hicontrast-to-theme.pl $(SOLARSRC)$/default_images $(MISC)$/hicontrast && $(TOUCH) $@
-+    $(PERL) $(SOLARENV)$/bin$/hicontrast-to-theme.pl $(IMGSRC)$/default_images $(MISC)$/hicontrast && $(TOUCH) $@
- 
- # unpack the Crystal icon set
- $(MISC)$/crystal.flag : $(CRYSTAL_TARBALL)
diff --git a/patches/dev300/piece-qadevOOo.diff b/patches/dev300/piece-qadevOOo.diff
deleted file mode 100644
index 8b75204eb..000000000
--- a/patches/dev300/piece-qadevOOo.diff
+++ /dev/null
@@ -1,36 +0,0 @@
---- qadevOOo/build.xml.old	2010-07-19 13:33:25.000000000 +0200
-+++ qadevOOo/build.xml	2010-07-19 14:05:54.000000000 +0200
-@@ -8,7 +8,8 @@
-   <property name="qadevOOo.class"  location="${qadevOOo.output}/class"/>
-   <property name="qadevOOo.runner" location="${prj}/runner"/>
-   <property name="qadevOOo.tests" location="${prj}/tests/java"/>
--  <property name="qadevOOo.office_jars" location="${solar.jar}"/>
-+  <property name="qadevOOo.office_jars" location="${split.install}/classes"/>
-+  <property name="qadevOOo.ure_jars" location="${split.ure}/share/java"/>
- 
-   <!-- ================================================================================== -->
- 
-@@ -23,8 +24,10 @@
-         <classpath>
-             <pathelement location="${qadevOOo.class}"/>
-             <fileset dir="${qadevOOo.office_jars}">
--                <include name="**/ridl.jar"/>
-                 <include name="**/unoil.jar"/>
-+            </fileset>
-+            <fileset dir="${qadevOOo.ure_jars}">
-+                <include name="**/ridl.jar"/>
-                 <include name="**/jurt.jar"/>
-                 <include name="**/juh.jar"/>
-                 <include name="**/java_uno.jar"/>
-@@ -39,8 +42,10 @@
-         <classpath>
-             <pathelement location="${qadevOOo.class}"/>
-             <fileset dir="${qadevOOo.office_jars}">
--                <include name="**/ridl.jar"/>
-                 <include name="**/unoil.jar"/>
-+            </fileset>
-+            <fileset dir="${qadevOOo.ure_jars}">
-+                <include name="**/ridl.jar"/>
-                 <include name="**/jurt.jar"/>
-                 <include name="**/juh.jar"/>
-                 <include name="**/java_uno.jar"/>
diff --git a/patches/dev300/piece-remotebridges.diff b/patches/dev300/piece-remotebridges.diff
deleted file mode 100644
index b159c44dc..000000000
--- a/patches/dev300/piece-remotebridges.diff
+++ /dev/null
@@ -1,40 +0,0 @@
---- remotebridges/source/bridge/makefile.mk.old	2010-02-02 12:49:41.000000000 +0100
-+++ remotebridges/source/bridge/makefile.mk	2010-03-05 20:24:42.000000000 +0100
-@@ -35,6 +35,7 @@ PRJNAME=remotebridges
- TARGET = remotebridge.uno
- ENABLE_EXCEPTIONS=TRUE
- COMP1TYPELIST = remotebridge
-+UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb 
- 
- # --- Settings -----------------------------------------------------
- .INCLUDE :  settings.mk
---- remotebridges/source/dynamicloader/makefile.mk.old	2010-02-02 12:49:41.000000000 +0100
-+++ remotebridges/source/dynamicloader/makefile.mk	2010-03-05 20:24:42.000000000 +0100
-@@ -35,6 +35,7 @@ PRJNAME=remotebridges
- TARGET = dynamicloader.uno
- ENABLE_EXCEPTIONS=TRUE
- COMP1TYPELIST = dynamicloader
-+UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb 
- 
- # --- Settings -----------------------------------------------------
- 
---- remotebridges/source/factory/makefile.mk.old	2010-02-02 12:49:41.000000000 +0100
-+++ remotebridges/source/factory/makefile.mk	2010-03-05 20:24:42.000000000 +0100
-@@ -35,6 +35,7 @@ PRJNAME=remotebridges
- TARGET = bridgefac.uno
- ENABLE_EXCEPTIONS=TRUE
- COMP1TYPELIST = brdgfctr
-+UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb 
- 
- # --- Settings -----------------------------------------------------
- .INCLUDE :  settings.mk
---- remotebridges/source/unourl_resolver/makefile.mk.old	2010-02-02 12:49:41.000000000 +0100
-+++ remotebridges/source/unourl_resolver/makefile.mk	2010-03-05 20:24:42.000000000 +0100
-@@ -34,6 +34,7 @@ PRJNAME=remotebridges
- TARGET = uuresolver.uno
- ENABLE_EXCEPTIONS=TRUE
- COMP1TYPELIST = uuresolver
-+UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb 
- 
- # --- Settings -----------------------------------------------------
- 
diff --git a/patches/dev300/piece-reportbuilder.diff b/patches/dev300/piece-reportbuilder.diff
deleted file mode 100644
index 0e4cf7d6f..000000000
--- a/patches/dev300/piece-reportbuilder.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- reportbuilder/util/makefile.mk.old	2010-04-28 11:35:17.000000000 +0200
-+++ reportbuilder/util/makefile.mk	2010-05-11 10:43:42.000000000 +0200
-@@ -129,11 +129,15 @@ $(EXTENSIONDIR)$/%.jar : $(SOLARBINDIR)$
-     @@-$(MKDIRHIER) $(@:d)
-     $(COPY) $< $@
- 
-+$(EXTENSIONDIR)$/%.jar : $(SOLARPIECE)$/$(INPATH)$/bin$/%.jar
-+    @@-$(MKDIRHIER) $(@:d)
-+    $(COPY) $< $@
-+
- $(EXTENSIONDIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.%
-     @@-$(MKDIRHIER) $(@:d)
-     $(COPY) $< $@
- 
--$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
-+$(COMPONENT_IMAGES) : $(SOLARVER)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
-     @@-$(MKDIRHIER) $(@:d)
-     $(COPY) $< $@
- 
diff --git a/patches/dev300/piece-ridljar.diff b/patches/dev300/piece-ridljar.diff
deleted file mode 100644
index c51c8c117..000000000
--- a/patches/dev300/piece-ridljar.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ridljar/javamaker/makefile.mk
-+++ ridljar/javamaker/makefile.mk
-@@ -35,7 +35,7 @@
- 
- .INCLUDE: settings.mk
- 
--RDB = $(SOLARBINDIR)$/udkapi.rdb
-+RDB = $(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb
- 
- .INCLUDE: target.mk
- 
diff --git a/patches/dev300/piece-rsc.diff b/patches/dev300/piece-rsc.diff
deleted file mode 100644
index 9fcbc0694..000000000
--- a/patches/dev300/piece-rsc.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- rsc/source/prj/start.cxx.old	2009-10-19 19:11:30.000000000 +0200
-+++ rsc/source/prj/start.cxx	2009-10-19 20:15:55.000000000 +0200
-@@ -338,10 +338,9 @@ int cdecl main ( int argc, char ** argv)
-     BOOL			bHelp	 = FALSE;
-     BOOL			bError	 = FALSE;
-     BOOL			bResponse = FALSE;
--    ByteString		aSolarbin(getenv("SOLARBINDIR"));
-     ByteString		aDelim("/");
--    ByteString		aPrePro; //( aSolarbin + aDelim + ByteString("rscpp"));
--    ByteString		aRsc2Name; //(  aSolarbin + aDelim + ByteString("rsc2"));
-+    ByteString		aPrePro = ByteString("rscpp");
-+    ByteString		aRsc2Name = ByteString("rsc2");
-     ByteString		aSrsName;
-     ByteString		aResName;
-     RscStrList		aInputList;
-@@ -352,14 +351,6 @@ int cdecl main ( int argc, char ** argv)
-     sal_uInt32		i;
-     ByteString* 	pString;
- 
--    aPrePro = aSolarbin;
--    aPrePro += aDelim;
--    aPrePro += ByteString("rscpp");
--
--    aRsc2Name = aSolarbin;
--    aRsc2Name += aDelim;
--    aRsc2Name += ByteString("rsc2");
--
-     pStr = ::ResponseFile( &aCmdLine, argv, argc );
-     if( pStr )
-     {
diff --git a/patches/dev300/piece-saxon.diff b/patches/dev300/piece-saxon.diff
deleted file mode 100644
index d21e3dd88..000000000
--- a/patches/dev300/piece-saxon.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- saxon/makefile.mk.old	2010-02-02 12:49:41.000000000 +0100
-+++ saxon/makefile.mk	2010-03-05 20:24:05.000000000 +0100
-@@ -54,7 +54,7 @@ TARFILE_ROOTDIR=src
- 
- PATCH_FILES=saxon-9.0.0.7-bj.patch
- 
--BUILD_ACTION=$(ANT) $(ANT_FLAGS) -Dsolarbindir=$(SOLARBINDIR) jar-bj 
-+BUILD_ACTION=$(ANT) $(ANT_FLAGS) -Dsolar.bin=$(SOLARPIECE)$/$(INPATH)$/bin jar-bj
- 
- OUT2CLASS= saxon-build$/9.0.0.7$/bj$/saxon9.jar
- 
diff --git a/patches/dev300/piece-sc.diff b/patches/dev300/piece-sc.diff
deleted file mode 100644
index ea68b9e9f..000000000
--- a/patches/dev300/piece-sc.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- sc/source/ui/vba/makefile.mk.old	2010-03-12 13:56:03.000000000 +0100
-+++ sc/source/ui/vba/makefile.mk	2010-03-12 14:08:23.000000000 +0100
-@@ -128,8 +128,8 @@ ALLTAR : \
- 
- $(SLOFILES) : $(MISC)$/$(TARGET).don
- 
--$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
--        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-+$(MISC)$/$(TARGET).don : $(SPLITINSTALLDIR)$/oovbaapi.rdb
-+        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SPLITINSTALLDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-         echo $@
- 
- .ENDIF
diff --git a/patches/dev300/piece-scp2.diff b/patches/dev300/piece-scp2.diff
deleted file mode 100644
index 7f8b54289..000000000
--- a/patches/dev300/piece-scp2.diff
+++ /dev/null
@@ -1,64 +0,0 @@
---- scp2/prj/build.lst.old	2010-03-05 19:59:27.000000000 +0100
-+++ scp2/prj/build.lst	2010-03-05 20:25:14.000000000 +0100
-@@ -1,4 +1,4 @@
--cp    scp2    :    l10n i18npool setup_native l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
-+cp    scp2    :    soltools PYTHON:python ICU:icu NULL
- cp    scp2                        usr1     -    all    cp_mkout NULL
- cp    scp2\macros                 nmake    -    all    cp_langmacros NULL
- cp    scp2\source\templates       nmake    -    all    cp_langtemplates NULL
---- scp2/source/ooo/makefile.mk.old	2010-03-05 19:59:20.000000000 +0100
-+++ scp2/source/ooo/makefile.mk	2010-03-05 20:25:14.000000000 +0100
-@@ -39,7 +39,11 @@ TARGETTYPE=CUI
- # --- Settings -----------------------------------------------------
- 
- .INCLUDE :  settings.mk
--.INCLUDE :  i18npool/version.mk
-+ISOLANG_TARGET=i18nisolang
-+ISOLANG_MAJOR=1
-+ISOLANG_MINOR=0
-+ISOLANG_MICRO=0
-+ISOLANG_CPP=0
- 
- .IF "$(COM)" == "MSC"
- SCPDEFS+=-D_MSC
-@@ -174,7 +178,17 @@ SCPDEFS+=-DSYSTEM_HUNSPELL
- .IF "$(SYSTEM_REDLAND)" == "YES"
- SCPDEFS+=-DSYSTEM_REDLAND
- .ELSE
--.INCLUDE :  redlandversion.mk
-+RAPTOR_MAJOR=1
-+RAPTOR_MINOR=1
-+RAPTOR_MICRO=0
-+# rasqal has no stable abi
-+RASQAL_MAJOR=1
-+RASQAL_MINOR=0
-+RASQAL_MICRO=0
-+# redland has no stable abi
-+REDLAND_MAJOR=0
-+REDLAND_MINOR=0
-+REDLAND_MICRO=0
- SCPDEFS+=\
-     -DRAPTOR_MAJOR=$(RAPTOR_MAJOR) \
-     -DRASQAL_MAJOR=$(RASQAL_MAJOR) \
-@@ -209,7 +223,9 @@ SCPDEFS+=-DSYSTEM_LUCENE
- .IF "$(SYSTEM_ICU)" == "YES"
- SCPDEFS+=-DSYSTEM_ICU
- .ELSE
--.INCLUDE :  icuversion.mk
-+ICU_MAJOR=4
-+ICU_MINOR=0
-+ICU_MICRO=1
- SCPDEFS+=\
-     -DICU_MAJOR=$(ICU_MAJOR) \
-     -DICU_MINOR=$(ICU_MINOR) \
-@@ -323,8 +339,8 @@ ULFFILES=                          \
- .INCLUDE :  target.mk
- 
- .IF "$(SYSTEM_ICU)" != "YES"
--$(ICUVERSION_DEPENDENT_FILES) : $(SOLARINCDIR)$/icuversion.mk
-+#$(ICUVERSION_DEPENDENT_FILES) : $(SOLARINCDIR)$/icuversion.mk
- .ENDIF
- 
--$(ISOLANGVERSION_DEPENDENT_FILES) : $(SOLARINCDIR)$/i18npool/version.mk
-+# $(ISOLANGVERSION_DEPENDENT_FILES) : $(SOLARINCDIR)$/i18npool/version.mk
- 
diff --git a/patches/dev300/piece-scripting.diff b/patches/dev300/piece-scripting.diff
deleted file mode 100644
index a7037f33d..000000000
--- a/patches/dev300/piece-scripting.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- scripting/source/vbaevents/makefile.mk.old	2010-09-10 19:14:19.000000000 +0200
-+++ scripting/source/vbaevents/makefile.mk	2010-09-10 21:05:42.000000000 +0200
-@@ -87,7 +87,8 @@ ALLTAR : \
- 
- $(SLOFILES) : $(MISC)$/$(TARGET).don
- 
--$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
--        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-+OOVBADIR=$(SOLARPIECE)$/$(INPATH)$/bin
-+$(MISC)$/$(TARGET).don : $(OOVBADIR)$/oovbaapi.rdb
-+        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(OOVBADIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-         echo $@
-  
---- scripting/source/dlgprov/makefile.mk.old	2010-09-01 18:26:16.000000000 +0200
-+++ scripting/source/dlgprov/makefile.mk	2010-09-10 21:05:42.000000000 +0200
-@@ -76,7 +76,8 @@ ALLTAR : \
- 
- $(SLOFILES) : $(MISC)$/$(TARGET).don
- 
--$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
--        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-+OOVBADIR=$(SOLARPIECE)$/$(INPATH)$/bin
-+$(MISC)$/$(TARGET).don : $(OOVBADIR)$/oovbaapi.rdb
-+        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(OOVBADIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-         echo $@
-  
diff --git a/patches/dev300/piece-sdext.diff b/patches/dev300/piece-sdext.diff
deleted file mode 100644
index b073bb774..000000000
--- a/patches/dev300/piece-sdext.diff
+++ /dev/null
@@ -1,38 +0,0 @@
---- sdext/source/presenter/makefile.mk.old	2010-04-28 11:35:17.000000000 +0200
-+++ sdext/source/presenter/makefile.mk	2010-05-11 10:49:19.000000000 +0200
-@@ -293,7 +293,7 @@ $(COMPONENT_BITMAPS) : bitmaps$/$$(@:f)
-     @-$(MKDIRHIER) $(@:d)
-     +$(COPY) $< $@
- 
--$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
-+$(COMPONENT_IMAGES) : $(SOLARVER)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
-     @@-$(MKDIRHIER) $(@:d)
-     $(COPY) $< $@
- 
---- sdext/source/pdfimport/makefile.mk.old	2010-04-28 11:35:17.000000000 +0200
-+++ sdext/source/pdfimport/makefile.mk	2010-05-11 10:49:19.000000000 +0200
-@@ -148,7 +148,7 @@ $(COMPONENT_HELP) : help$/$$(@:f)
-     @@-$(MKDIRHIER) $(@:d)
-     $(COPY) $< $@
- 
--$(COMPONENT_IMAGES) :  $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
-+$(COMPONENT_IMAGES) :  $(SOLARVER)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
-     @@-$(MKDIRHIER) $(@:d)
-     $(COPY) $< $@
- .ENDIF # L10N_framework
---- sdext/source/minimizer/makefile.mk.old	2010-04-28 11:35:17.000000000 +0200
-+++ sdext/source/minimizer/makefile.mk	2010-05-11 10:49:19.000000000 +0200
-@@ -125,11 +125,11 @@ EXTENSION_PACKDEPS=$(COMPONENT_BITMAPS)
- .IF "$(L10N_framework)"==""
- .INCLUDE : extension_post.mk
- 
--$(COMPONENT_BITMAPS) : $(SOLARSRC)$/$(RSCDEFIMG)$/minimizer$/$$(@:f)
-+$(COMPONENT_BITMAPS) : $(SOLARVER)$/$(RSCDEFIMG)$/minimizer$/$$(@:f)
-     @@-$(MKDIRHIER) $(@:d)
-     $(COPY) $< $@
- 
--$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
-+$(COMPONENT_IMAGES) : $(SOLARVER)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
-     @@-$(MKDIRHIER) $(@:d)
-     $(COPY) $< $@
- 
diff --git a/patches/dev300/piece-services.diff b/patches/dev300/piece-services.diff
deleted file mode 100644
index 3f217d60b..000000000
--- a/patches/dev300/piece-services.diff
+++ /dev/null
@@ -1,181 +0,0 @@
-diff -u -r solenv.pristine/bin/make_installer.pl solenv/bin/make_installer.pl
---- solenv.pristine/bin/make_installer.pl	2008-08-13 14:01:56.000000000 +0100
-+++ solenv/bin/make_installer.pl	2008-08-14 15:40:16.000000000 +0100
-@@ -302,6 +302,17 @@
- }
- 
- my $includepatharrayref = installer::converter::convert_stringlist_into_array($includepathref, ",");
-+# search also the ugly pyuno subdir (needed to separate the complex insternal python?)
-+push @{$includepatharrayref}, "$ENV{SOLARPIECE}/$ENV{INPATH}/bin/pyuno";
-+push @{$includepatharrayref}, "$ENV{SOLARPIECE}/$ENV{INPATH}/lib/pyuno";
-+# search also the system directories when registering services
-+if (defined $ENV{OO_BUILD_SERVICES}) {
-+    push @{$includepatharrayref}, "$ENV{SPLITUREDIR}/share/java";
-+    push @{$includepatharrayref}, "$ENV{SPLITINSTALLDIR}/classes";
-+    push @{$includepatharrayref}, "$ENV{SPLITUREDIR}/bin";
-+    push @{$includepatharrayref}, "$ENV{SPLITUREDIR}/lib";
-+    push @{$includepatharrayref}, "$ENV{SPLITINSTALLDIR}";
-+}
- if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allpatharray1.log" ,$includepatharrayref); }
- if (defined $ENV{OO_SOLVERDIR}) {
-     push @{$includepatharrayref}, "$ENV{OO_SOLVERDIR}/bin";
-@@ -893,6 +893,14 @@
- 		}
- 	}
- 
-+    if (defined $ENV{OO_BUILD_SERVICES}) {
-+        installer::logger::print_message( "... creating preregistered services.rdb ...\n" );
-+
-+        installer::servicesfile::create_services_rdb($allvariableshashref, $filesinproductlanguageresolvedarrayref, $includepatharrayref, $languagestringref);
-+        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles14.log", $filesinproductlanguageresolvedarrayref); }
-+    # saving debug info at end
-+        if ( $installer::globals::debug ) { installer::logger::savedebug($installer::globals::exitlog); }
-+
- 	#####################################
- 	# Calls of regmerge
- 	#####################################
-@@ -907,7 +915,15 @@
- 			if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles14b.log", $filesinproductlanguageresolvedarrayref); }
- 		}
- 	}
--	
-+
-+#######################################################
-+# Stopping time
-+#######################################################
-+
-+installer::logger::stoptime();
-+        exit 0;
-+    }
-+
- 	############################################
- 	# Collecting directories for epm list file
- 	############################################
-Only in solenv/bin: make_installer.pl~
-diff -u -r solenv.pristine/bin/modules/installer/archivefiles.pm solenv/bin/modules/installer/archivefiles.pm
---- solenv.pristine/bin/modules/installer/archivefiles.pm	2008-08-13 14:01:56.000000000 +0100
-+++ solenv/bin/modules/installer/archivefiles.pm	2008-08-14 15:44:09.000000000 +0100
-@@ -198,6 +198,8 @@
- 
- 			if ( $installer::globals::dounzip ) { installer::systemactions::create_directory($unzipdir); }	# creating subdirectories with the names of the zipfiles
- 
-+            next if (defined $ENV{OO_BUILD_SERVICES});
-+
-             my $zip = Archive::Zip->new();
-             if ( $zip->read($sourcepath) != AZ_OK )
-             {
-Only in solenv/bin/modules/installer: archivefiles.pm~
-diff -u -r solenv.pristine/bin/modules/installer/scpzipfiles.pm solenv/bin/modules/installer/scpzipfiles.pm
---- solenv.pristine/bin/modules/installer/scpzipfiles.pm	2008-08-13 14:01:56.000000000 +0100
-+++ solenv/bin/modules/installer/scpzipfiles.pm	2008-08-14 13:09:29.000000000 +0100
-@@ -147,7 +147,9 @@
- 			my $onefilename = $onefile->{'Name'};
- 			my $sourcepath = $onefile->{'sourcepath'};
- 
--				next if ($installer::globals::split && $sourcepath eq '');
-+if (!defined $ENV{OO_BUILD_SERVICES}) {
-+            next if ($installer::globals::split && $sourcepath eq '');
-+}
- 			
- 			if ( $onefilename =~ /^\s*\Q$installer::globals::separator\E/ )	# filename begins with a slash, for instance /registry/schema/org/openoffice/VCL.xcs
- 			{
-@@ -165,17 +167,19 @@
- 				installer::systemactions::create_directory_structure($destdir);
- 			}
- 
--			my $copysuccess = installer::systemactions::copy_one_file($sourcepath, $movepath);
--
-+            my $copysuccess;
-+            if (!defined $ENV{OO_BUILD_SERVICES}) {
-+                $copysuccess = installer::systemactions::copy_one_file($sourcepath, $movepath);
- 			if ( $copysuccess )
- 			{
- 				# Now the file can be edited
- 				# ToDo: How about binary patching?
- 
--				my $onefileref = installer::files::read_file($movepath);
-+            my $onefileref = installer::files::read_file($movepath);
- 				replace_all_ziplistvariables_in_file($onefileref, $variableshashref);
- 				installer::files::save_file($destinationpath ,$onefileref);
- 			}
-+            }
- 
- 			# Saving the original source, where the file was found
- 			$onefile->{'originalsourcepath'} = $onefile->{'sourcepath'};
-Only in solenv/bin/modules/installer: scpzipfiles.pm~
-diff -u -r solenv.pristine/bin/modules/installer/scriptitems.pm solenv/bin/modules/installer/scriptitems.pm
---- solenv/bin/modules/installer/scriptitems.pm.old1	2009-10-14 17:19:30.000000000 +0200
-+++ solenv/bin/modules/installer/scriptitems.pm	2009-10-14 17:29:33.000000000 +0200
-@@ -1407,7 +1407,10 @@ sub remove_Files_Without_Sourcedirectory
-                     }
-                 }
-               }
--              next;	# removing this file from list, if sourcepath is empty
-+              if (!defined $ENV{OO_BUILD_SERVICES}) { 
-+                print STDERR "drop file $filename ?\n"; 
-+                next;	# removing this file from list, if sourcepath is empty
-+              }
-             }
-         }
- 
-Only in solenv/bin/modules/installer: scriptitems.pm~
-diff -u -r solenv.pristine/bin/modules/installer/servicesfile.pm solenv/bin/modules/installer/servicesfile.pm
---- solenv.pristine/bin/modules/installer/servicesfile.pm	2008-08-13 14:01:56.000000000 +0100
-+++ solenv/bin/modules/installer/servicesfile.pm	2008-08-14 16:30:39.000000000 +0100
-@@ -138,6 +138,7 @@
-         my $local_error2_occured = 0;
-         
-         my $sourcepath = make_file_url(${$unocomponents}[$i]->{'sourcepath'});
-+    defined $ENV{OO_BUILD_SERVICES} && $sourcepath eq "" && next;
-         my $urlprefix = ${$unocomponents}[$i]->{'NativeServicesURLPrefix'};
-         if (defined($urlprefix))
-         {
-@@ -506,7 +509,12 @@
- 	{
- 		my $filename = $installer::globals::regcompjars[$i];
- 	
--		my $jarfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 1);
-+#		my @includepath;
-+#		for my $foo (@{$includepatharrayref}) { push @includepath, $foo; }
-+#		push @includepath, "$ENV{SPLITUREDIR}/share/java";
-+#		push @includepath, "$ENV{SPLITINSTALLDIR}/classes";
-+#		my $jarfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$filename, \@includepath, 1);
-+        my $jarfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$filename, $includepatharrayref, 1);
- 
- 		if ( $$jarfileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $filename for registering java components!", "prepare_classpath_for_java_registration"); }
- 		
-@@ -881,9 +889,12 @@
- {
- 	my ($allvariableshashref, $filesarrayref, $includepatharrayref, $languagestringref) = @_;
- 
-+
- 	# collecting all services files
- 	my $unocomponentfiles = installer::worker::collect_all_items_with_special_flag($filesarrayref, "UNO_COMPONENT");
- 	$unocomponentfiles = filter_regmergefiles($unocomponentfiles);
-+
-+    print STDERR "foo ! - we have to register this many components: $#{$unocomponentfiles}\n";
- 	
- 	if ( $#{$unocomponentfiles} > -1 )	# not empty -> at least one file with flag UNO_COMPONENT
- 	{
-@@ -893,6 +904,8 @@
- 
- 		$registryfiles = check_defintion_of_databasegids($databasegids, $registryfiles);
- 
-+        print STDERR "foo ! - into this many registries: $#{$registryfiles}\n";
-+
- 		# Now the creation of all files with flag STARREGISTRY can begin
- 		
- 		for ( my $i = 0; $i <= $#{$registryfiles}; $i++ )
-Only in solenv/bin/modules/installer: servicesfile.pm~
---- solenv/bin/modules/installer/systemactions.pm.old	2009-10-22 15:00:22.000000000 +0200
-+++ solenv/bin/modules/installer/systemactions.pm	2009-10-23 16:07:40.000000000 +0200
-@@ -302,7 +302,8 @@ sub create_directories
- 
-     my $path = "";
- 
--    if (( $newdirectory eq "uno" ) || ( $newdirectory eq "zip" ) || ( $newdirectory eq "cab" ) || ( $newdirectory =~ /rdb\s*$/i )) # special handling for zip files, cab files and services file because of performance reasons
-+    # IMPORTANT: do not hadle .rdb files the special way; we need to find them in the normal tree in the split build (they are created in the 2nd stage and installed another way)
-+    if (( $newdirectory eq "uno" ) || ( $newdirectory eq "zip" ) || ( $newdirectory eq "cab" )) # special handling for zip files, cab files and services file because of performance reasons
-     {
-         if ( $installer::globals::temppathdefined ) { $path = $installer::globals::temppath; }
-         else { $path = $installer::globals::unpackpath; }
diff --git a/patches/dev300/piece-setup_native.diff b/patches/dev300/piece-setup_native.diff
deleted file mode 100644
index 049b6a99e..000000000
--- a/patches/dev300/piece-setup_native.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- setup_native/prj/build.lst.old	2009-04-02 13:05:47.000000000 +0200
-+++ setup_native/prj/build.lst	2009-04-08 12:34:02.000000000 +0200
-@@ -1,7 +1,5 @@
- pk	setup_native	:	l10n l10ntools soltools sal xml2cmp NULL
- pk  setup_native                                          usr1    - all  sn_mkout NULL
--pk  setup_native\scripts\source                           nmake   -  u   sn_source NULL
--pk  setup_native\scripts                                  nmake   -  u   sn_scripts sn_source.u NULL
- pk  setup_native\source\mac                               nmake   -  u   sn_mac NULL
- pk  setup_native\source\win32\customactions\tools         nmake   -  w   sn_tools NULL
- pk  setup_native\source\win32\customactions\relnotes      nmake   -  w   sn_relnotes NULL
diff --git a/patches/dev300/piece-solenv.diff b/patches/dev300/piece-solenv.diff
deleted file mode 100644
index b655b4f82..000000000
--- a/patches/dev300/piece-solenv.diff
+++ /dev/null
@@ -1,320 +0,0 @@
---- solenv/bin/modules/installer/setupscript.pm.old	2010-02-02 12:49:41.000000000 +0100
-+++ solenv/bin/modules/installer/setupscript.pm	2010-03-05 20:25:52.000000000 +0100
-@@ -67,10 +67,14 @@ sub set_setupscript_name
-     
-     # and now the complete path for the setup script is needed
-     # The log file cannot be used, because this is the language independent section
--    
--    $scriptnameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$scriptname, $includepatharrayref, 1);
- 
--    $installer::globals::setupscriptname = $$scriptnameref;
-+    if (defined $ENV{OO_SOLVERDIR}) {
-+        $installer::globals::setupscriptname = "$ENV{OO_SOLVERDIR}/bin/$scriptname";
-+    } else {
-+        $scriptnameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$scriptname, $includepatharrayref, 1);
-+
-+        $installer::globals::setupscriptname = $$scriptnameref;
-+    }
- 
-     if ( $installer::globals::setupscriptname eq "" )
-     {
---- solenv/bin/modules/installer/globals.pm.old	2010-02-02 12:49:41.000000000 +0100
-+++ solenv/bin/modules/installer/globals.pm	2010-03-05 20:25:52.000000000 +0100
-@@ -109,7 +109,8 @@ BEGIN
- 
-     $destdir = "";
-     $rootpath = "";
--    
-+
-+    $split = 0;
-     $required_dotnet_version = "2.0.0.0";
-     $productextension = "";
-     @languageproducts = ();
-@@ -536,6 +537,8 @@ BEGIN
-     if ( $plat =~ /solaris/i ) { $issolaris = 1; } 
-     if ( $plat =~ /darwin/i ) { $ismacosx = 1; }
- 
-+    $split = 1 if (defined $ENV{SOLARPIECE});
-+
-     # ToDo: Needs to be expanded for additional platforms
- 
- }
---- solenv/bin/modules/installer/scriptitems.pm.old	2010-12-18 15:04:22.000000000 +0100
-+++ solenv/bin/modules/installer/scriptitems.pm	2010-12-18 15:10:09.000000000 +0100
-@@ -1358,8 +1358,9 @@ sub remove_Files_Without_Sourcedirectory
-             
-             if ( ! ( $styles =~ /\bSTARREGISTRY\b/ ))	# StarRegistry files will be created later
-             {
--                my $filename = $onefile->{'Name'};
--
-+              my $filename = $onefile->{'Name'};
-+              if (! $installer::globals::split) 
-+              {
-                 if ( ! $installer::globals::languagepack && !$installer::globals::helppack)
-                 {
-                     $infoline = "ERROR: Removing file $filename from file list.\n";
-@@ -1368,7 +1369,6 @@ sub remove_Files_Without_Sourcedirectory
-                     push(@missingfiles, "ERROR: File not found: $filename\n");	
-                     $error_occured = 1;
- 
--                    next;	# removing this file from list, if sourcepath is empty
-                 }
-                 elsif ( $installer::globals::languagepack ) # special case for language packs
-                 {
-@@ -1380,7 +1380,6 @@ sub remove_Files_Without_Sourcedirectory
-                         push(@missingfiles, "ERROR: File not found: $filename\n");	
-                         $error_occured = 1;
- 
--                        next;	# removing this file from list, if sourcepath is empty		
-                     }
-                     else
-                     {
-@@ -1389,7 +1388,6 @@ sub remove_Files_Without_Sourcedirectory
-                         $infoline = "INFO: It is not language dependent and can be ignored in language packs.\n";
-                         push( @installer::globals::logfileinfo, $infoline);
- 
--                        next;	# removing this file from list, if sourcepath is empty					
-                     }
-                 }
-                 else # special case for help packs
-@@ -1402,7 +1400,6 @@ sub remove_Files_Without_Sourcedirectory
-                         push(@missingfiles, "ERROR: File not found: $filename\n");	
-                         $error_occured = 1;
- 
--                        next;	# removing this file from list, if sourcepath is empty		
-                     }
-                     else
-                     {
-@@ -1411,9 +1408,10 @@ sub remove_Files_Without_Sourcedirectory
-                         $infoline = "INFO: It is not language dependent and can be ignored in help packs.\n";
-                         push( @installer::globals::logfileinfo, $infoline);
- 
--                        next;	# removing this file from list, if sourcepath is empty					
-                     }
-                 }
-+              }
-+              next;	# removing this file from list, if sourcepath is empty
-             }
-         }
- 
---- solenv/bin/modules/installer/profiles.pm.old	2010-02-02 12:49:41.000000000 +0100
-+++ solenv/bin/modules/installer/profiles.pm	2010-03-05 20:25:52.000000000 +0100
-@@ -91,20 +91,32 @@ sub sorting_profile
- # Adding the newly created profile into the file list
- #####################################################################
- 
-+sub create_blank_profile
-+{
-+    my $profile = shift;
-+
-+    # Taking the base data from the "gid_File_Lib_Vcl"
-+#	my $vclgid = "gid_File_Lib_Vcl";
-+#	if ( $allvariables->{'GLOBALFILEGID'} ) { $vclgid = $allvariables->{'GLOBALFILEGID'}; }
-+#	my $vclfile = installer::existence::get_specified_file($filesarrayref, $vclgid);
-+    # copying all base data	
-+#	installer::converter::copy_item_object($vclfile, \%profile);
-+
-+    # hard-coded defaults instead
-+    $profile->{'ismultilingual'} = 0;
-+    $profile->{'haslanguagemodule'} = 0;
-+    $profile->{'specificlanguage'} = '';
-+    $profile->{'Styles'} = '(PACKED,UNO_COMPONENT)';
-+    $profile->{'RegistryID'} = 'gid_Starregistry_Services_Rdb';
-+}
-+
- sub add_profile_into_filelist
- {
-     my ($filesarrayref, $oneprofile, $completeprofilename, $allvariables) = @_;
- 
-     my %profile = ();
- 
--    # Taking the base data from the "gid_File_Lib_Vcl"
--
--    my $vclgid = "gid_File_Lib_Vcl";
--    if ( $allvariables->{'GLOBALFILEGID'} ) { $vclgid = $allvariables->{'GLOBALFILEGID'}; }
--    my $vclfile = installer::existence::get_specified_file($filesarrayref, $vclgid);
--
--    # copying all base data	
--    installer::converter::copy_item_object($vclfile, \%profile);			
-+    create_blank_profile (\%profile);
- 
-     # and overriding all new values
-     
---- solenv/bin/modules/installer/packagelist.pm.old	2010-02-02 12:49:41.000000000 +0100
-+++ solenv/bin/modules/installer/packagelist.pm	2010-03-05 20:25:52.000000000 +0100
-@@ -533,6 +533,9 @@ sub check_packagelist
-             my $gid =  $onepackage->{'module'};
-             my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$scriptfile, "" , 0);
- 
-+                        if ($$fileref eq "" && $installer::globals::split) {
-+                            $$fileref = $ENV{OO_INSTDIR} . "/solver/bin/" . $scriptfile;
-+                        }
-             if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find script file $scriptfile for module $gid!", "check_packagelist"); }
- 
-             my $infoline = "$gid: Using script file: \"$$fileref\"!\n";
-@@ -683,7 +686,13 @@ sub collectpackages
-             # The file with package information has to be found in path list
-             my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$packinfofile, "" , 0);
- 
--            if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $packinfofile for module $modulegid!", "collectpackages"); }
-+            if ( $$fileref eq "" && $installer::globals::split) {
-+                $$fileref = $ENV{OO_INSTDIR} . "/solver/bin/" . $packinfofile;
-+            }
-+
-+            if ( $$fileref eq "" ) {
-+                installer::exiter::exit_program("ERROR: Could not find file $packinfofile for module $modulegid!", "collectpackages");
-+            }
- 
-             my $infoline = "$modulegid: Using packinfo: \"$$fileref\"!\n";
-             push( @installer::globals::logfileinfo, $infoline);
---- solenv/bin/modules/installer/scpzipfiles.pm.old	2010-02-02 12:49:41.000000000 +0100
-+++ solenv/bin/modules/installer/scpzipfiles.pm	2010-03-05 20:25:52.000000000 +0100
-@@ -146,6 +146,8 @@ sub resolving_scpzip_replace_flag
-             
-             my $onefilename = $onefile->{'Name'};
-             my $sourcepath = $onefile->{'sourcepath'};
-+
-+                next if ($installer::globals::split && $sourcepath eq '');
-             
-             if ( $onefilename =~ /^\s*\Q$installer::globals::separator\E/ )	# filename begins with a slash, for instance /registry/schema/org/openoffice/VCL.xcs
-             {
---- solenv/bin/make_installer.pl.old	2010-02-02 12:49:41.000000000 +0100
-+++ solenv/bin/make_installer.pl	2010-03-05 20:25:52.000000000 +0100
-@@ -305,6 +305,9 @@ if ( $$includepathref eq "" )
- 
- my $includepatharrayref = installer::converter::convert_stringlist_into_array($includepathref, ",");
- if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allpatharray1.log" ,$includepatharrayref); }
-+if (defined $ENV{OO_SOLVERDIR}) {
-+    push @{$includepatharrayref}, "$ENV{OO_SOLVERDIR}/bin";
-+}
- 
- installer::ziplist::replace_all_variables_in_pathes($includepatharrayref, $pathvariableshashref);
- if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allpatharray2.log" ,$includepatharrayref); }
-@@ -897,7 +900,8 @@ for ( my $n = 0; $n <= $#installer::glob
-             # "regcomp" or "regcomp.exe". Therefore this function can only be executed on the
-             # corresponding platform.
- 
--            if ( $installer::globals::servicesrdb_can_be_created )
-+            if ( $installer::globals::servicesrdb_can_be_created &&
-+                 !$installer::globals::split)
-             {
-                 installer::logger::print_message( "... creating preregistered services.rdb ...\n" );
- 
-@@ -1016,7 +1020,7 @@ for ( my $n = 0; $n <= $#installer::glob
-     my $profilesinproductlanguageresolvedarrayref;
-     my $profileitemsinproductlanguageresolvedarrayref;
- 
--    if ((!($installer::globals::is_copy_only_project)) && (!($installer::globals::product =~ /ada/i )) && (!($installer::globals::languagepack)) && (!($installer::globals::helppack)))
-+    if ((!($installer::globals::is_copy_only_project)) && (!($installer::globals::product =~ /ada/i )) && (!($installer::globals::languagepack)) && (!($installer::globals::helppack)) && $ENV{OO_ALLOW_PROFILES})
-     {
-         installer::logger::print_message( "... creating profiles ...\n" );
- 
---- solenv/bin/modules/installer/worker.pm.old	2010-03-05 19:59:19.000000000 +0100
-+++ solenv/bin/modules/installer/worker.pm	2010-03-05 20:25:52.000000000 +0100
-@@ -741,6 +741,17 @@ sub remove_all_items_with_special_flag
-     return \@allitems;
- }
- 
-+# ugly hack, for reasons ~unknown the directory counting
-+# magic fails in split mode ...
-+sub check_create_dir_for_file ($)
-+{
-+    return if (!$installer::globals::split);
-+    my $file = shift;
-+    $file =~ s|/[^/]*$||;
-+    `mkdir -p $file` if (! -d $file);
-+}
-+    
-+
- ###########################################################
- # Mechanism for simple installation without packing
- ###########################################################
-@@ -759,6 +770,7 @@ sub install_simple ($$$$$$)
- 
-     my $destdir = $installer::globals::destdir;
-     my @lines = (); 
-+    my @sources = (); 
- 
-     installer::logger::print_message( "DestDir: $destdir \n" );
-     installer::logger::print_message( "Rootpath: $installer::globals::rootpath \n" );
-@@ -808,11 +820,24 @@ sub install_simple ($$$$$$)
- 
-         push @lines, "$destination\n";
-         # printf "cp $sourcepath $destdir$destination\n";
--        copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $sourcepath -> $destdir$destination $!";
--        my $sourcestat = stat($sourcepath);
--        utime ($sourcestat->atime, $sourcestat->mtime, "$destdir$destination");
--        chmod (oct($unixrights), "$destdir$destination") || die "Can't change permissions: $!";
--         push @lines, "$destination\n";
-+
-+        next if ($installer::globals::split && $sourcepath eq '');
-+
-+        check_create_dir_for_file ("$destdir$destination"); # urgh ...
-+        if (!copy ("$sourcepath", "$destdir$destination")) {
-+            if (-f "$destdir$destination" && ! -w "$destdir$destination") {
-+            print STDERR "skipping existing file: $destdir$destination: $!\n";
-+            } else {
-+            die "Can't copy file '$sourcepath' to '$destdir$destination': $!";
-+            }
-+        } else {
-+            printf "copy file $sourcepath to $destdir$destination\n";
-+            my $sourcestat = stat($sourcepath);
-+            utime ($sourcestat->atime, $sourcestat->mtime, "$destdir$destination");
-+            chmod (oct($unixrights), "$destdir$destination") || die "Can't change permissions: $!";
-+ 		    push @lines, "$destination\n";
-+            push @sources, "$sourcepath\n";
-+        }
-     }
-     
-     for ( my $i = 0; $i <= $#{$linksarray}; $i++ )
-@@ -837,9 +862,15 @@ sub install_simple ($$$$$$)
-         push @lines, "$destination\n";
-     }
- 
--    if ( $destdir ne "" )
--    {
--        my $filelist;
-+    my ($filelist, $fname);
-+    if ( $installer::globals::split ) {
-+        # don't write file lists, just source lists 
-+        $fname = $installer::globals::destdir . "/all_filelist.txt";
-+        open ($filelist, ">>$fname") || die "Can't open $fname: $!";
-+        print $filelist @sources;
-+        close ($filelist);
-+    }
-+    if ($destdir ne "" ) {
-         my $fname = $installer::globals::destdir . "/$packagename";
-         open ($filelist, ">$fname") || die "Can't open $fname: $!";
-         print $filelist @lines;
-@@ -2317,6 +2348,9 @@ sub add_variables_from_inc_to_hashref
-         $includefilename =~ s/^\s*//;
-         $includefilename =~ s/\s*$//;
-         $includefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$includefilename, $includepatharrayref, 1);
-+        if ($$includefilenameref eq "" && $installer::globals::split) {
-+            $$includefilenameref = $ENV{OO_INSTDIR} . "/solver/bin/" . $includefilename;
-+        }
-         if ( $$includefilenameref eq "" ) { installer::exiter::exit_program("Include file $includefilename not found!\nADD_INCLUDE_FILES = $allvariables->{'ADD_INCLUDE_FILES'}", "add_variables_from_inc_to_hashref"); }
- 
-         $infoline = "Including inc file: $$includefilenameref \n";
-@@ -2954,6 +2988,9 @@ sub set_spellcheckerlanguages
- {
-     my ( $productlanguagesarrayref, $allvariables ) = @_;
- 
-+    # short circuit in split mode
-+    return if ($installer::globals::split);
-+
-     my %productlanguages = ();
-     for ( my $i = 0; $i <= $#{$productlanguagesarrayref}; $i++ ) { $productlanguages{${$productlanguagesarrayref}[$i]} = 1;  }
-     
---- solenv/bin/modules/installer/regmerge.pm.old	2010-02-02 12:49:41.000000000 +0100
-+++ solenv/bin/modules/installer/regmerge.pm	2010-03-05 20:25:52.000000000 +0100
-@@ -135,6 +135,9 @@ sub get_regmerge_file
-     else { $searchname = "regcomplazy.exe"; } 
-     
-     my $regmergefileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$searchname, $includepatharrayref, 1);
-+    if ( $$regmergefileref eq "" && $installer::globals::split) {
-+        $$regmergefileref = $ENV{OO_INSTDIR} . "/solver/bin/" . $searchname;
-+    }
-     if ( $$regmergefileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $searchname for merging the StarRegistry!", "get_regmerge_file"); }
-     
-     return $$regmergefileref;
diff --git a/patches/dev300/piece-startup.diff b/patches/dev300/piece-startup.diff
deleted file mode 100644
index d0cdb9826..000000000
--- a/patches/dev300/piece-startup.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- solenv/inc/startup/startup.mk
-+++ solenv/inc/startup/startup.mk
-@@ -30,7 +30,7 @@
- CALLTARGETS=$(MAKETARGETS)
- .ENDIF			# "$(TNR)" == ""
- 
--.INCLUDEDIRS : $(DMAKE_INC) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) $(SOLARENV)$/inc
-+.INCLUDEDIRS : $(DMAKE_INC) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) $(SOLARPIECE)$/$(INPATH)$/inc$(UPDMINOREXT) $(SOLARENV)$/inc
- 
- # Grab key definitions from the environment
- # .IMPORT .IGNORE : OS TMPDIR UPD INPATH OUTPATH GUI COM EX CLASSPATH PRODUCT GUIBASE SOLARENV SOLARVER GUIENV CPU CPUNAME CVER GVER COMPATH LIB INCLUDE TR SORT UNIQ ROOTDIR SED AWK TOUCH IENV ILIB PRODUCT_ENV COMEX UPD BUILD DEVROOT VCL SO3 ENVCFLAGS
diff --git a/patches/dev300/piece-stoc.diff b/patches/dev300/piece-stoc.diff
deleted file mode 100644
index 6d58c3e36..000000000
--- a/patches/dev300/piece-stoc.diff
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -u -r stoc/source/bootstrap/makefile.mk stoc/source/bootstrap/makefile.mk
---- stoc/source/bootstrap/makefile.mk	2008-04-11 12:30:30.000000000 +0100
-+++ stoc/source/bootstrap/makefile.mk	2008-07-17 11:07:27.000000000 +0100
-@@ -35,6 +35,7 @@
- ENABLE_EXCEPTIONS=TRUE
- BOOTSTRAP_SERVICE=TRUE
- COMP1TYPELIST = bootstrap
-+UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb 
- 
- # --- openoffice.org.orig/Settings -----------------------------------------------------
- 
-Only in stoc/source/bootstrap: makefile.mk~
-diff -u -r stoc/source/corereflection/makefile.mk stoc/source/corereflection/makefile.mk
---- stoc/source/corereflection/makefile.mk	2008-04-11 12:34:34.000000000 +0100
-+++ stoc/source/corereflection/makefile.mk	2008-07-17 11:07:55.000000000 +0100
-@@ -34,6 +34,7 @@
- TARGET = reflection.uno
- ENABLE_EXCEPTIONS=TRUE
- COMP1TYPELIST = corefl
-+UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb 
- 
- # --- Settings -----------------------------------------------------
- 
-Only in stoc/source/corereflection: makefile.mk~
-diff -u -r stoc/source/inspect/makefile.mk stoc/source/inspect/makefile.mk
---- stoc/source/inspect/makefile.mk	2008-04-11 12:37:14.000000000 +0100
-+++ stoc/source/inspect/makefile.mk	2008-07-17 11:07:57.000000000 +0100
-@@ -34,6 +34,7 @@
- TARGET = introspection.uno
- ENABLE_EXCEPTIONS=TRUE
- COMP1TYPELIST = insp
-+UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb 
- 
- # --- Settings -----------------------------------------------------
- 
-Only in stoc/source/inspect: makefile.mk~
-diff -u -r stoc/source/invocation/makefile.mk stoc/source/invocation/makefile.mk
---- stoc/source/invocation/makefile.mk	2008-04-11 12:37:52.000000000 +0100
-+++ stoc/source/invocation/makefile.mk	2008-07-17 11:07:58.000000000 +0100
-@@ -34,6 +34,7 @@
- TARGET = invocation.uno
- ENABLE_EXCEPTIONS=TRUE
- COMP1TYPELIST = inv
-+UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb 
- 
- # --- Settings -----------------------------------------------------
- 
-Only in stoc/source/invocation: makefile.mk~
-diff -u -r stoc/source/invocation_adapterfactory/makefile.mk stoc/source/invocation_adapterfactory/makefile.mk
---- stoc/source/invocation_adapterfactory/makefile.mk	2008-04-11 12:38:31.000000000 +0100
-+++ stoc/source/invocation_adapterfactory/makefile.mk	2008-07-17 11:07:59.000000000 +0100
-@@ -34,6 +34,7 @@
- TARGET = invocadapt.uno
- ENABLE_EXCEPTIONS=TRUE
- COMP1TYPELIST = invadp
-+UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb 
- 
- # --- Settings -----------------------------------------------------
- 
-Only in stoc/source/invocation_adapterfactory: makefile.mk~
-diff -u -r stoc/source/javaloader/makefile.mk stoc/source/javaloader/makefile.mk
---- stoc/source/javaloader/makefile.mk	2008-04-11 12:39:07.000000000 +0100
-+++ stoc/source/javaloader/makefile.mk	2008-07-17 11:08:00.000000000 +0100
-@@ -35,6 +35,7 @@
- TARGET = javaloader.uno
- ENABLE_EXCEPTIONS=TRUE
- COMP1TYPELIST = javaloader
-+UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb 
- 
- .IF "$(SOLAR_JAVA)" == "TRUE"
- # --- Settings -----------------------------------------------------
-Only in stoc/source/javaloader: makefile.mk~
-diff -u -r stoc/source/javavm/makefile.mk stoc/source/javavm/makefile.mk
---- stoc/source/javavm/makefile.mk	2008-04-11 12:41:33.000000000 +0100
-+++ stoc/source/javavm/makefile.mk	2008-07-17 11:08:02.000000000 +0100
-@@ -34,6 +34,7 @@
- TARGET = javavm.uno
- ENABLE_EXCEPTIONS=TRUE
- COMP1TYPELIST = jen
-+UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb 
- 
- .IF "$(SOLAR_JAVA)" == "TRUE"
- # --- Settings -----------------------------------------------------
-Only in stoc/source/javavm: makefile.mk~
-diff -u -r stoc/source/namingservice/makefile.mk stoc/source/namingservice/makefile.mk
---- stoc/source/namingservice/makefile.mk	2008-04-11 12:42:27.000000000 +0100
-+++ stoc/source/namingservice/makefile.mk	2008-07-17 11:08:05.000000000 +0100
-@@ -34,6 +34,7 @@
- TARGET = namingservice.uno
- ENABLE_EXCEPTIONS=TRUE
- COMP1TYPELIST = namingservice
-+UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb 
- 
- # --- Settings -----------------------------------------------------
- 
-Only in stoc/source/namingservice: makefile.mk~
-diff -u -r stoc/source/proxy_factory/makefile.mk stoc/source/proxy_factory/makefile.mk
---- stoc/source/proxy_factory/makefile.mk	2008-04-11 12:43:05.000000000 +0100
-+++ stoc/source/proxy_factory/makefile.mk	2008-07-17 11:08:07.000000000 +0100
-@@ -35,6 +35,7 @@
- TARGET = proxyfac.uno
- ENABLE_EXCEPTIONS=TRUE
- COMP1TYPELIST = proxyfac
-+UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb 
- 
- # --- Settings -----------------------------------------------------
- 
-Only in stoc/source/proxy_factory: makefile.mk~
-diff -u -r stoc/source/stocservices/makefile.mk stoc/source/stocservices/makefile.mk
---- stoc/source/stocservices/makefile.mk	2008-04-11 12:54:10.000000000 +0100
-+++ stoc/source/stocservices/makefile.mk	2008-07-17 11:08:08.000000000 +0100
-@@ -34,6 +34,7 @@
- TARGET = stocservices
- ENABLE_EXCEPTIONS=TRUE
- COMP1TYPELIST = stocserv
-+UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb 
- 
- # --- openoffice.org.orig/Settings -----------------------------------------------------
- 
-Only in stoc/source/stocservices: makefile.mk~
diff --git a/patches/dev300/piece-svx.diff b/patches/dev300/piece-svx.diff
deleted file mode 100644
index 02d34acce..000000000
--- a/patches/dev300/piece-svx.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- svx/sdi/makefile.mk.old	2010-02-02 12:49:41.000000000 +0100
-+++ svx/sdi/makefile.mk	2010-03-05 20:09:17.000000000 +0100
-@@ -50,8 +50,8 @@ SVSDI1DEPEND= \
- # --- Files --------------------------------------------------------
- 
- SVSDI1DEPEND= \
--        $(SOLARINCXDIR)$/sfx2/sfx.sdi \
--        $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
-+        $(SOLARPIECE)$/$(INPATH)$/inc$/sfx2/sfx.sdi \
-+        $(SOLARPIECE)$/$(INPATH)$/inc$/sfx2/sfxitems.sdi \
-         svxitems.sdi \
-     fmslots.sdi \
-     svx.sdi	\
---- svx/util/makefile.mk.old	2010-03-05 19:59:26.000000000 +0100
-+++ svx/util/makefile.mk	2010-03-05 20:09:17.000000000 +0100
-@@ -307,7 +307,7 @@ SRSFILELIST=\
-         $(SRS)$/accessibility.srs \
-         $(SRS)$/table.srs \
-         $(SRS)$/toolbars.srs \
--        $(SOLARCOMMONRESDIR)$/sfx.srs
-+        $(SOLARPIECE)$/$(INPATH)$/res$/sfx.srs
- 
- RESLIB1NAME=svx
- RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/svdraw
---- svx/source/src/makefile.mk.old	2010-02-02 12:49:41.000000000 +0100
-+++ svx/source/src/makefile.mk	2010-03-05 20:09:17.000000000 +0100
-@@ -44,8 +44,8 @@ TARGET=ofa
- RES1FILELIST=\
-     $(SRS)$/app.srs \
-     $(SOLARCOMMONRESDIR)$/svtools.srs \
--    $(SOLARCOMMONRESDIR)$/sfx.srs 	\
--    $(SOLARCOMMONRESDIR)$/basic.srs
-+    $(SOLARPIECE)$/$(INPATH)$/res$/sfx.srs \
-+    $(SOLARPIECE)$/$(INPATH)$/res$/basic.srs
- 
- RESLIB1NAME=$(TARGET)
- RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/src
---- svx/uiconfig/layout/layout.mk.old	2010-03-05 19:59:23.000000000 +0100
-+++ svx/uiconfig/layout/layout.mk	2010-03-05 20:09:17.000000000 +0100
-@@ -1,4 +1,4 @@
--TRALAY=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/tralay
-+TRALAY=$(AUGMENT_LIBRARY_PATH) tralay
- XML_DEST=$(DLLDEST)
- XML_LANGS=$(alllangiso)
- 
diff --git a/patches/dev300/piece-swext.diff b/patches/dev300/piece-swext.diff
deleted file mode 100644
index a512ac530..000000000
--- a/patches/dev300/piece-swext.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- swext/mediawiki/makefile.mk.old	2008-04-11 12:05:18.000000000 +0200
-+++ swext/mediawiki/makefile.mk	2008-09-26 15:46:35.000000000 +0200
-@@ -37,10 +37,10 @@ TARGET=mediawiki
- .INCLUDE : ant.mk
- 
- .IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
--COMMONS_CODEC_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-codec-1.3.jar 
--COMMONS_LANG_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-lang-2.3.jar
--COMMONS_HTTPCLIENT_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-httpclient-3.1.jar
--COMMONS_LOGGING_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-logging-1.1.1.jar
-+COMMONS_CODEC_JAR=$(SOLARPIECE)$/$(INPATH)$/bin$/commons-codec-1.3.jar 
-+COMMONS_LANG_JAR=$(SOLARPIECE)$/$(INPATH)$/bin$/commons-lang-2.3.jar
-+COMMONS_HTTPCLIENT_JAR=$(SOLARPIECE)$/$(INPATH)$/bin$/commons-httpclient-3.1.jar
-+COMMONS_LOGGING_JAR=$(SOLARPIECE)$/$(INPATH)$/bin$/commons-logging-1.1.1.jar
- .ELSE
- COMP=fix_system_commons
- .ENDIF
---- swext/mediawiki/build.xml.old	2008-09-26 15:42:00.000000000 +0200
-+++ swext/mediawiki/build.xml	2008-09-26 15:59:01.000000000 +0200
-@@ -61,10 +61,10 @@
-         
-         <!-- build classpath -->
-         <path id="classpath">        
--            <pathelement location="${officeclasses}/juh.jar"/>
--            <pathelement location="${officeclasses}/jurt.jar"/>
--            <pathelement location="${officeclasses}/ridl.jar"/>
--            <pathelement location="${officeclasses}/unoil.jar"/>            
-+            <pathelement location="${split.ure}/share/java/juh.jar"/>
-+            <pathelement location="${split.ure}/share/java/jurt.jar"/>
-+            <pathelement location="${split.ure}/share/java/ridl.jar"/>
-+            <pathelement location="${split.install}/classes/unoil.jar"/>            
-             <!-- 3rd party libs -->
-             <pathelement location="${commons-codec-jar}"/>
-             <pathelement location="${commons-httpclient-jar}"/>
diff --git a/patches/dev300/piece-target.diff b/patches/dev300/piece-target.diff
deleted file mode 100644
index bf5ff531a..000000000
--- a/patches/dev300/piece-target.diff
+++ /dev/null
@@ -1,71 +0,0 @@
-Index: target.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/target.mk,v
-retrieving revision 1.209
-diff -u -p -r1.209 target.mk
---- solenv/inc/target.mk	6 Jun 2008 12:00:28 -0000	1.209
-+++ solenv/inc/target.mk	4 Jul 2008 15:25:03 -0000
-@@ -48,16 +48,16 @@
- INCPRE*=.
- INCPOST*=.
- .IF "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
--UNOINCLUDES=$(SOLARINCDIR)/offuh
-+UNOINCLUDES*=-I$(SOLARINCDIR)/offuh
- .ENDIF			# "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
- SOLARINC+=$(JDKINCS)
- # make sure INCLUDE isn't set
- INCLUDE:=
- .EXPORT : INCLUDE
- .IF "$(PRJINC)"!=""
--INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
-+INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) $(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
- .ELSE		# "$(PRJINC)"!=""
--INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
-+INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) $(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
- .ENDIF		# "$(PRJINC)"!=""
- INCLUDE_C=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
- .EXPORT : LIB
-@@ -218,6 +218,9 @@
- LOCALJARS:=$(foreach,i,$(shell @@-cd $(JARDIR) && ls -1 $(JARFILES) ) $(JARDIR)/$i)
- NEWCLASS:=$(LOCALJARS)
- NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARBINDIR)/$i $(NULL)))
-+NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARPIECE)/$(INPATH)/bin/$i $(NULL)))
-+NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SPLITINSTALLDIR)/classes/$i $(NULL)))
-+NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SPLITUREDIR)/share/java/$i $(NULL)))
- .ENDIF                 # "$(JARFILES)"!=""
- NEWCLASS+=$(EXTRAJARFILES)
- .IF "$(GENJAVACLASSFILES)"!=""
-
-
-Index: unxlng.mk
-===================================================================
---- solenv/inc/unxgcc.mk	(Revision 276754)
-+++ solenv/inc/unxgcc.mk	(Arbeitskopie)
-@@ -199,7 +199,7 @@
- STDLIBCPP=-lstdc++
- 
- # default objectfilenames to link
--STDOBJVCL=$(L)$/salmain.o
-+STDOBJVCL*=$(L)$/salmain.o
- STDOBJGUI=
- STDSLOGUI=
- STDOBJCUI=
---- solenv/inc/settings.mk
-+++ solenv/inc/settings.mk
-@@ -764,6 +764,7 @@
- .ELSE
- SOLARIDLDIR=$(SOLARVERSION)/$(INPATH)/idl$(UPDMINOREXT)
- .ENDIF
-+SOLARIDLINC*=-I$(SOLARIDLDIR)
- 
- #.IF "$(UPDMINOR)" != ""
- #UPDMINOREXT=.$(UPDMINOR)
-@@ -861,7 +861,7 @@
- 
- UNOIDLDEPFLAGS=-Mdepend=$(SOLARVER)
- 
--UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)/inc -I$(PRJ)/$(INPATH)/idl -I$(OUT)/inc -I$(SOLARIDLDIR) -I$(SOLARINCDIR)
-+UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)/inc -I$(PRJ)/$(INPATH)/idl -I$(OUT)/inc $(SOLARIDLINC) -I$(SOLARINCDIR)
- 
- CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -D$(CPUNAME)
- 
diff --git a/patches/dev300/piece-transex3.diff b/patches/dev300/piece-transex3.diff
deleted file mode 100644
index f4a998a7f..000000000
--- a/patches/dev300/piece-transex3.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- solenv/bin/localize.old	2004-08-30 19:29:46.000000000 +0200
-+++ solenv/bin/localize	2008-11-14 17:51:04.000000000 +0100
-@@ -13,8 +13,13 @@ if [ x${SOLARENV}x = xx ]; then
- fi
- 
- if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
--    exec perl -w $SOLARVERSION/$INPATH/bin/localize.pl "$@"
-+    bindir=bin
- else
--    exec perl -w $SOLARVERSION/$INPATH/bin$UPDMINOREXT/localize.pl "$@"
-+    bindir=bin$UPDMINOREXT
- fi
- 
-+if test -f $SOLARVERSION/$INPATH/$bindir/localize.pl ; then
-+    exec perl -w $SOLARVERSION/$INPATH/$bindir/localize.pl "$@"
-+else
-+    exec perl -w $SOLARPIECE/$INPATH/$bindir/localize.pl "$@"
-+fi
---- l10ntools/scripts/localize.pl.old1	2010-02-17 18:05:32.000000000 +0100
-+++ l10ntools/scripts/localize.pl	2010-02-17 18:06:53.000000000 +0100
-@@ -403,7 +403,7 @@ sub merge_gsicheck{
-     close ( $TMPHANDLE );
-     
-     $command = "$ENV{WRAPCMD} " if( $ENV{WRAPCMD} );
--    $command .= "$ENV{SOLARVER}/$ENV{INPATH}/bin/gsicheck";
-+    $command .= "gsicheck";
- 
-     my $errfile = $sdffile.".err";
-     $command .= " -k -c -wcf $tmpfile -wef ".fix_cygwin_path($errfile)." -l \"\" ".fix_cygwin_path($sdffile);
diff --git a/patches/dev300/piece-unoil.diff b/patches/dev300/piece-unoil.diff
deleted file mode 100644
index 3839347e2..000000000
--- a/patches/dev300/piece-unoil.diff
+++ /dev/null
@@ -1,63 +0,0 @@
---- unoil/javamaker/makefile.mk	2008-07-17 11:10:33.000000000 +0100
-+++ unoil/javamaker/makefile.mk	2008-07-17 11:10:33.000000000 +0100
-@@ -35,8 +35,9 @@
- 
- .INCLUDE: settings.mk
- 
--RDB = $(SOLARBINDIR)$/offapi.rdb
--EXTRA_RDB = $(SOLARBINDIR)$/udkapi.rdb
-+RDBDIR=$(SOLARPIECE)$/$(INPATH)$/bin
-+RDB = $(RDBDIR)$/offapi.rdb
-+EXTRA_RDB = $(RDBDIR)$/udkapi.rdb
- 
- .INCLUDE: target.mk
- 
---- unoil/climaker/makefile.mk.old	2008-08-29 16:01:05.000000000 +0200
-+++ unoil/climaker/makefile.mk	2008-08-29 16:13:28.000000000 +0200
-@@ -61,12 +61,12 @@ ALLTAR : \
- 
- .IF "$(ENABLE_MONO_CLIMAKER)" == "YES"
- 
--WRAPCMD=LD_LIBRARY_PATH=$(SOLARLIBDIR)
--CLIMAKER=$(WRAPCMD) $(SOLARBINDIR)$/climaker
-+WRAPCMD=LD_LIBRARY_PATH=$(SOLARPIECE)$/$(INPATH)$/lib
-+CLIMAKER=$(WRAPCMD) $(SOLARPIECE)$/$(INPATH)$/bin$/climaker
- 
- .ELSE
- 
--CLIMAKER=$(WRAPCMD) $(SOLARBINDIR)$/climaker.exe
-+CLIMAKER=$(WRAPCMD) $(SOLARPIECE)$/$(INPATH)$/bin$/climaker.exe
- 
- .ENDIF
- 
-@@ -75,8 +75,8 @@ CLIMAKERFLAGS =
- CLIMAKERFLAGS += --verbose
- .ENDIF
- 
--RDB = $(SOLARBINDIR)$/offapi.rdb
--EXTRA_RDB = $(SOLARBINDIR)$/udkapi.rdb
-+RDB = $(SOLARPIECE)$/$(INPATH)$/bin$/offapi.rdb
-+EXTRA_RDB = $(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb
- 
- EXTERNAL_DIR=$(PRJ)$/..$/external/cli
- 
-@@ -85,8 +85,8 @@ $(BIN)/cli_oootypes.dll : $(RDB) $(EXTRA
- 		--assembly-company "OpenOffice.org" \
- 		--assembly-description "This assembly contains metadata for the StarOffice/OpenOffice.org API." \
- 		-X $(EXTRA_RDB) \
--		-r $(SOLARBINDIR)$/cli_uretypes.dll \
--        --keyfile $(SOLARBINDIR)$/cliuno.snk \
-+        -r $(SOLARPIECE)$/$(INPATH)$/bin$/cli_uretypes.dll \
-+        --keyfile $(SOLARPIECE)$/$(INPATH)$/bin$/cliuno.snk \
- 		$(RDB)
- 		
- 
-@@ -100,7 +100,7 @@ $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_oo
- 	$(GNUCOPY) $(BIN)$/cli_oootypes.config .
- 	$(WRAPCMD) $(AL) -out:$@ \
- 			 -version:$(CLI_OOOTYPES_POLICY_VERSION) \
--			 -keyfile:$(SOLARBINDIR)$/cliuno.snk \
-+             -keyfile:$(SOLARPIECE)$/$(INPATH)$/bin$/cliuno.snk \
- 			 -link:cli_oootypes.config
- 	$(RM) cli_oootypes.config
- 
diff --git a/patches/dev300/piece-vcl.diff b/patches/dev300/piece-vcl.diff
deleted file mode 100644
index 2b7f857af..000000000
--- a/patches/dev300/piece-vcl.diff
+++ /dev/null
@@ -1,119 +0,0 @@
---- vcl/unx/kde/kdedata.cxx.old	2010-06-18 10:32:12.000000000 +0200
-+++ vcl/unx/kde/kdedata.cxx	2010-07-16 11:54:16.000000000 +0200
-@@ -29,7 +29,7 @@
- #include "precompiled_vcl.hxx"
- 
- #define _SV_SALDATA_CXX
--#include <shell/kde_headers.h>
-+#include <vcl/kde_headers.h>
- 
- #include <unistd.h>
- #include <fcntl.h>
---- vcl/unx/kde/salnativewidgets-kde.cxx.old	2010-07-15 21:09:28.000000000 +0200
-+++ vcl/unx/kde/salnativewidgets-kde.cxx	2010-07-16 11:56:01.000000000 +0200
-@@ -29,7 +29,7 @@
- #include "precompiled_vcl.hxx"
- 
- #define _SV_SALNATIVEWIDGETS_KDE_CXX
--#include <shell/kde_headers.h>
-+#include <vcl/kde_headers.h>
- 
- #include <salunx.h>
- #include <saldata.hxx>
---- vcl/inc/vcl/kde_headers.h.old	2010-07-16 11:55:34.000000000 +0200
-+++ vcl/inc/vcl/kde_headers.h	2010-06-18 10:32:12.000000000 +0200
-@@ -0,0 +1,94 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2000, 2010 Oracle and/or its affiliates.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef INCLUDED_VCL_KDE_HEADERS_H
-+#define INCLUDED_VCL_KDE_HEADERS_H
-+
-+/* ********* Suppress warnings if needed */
-+#include "sal/config.h"
-+
-+#if defined __GNUC__
-+#pragma GCC system_header
-+#endif
-+
-+
-+/* ********* Hack, but needed because of conflicting types... */
-+#define Region QtXRegion
-+
-+
-+/* ********* Qt headers */
-+#include <qaccessible.h>
-+#include <qcheckbox.h>
-+#include <qcombobox.h>
-+#include <qfont.h>
-+#include <qframe.h>
-+#include <qlineedit.h>
-+#include <qlistview.h>
-+#include <qmainwindow.h>
-+#include <qmenudata.h>
-+#include <qpaintdevice.h>
-+#include <qpainter.h>
-+#include <qpushbutton.h>
-+#include <qradiobutton.h>
-+#include <qrangecontrol.h>
-+#include <qstring.h>
-+#include <qtabbar.h>
-+#include <qtabwidget.h>
-+#include <qtoolbar.h>
-+#include <qtoolbutton.h>
-+#include <qwidget.h>
-+#include <qprogressbar.h>
-+
-+/* ********* See hack on top of this file */
-+#undef Region
-+
-+
-+/* ********* KDE base headers */
-+#include <kaboutdata.h>
-+#include <kapplication.h>
-+#include <kcmdlineargs.h>
-+#include <kconfig.h>
-+#include <kdeversion.h>
-+#include <kemailsettings.h>
-+#include <kglobal.h>
-+#include <kglobalsettings.h>
-+#include <klocale.h>
-+#include <kmainwindow.h>
-+#include <kmenubar.h>
-+#include <kprotocolmanager.h>
-+#include <kstartupinfo.h>
-+#include <kstyle.h>
-+
-+
-+/* ********* KDE address book connectivity headers */
-+#include <kabc/addressbook.h>
-+#include <kabc/addressee.h>
-+#include <kabc/field.h>
-+#include <kabc/stdaddressbook.h>
-+
-+
-+#endif
diff --git a/patches/dev300/piece-writerfilter.diff b/patches/dev300/piece-writerfilter.diff
deleted file mode 100644
index 4b38bf64b..000000000
--- a/patches/dev300/piece-writerfilter.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- writerfilter/source/ooxml/makefile.mk.old	2009-11-11 14:11:08.000000000 +0100
-+++ writerfilter/source/ooxml/makefile.mk	2009-11-11 14:35:37.000000000 +0100
-@@ -183,8 +183,8 @@ GENERATEDFILES= \
-     $(TOKENXMLTMP) \
-     $(TOKENXML)
- 
--$(TOKENXMLTMP): $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token.txt
--    @$(TYPE) $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token.txt | $(SED) "s#\(.*\)#<fasttoken>\1</fasttoken>#" > $@
-+$(TOKENXMLTMP): $(SOLARPIECE)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token.txt
-+    @$(TYPE) $(SOLARPIECE)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token.txt | $(SED) "s#\(.*\)#<fasttoken>\1</fasttoken>#" > $@
- 
- $(TOKENXML): tokenxmlheader $(TOKENXMLTMP) tokenxmlfooter
- 	@$(TYPE) tokenxmlheader $(TOKENXMLTMP) tokenxmlfooter > $@
---- writerfilter/source/resourcemodel/makefile.mk.old	2010-07-20 14:46:24.000000000 +0200
-+++ writerfilter/source/resourcemodel/makefile.mk	2010-07-20 15:52:06.000000000 +0200
-@@ -132,7 +132,7 @@ SPRMIDSHXX=$(DOCTOKHXXOUTDIR)$/sprmids.h
- OOXMLRESOURCEIDSHXX=$(OOXMLHXXOUTDIR)$/resourceids.hxx
- 
- NSXSL=$(MISC)$/namespacesmap.xsl
--NAMESPACESTXT=$(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/namespaces.txt
-+NAMESPACESTXT=$(SOLARPIECE)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/namespaces.txt
- 
- GENERATEDHEADERS=$(DOCTOKRESOURCEIDSHXX) $(OOXMLRESOURCEIDSHXX) $(SPRMIDSHXX)
- GENERATEDFILES= \
diff --git a/patches/dev300/piece-xmerge.diff b/patches/dev300/piece-xmerge.diff
deleted file mode 100644
index aca6e171b..000000000
--- a/patches/dev300/piece-xmerge.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -purN xmerge.old/source/bridge/build.xml xmerge/source/bridge/build.xml
---- xmerge.old/source/bridge/build.xml	2010-07-22 13:12:44.000000000 +0200
-+++ xmerge/source/bridge/build.xml	2010-08-03 17:29:47.000000000 +0200
-@@ -34,10 +34,10 @@
- 
-     <path id="classpath">
-         <pathelement location="${build.dir}/xmerge.jar"/>
--        <pathelement location="${solar.jar}/unoil.jar"/>
--        <pathelement location="${solar.jar}/ridl.jar"/>
--        <pathelement location="${solar.jar}/jurt.jar"/>
--        <pathelement location="${solar.jar}/juh.jar"/>
-+        <pathelement location="${split.install}/classes/unoil.jar"/>
-+        <pathelement location="${split.ure}/share/java/ridl.jar"/>
-+        <pathelement location="${split.ure}/share/java/jurt.jar"/>
-+        <pathelement location="${split.ure}/share/java/juh.jar"/>
-     </path>
- 
- 
-diff -purN xmerge.old/source/xmerge/build.xml xmerge/source/xmerge/build.xml
---- xmerge.old/source/xmerge/build.xml	2010-07-22 13:12:44.000000000 +0200
-+++ xmerge/source/xmerge/build.xml	2010-08-03 17:29:35.000000000 +0200
-@@ -39,10 +39,10 @@
-     <path id="classpath">
-         <pathelement location="${env.XML_APIS_JAR}"/>
-         <pathelement location="${env.XERCES_JAR}"/>
--        <pathelement location="${solar.jar}/unoil.jar"/>
--        <pathelement location="${solar.jar}/ridl.jar"/>
--        <pathelement location="${solar.jar}/jurt.jar"/>
--        <pathelement location="${solar.jar}/juh.jar"/>
-+        <pathelement location="${split.install}/classes/unoil.jar"/>
-+        <pathelement location="${split.ure}/share/java/ridl.jar"/>
-+        <pathelement location="${split.ure}/share/java/jurt.jar"/>
-+        <pathelement location="${split.ure}/share/java/juh.jar"/>
-     </path>
- 
- 
-diff -purN xmerge.old/util/build.xml xmerge/util/build.xml
---- xmerge.old/util/build.xml	2010-07-22 13:12:44.000000000 +0200
-+++ xmerge/util/build.xml	2010-08-03 17:30:02.000000000 +0200
-@@ -37,10 +37,10 @@
-     <path id="classpath">
-         <pathelement location="${env.XML_APIS_JAR}"/>
-         <pathelement location="${env.XERCES_JAR}"/>
--        <pathelement location="${solar.jar}/unoil.jar"/>
--        <pathelement location="${solar.jar}/ridl.jar"/>
--        <pathelement location="${solar.jar}/jurt.jar"/>
--        <pathelement location="${solar.jar}/juh.jar"/>    
-+        <pathelement location="${split.install}/classes/unoil.jar"/>
-+        <pathelement location="${split.ure}/share/java/ridl.jar"/>
-+        <pathelement location="${split.ure}/share/java/jurt.jar"/>
-+        <pathelement location="${split.ure}/share/java/juh.jar"/>    
-         <pathelement location="${build.dir}/xmerge.jar"/>
-     </path>
-