incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1293264 [2/4] - in /incubator/ooo/branches/alg/install: ./ ext_libraries/apr-util/ ext_libraries/apr-util/prj/ ext_libraries/apr/ ext_libraries/apr/prj/ ext_libraries/serf/ ext_libraries/serf/prj/ main/ main/accessibility/workben/ main/acc...
Date Fri, 24 Feb 2012 14:14:39 GMT
Modified: incubator/ooo/branches/alg/install/main/i18npool/source/collator/data/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/i18npool/source/collator/data/makefile.mk?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/i18npool/source/collator/data/makefile.mk (original)
+++ incubator/ooo/branches/alg/install/main/i18npool/source/collator/data/makefile.mk Fri Feb 24 14:14:33 2012
@@ -54,5 +54,7 @@ $(MISC)$/collator_%.cxx : %.txt
     $(AUGMENT_LIBRARY_PATH) $(BIN)$/gencoll_rule $< $@ $*
 
 # ugly - is this dependency really required here?
+.IF "$(GUI)" != "OS2"
 $(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/gencoll_rule$(EXECPOST)
+.ENDIF
 

Modified: incubator/ooo/branches/alg/install/main/i18npool/source/collator/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/i18npool/source/collator/makefile.mk?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/i18npool/source/collator/makefile.mk (original)
+++ incubator/ooo/branches/alg/install/main/i18npool/source/collator/makefile.mk Fri Feb 24 14:14:33 2012
@@ -34,7 +34,11 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Files --------------------------------------------------------
 
+.IF "$(GUI)" == "OS2"
+txtlist:=$(shell @cd data > $(NULLDEV) && ls *.txt)
+.ELSE
 txtlist:=$(shell @cd data >& $(NULLDEV) && ls *.txt)
+.ENDIF
 LOCAL_RULE_LANGS:=$(uniq $(foreach,i,$(txtlist) $(i:s/-/_/:s/_/ /:1)))
 rules_dependencies:=$(foreach,i,$(txtlist) data$/$i) $(INCCOM)$/lrl_include.hxx
 
@@ -65,5 +69,9 @@ $(rules_obj) : $(rules_dependencies)
 
 $(INCCOM)$/lrl_include.hxx: $(foreach,i,$(txtlist) data$/$i)
 	@@$(RM) $@
+.IF "$(GUI)" == "OS2"
+	@echo $(EMQ)#define LOCAL_RULE_LANGS $(EMQ)"$(LOCAL_RULE_LANGS)$(EMQ)" > $@
+.ELSE
 	@echo $(EMQ)#define LOCAL_RULE_LANGS $(EMQ)"$(LOCAL_RULE_LANGS)$(EMQ)" >& $@
+.ENDIF
 

Modified: incubator/ooo/branches/alg/install/main/i18npool/source/indexentry/data/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/i18npool/source/indexentry/data/makefile.mk?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/i18npool/source/indexentry/data/makefile.mk (original)
+++ incubator/ooo/branches/alg/install/main/i18npool/source/indexentry/data/makefile.mk Fri Feb 24 14:14:33 2012
@@ -57,5 +57,7 @@ $(MISC)$/%.cxx : %.txt
     $(AUGMENT_LIBRARY_PATH) $(BIN)$/genindex_data $< $@ $*
 
 # ugly - is this dependency really required here?
+.IF "$(GUI)" != "OS2"
 $(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/genindex_data$(EXECPOST)
+.ENDIF
 

Modified: incubator/ooo/branches/alg/install/main/i18npool/source/localedata/data/locale.dtd
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/i18npool/source/localedata/data/locale.dtd?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/i18npool/source/localedata/data/locale.dtd (original)
+++ incubator/ooo/branches/alg/install/main/i18npool/source/localedata/data/locale.dtd Fri Feb 24 14:14:33 2012
@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<!--***********************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ ***********************************************************-->
 <!-- ............................................................... -->
 <!-- Locale data specification DTD ................................. -->
 <!-- ............................................................... -->

Modified: incubator/ooo/branches/alg/install/main/i18npool/source/search/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/i18npool/source/search/makefile.mk?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/i18npool/source/search/makefile.mk (original)
+++ incubator/ooo/branches/alg/install/main/i18npool/source/search/makefile.mk Fri Feb 24 14:14:33 2012
@@ -48,7 +48,11 @@ EXCEPTIONSNOOPTFILES= \
         $(SLO)$/textsearch.obj
 .ENDIF
 
+.IF "$(GUI)" == "OS2"
+SHL1TARGET= i18nsear
+.ELSE
 SHL1TARGET= $(TARGET)
+.ENDIF
 SHL1OBJS=	$(SLOFILES)
 
 SHL1STDLIBS= \

Modified: incubator/ooo/branches/alg/install/main/i18npool/source/search/textsearch.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/i18npool/source/search/textsearch.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/i18npool/source/search/textsearch.cxx (original)
+++ incubator/ooo/branches/alg/install/main/i18npool/source/search/textsearch.cxx Fri Feb 24 14:14:33 2012
@@ -720,7 +720,11 @@ void TextSearch::RESrchPrepare( const ::
 		nIcuSearchFlags |= UREGEX_CASE_INSENSITIVE;
 	UErrorCode nIcuErr = U_ZERO_ERROR;
 	// assumption: transliteration didn't mangle regexp control chars
+#ifdef OS2
+	IcuUniString aIcuSearchPatStr( (const UChar*)rPatternStr.getStr(), rPatternStr.getLength());
+#else
 	IcuUniString aIcuSearchPatStr( rPatternStr.getStr(), rPatternStr.getLength());
+#endif
 #if 1
 	// for conveniance specific syntax elements of the old regex engine are emulated
 	// by using regular word boundary matching \b to replace \< and \>
@@ -752,7 +756,11 @@ SearchResult TextSearch::RESrchFrwrd( co
 
 	// use the ICU RegexMatcher to find the matches
 	UErrorCode nIcuErr = U_ZERO_ERROR;
+#ifdef OS2
+	const IcuUniString aSearchTargetStr( (const UChar*)searchStr.getStr(), endPos);
+#else
 	const IcuUniString aSearchTargetStr( searchStr.getStr(), endPos);
+#endif
 	pRegexMatcher->reset( aSearchTargetStr);
 	// search until there is a valid match
 	for(;;)
@@ -802,7 +810,11 @@ SearchResult TextSearch::RESrchBkwrd( co
 	// TODO: use ICU's backward searching once it becomes available
 	//       as its replacement using forward search is not as good as the real thing
 	UErrorCode nIcuErr = U_ZERO_ERROR;
+#ifdef OS2
+	const IcuUniString aSearchTargetStr( (const UChar*)searchStr.getStr(), startPos);
+#else
 	const IcuUniString aSearchTargetStr( searchStr.getStr(), startPos);
+#endif
 	pRegexMatcher->reset( aSearchTargetStr);
 	if( !pRegexMatcher->find( endPos, nIcuErr))
 		return aRet;

Modified: incubator/ooo/branches/alg/install/main/i18npool/source/textconversion/data/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/i18npool/source/textconversion/data/makefile.mk?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/i18npool/source/textconversion/data/makefile.mk (original)
+++ incubator/ooo/branches/alg/install/main/i18npool/source/textconversion/data/makefile.mk Fri Feb 24 14:14:33 2012
@@ -58,5 +58,7 @@ $(MISC)$/%.cxx : %.dic
 	$(AUGMENT_LIBRARY_PATH) $(BIN)$/genconv_dict $* $< $@
 
 # ugly - is this dependency really required here?
+.IF "$(GUI)" != "OS2"
 $(foreach,i,$(shell @$(FIND) . -name "*.dic") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/genconv_dict$(EXECPOST)
+.ENDIF
 

Modified: incubator/ooo/branches/alg/install/main/i18npool/util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/i18npool/util/makefile.mk?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/i18npool/util/makefile.mk (original)
+++ incubator/ooo/branches/alg/install/main/i18npool/util/makefile.mk Fri Feb 24 14:14:33 2012
@@ -47,7 +47,11 @@ LIB1FILES=	$(SLB)$/defaultnumberingprovi
 		$(SLB)$/textconversion.lib \
 		$(SLB)$/ordinalsuffix.lib
 
+.IF "$(GUI)" == "OS2"
+SHL1TARGET= i18npool
+.ELSE
 SHL1TARGET= $(TARGET)
+.ENDIF
 # WNT needs implib name even if there is none
 SHL1IMPLIB= i$(SHL1TARGET)
 

Modified: incubator/ooo/branches/alg/install/main/l10ntools/java/jpropex/jpropex
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/l10ntools/java/jpropex/jpropex?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/l10ntools/java/jpropex/jpropex (original)
+++ incubator/ooo/branches/alg/install/main/l10ntools/java/jpropex/jpropex Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
 #!/bin/sh
+# *************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+# *************************************************************
 if [ x${SOLARENV}x = xx ]; then
     echo No environment found, please use 'configure' or 'setsolar'
     exit 1

Modified: incubator/ooo/branches/alg/install/main/migrationanalysis/src/resources/analysis.dtd
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/migrationanalysis/src/resources/analysis.dtd?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/migrationanalysis/src/resources/analysis.dtd (original)
+++ incubator/ooo/branches/alg/install/main/migrationanalysis/src/resources/analysis.dtd Fri Feb 24 14:14:33 2012
@@ -1,3 +1,23 @@
+<!--***********************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ ***********************************************************-->
 <!ELEMENT results ( document+ ) >
 <!ATTLIST results generated-by NMTOKEN #REQUIRED >
 <!ATTLIST results version CDATA #REQUIRED >

Modified: incubator/ooo/branches/alg/install/main/nss/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/nss/makefile.mk?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/nss/makefile.mk (original)
+++ incubator/ooo/branches/alg/install/main/nss/makefile.mk Fri Feb 24 14:14:33 2012
@@ -150,7 +150,7 @@ EXT_USE_STLPORT=TRUE
 #To build nss one has to call "make nss_build_all" in 
 #mozilla/security/nss
 NSS_BUILD_DIR= $(subst,\,/ $(PWD)/$(MISC)/build/$(TARFILE_ROOTDIR)/mozilla/security/nss)
-BUILD_ACTION= PATH="$(moz_build)/msys/bin:$(moz_build)/moztools/bin:$(PATH)" && $(subst,/,$/ $(MOZILLABUILD)/msys/bin/bash) -i \
+BUILD_ACTION= PATH="$(PATH):$(moz_build)/msys/bin:$(moz_build)/moztools/bin" && $(subst,/,$/ $(MOZILLABUILD)/msys/bin/bash) -i \
 	-c "cd $(NSS_BUILD_DIR) && make nss_build_all"
 
 OUT2LIB= \

Modified: incubator/ooo/branches/alg/install/main/odk/setsdkenv_unix
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/odk/setsdkenv_unix?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/odk/setsdkenv_unix (original)
+++ incubator/ooo/branches/alg/install/main/odk/setsdkenv_unix Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
 #! /bin/sh
+# *************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+# *************************************************************
 
 OSTYPE=`uname -s`
 HOSTNAME=`hostname`

Modified: incubator/ooo/branches/alg/install/main/oowintool
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/oowintool?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/oowintool (original)
+++ incubator/ooo/branches/alg/install/main/oowintool Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
 #!/usr/bin/perl -w
+# *************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+# *************************************************************
 
 use File::Copy;
 

Modified: incubator/ooo/branches/alg/install/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/postprocess/packcomponents/makefile.mk?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/branches/alg/install/main/postprocess/packcomponents/makefile.mk Fri Feb 24 14:14:33 2012
@@ -153,6 +153,7 @@ my_components = \
     tvhlp1 \
     ucb1 \
     ucpchelp1 \
+    ucpdav1 \
     ucpexpand1 \
     ucpext \
     ucpfile1 \
@@ -162,7 +163,6 @@ my_components = \
     ucptdoc1 \
     updatefeed \
     updchk \
-    updchk.uno \
     utl \
     uui \
     vbaevents \
@@ -186,6 +186,10 @@ my_components += component/vcl/vcl.unx
 .ENDIF
 .ENDIF
 
+.IF "$(ENABLE_ONLINE_UPDATE)"=="YES"
+my_components += updchk.uno
+.END
+
 .IF "$(BUILD_SPECIAL)" != ""
 my_components += oooimprovement
 .END
@@ -215,10 +219,6 @@ my_components +=     wpft
 my_components += emboleobj
 .END
 
-.IF "$(SYSTEM_NEON)" == "YES"
-my_components += ucpdav1
-.END
-
 .IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
 my_components += cairocanvas
 .END

Modified: incubator/ooo/branches/alg/install/main/postprocess/packregistry/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/postprocess/packregistry/makefile.mk?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/postprocess/packregistry/makefile.mk (original)
+++ incubator/ooo/branches/alg/install/main/postprocess/packregistry/makefile.mk Fri Feb 24 14:14:33 2012
@@ -42,7 +42,6 @@ MY_XCDS = \
     $(MISC)/lingucomponent.xcd \
     $(MISC)/main.xcd \
     $(MISC)/math.xcd \
-    $(MISC)/onlineupdate.xcd \
     $(MISC)/oooimprovement.xcd \
     $(MISC)/palm.xcd \
     $(MISC)/pocketexcel.xcd \
@@ -51,6 +50,10 @@ MY_XCDS = \
     $(MISC)/w4w.xcd \
     $(MISC)/writer.xcd \
     $(MISC)/xsltfilter.xcd
+.IF "$(ENABLE_ONLINE_UPDATE)" == "YES"
+MY_XCDS += \
+    $(MISC)/onlineupdate.xcd
+.END
 
 MY_DEPS_base = main
 MY_FILES_base = \

Modified: incubator/ooo/branches/alg/install/main/pyuno/source/module/pyuno
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/pyuno/source/module/pyuno?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/pyuno/source/module/pyuno (original)
+++ incubator/ooo/branches/alg/install/main/pyuno/source/module/pyuno Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
 # The bootstrap variable PYUNOLIBDIR will be set by the pyuno runtime library
+# *************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+# *************************************************************
 PYUNO_BINPATH=$PYUNOLIBDIR/../bin$UPDMINOREXT
 UNO_TYPES=$PYUNO_BINPATH/types.rdb
 UNO_SERVICES=$PYUNO_BINPATH/pyuno_services.rdb

Modified: incubator/ooo/branches/alg/install/main/rat-excludes
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/rat-excludes?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/rat-excludes (original)
+++ incubator/ooo/branches/alg/install/main/rat-excludes Fri Feb 24 14:14:33 2012
@@ -1,55 +1,32 @@
 ext_sources/
 extras/
-**/*.0
-**/*.1
-**/*.123
 **/*.add
 **/*.all
 **/*.am
-**/*.applescript
 **/*.applications
-**/*.asm
-**/*.asp
 **/*.attr
 **/*.autotools
-**/*.awk
-**/*.bak
-**/*.bas
-**/*.bat
-**/*.bau
-**/*.bck
 **/*.bmp
-**/*.bsh
 **/*.btm
-**/*.cfg
 **/*.cgm
 **/*.chd
 **/*.cl
 **/*.class
 **/*.cls
-**/*.cmd
 **/*.cmn
 **/*.common
 **/*.component
 **/*.components
-**/*.conf
-**/*.config
 **/*.crl
 **/*.crt
-**/*.csv
 **/*.cur
-**/*.dat
 **/*.db
 **/*.dbf
 **/*.dbt
 **/*.DCA
 **/*.def
-**/*.default
-**/*.desktop
 **/*.dfm
 **/*.dic
-**/*.DIF
-**/*.diff
 **/*.dir
 **/*.directory
 **/*.dlg
@@ -86,8 +63,6 @@ extras/
 **/*.hgignore
 **/*.hgtags
 **/*.hid
-**/*.htm
-**/*.html
 **/*.hwp
 **/*.icns
 **/*.ico
@@ -96,7 +71,6 @@ extras/
 **/*.in
 **/*.infile
 **/*.info
-**/*.ini
 **/*.jar
 **/*.jcb
 **/*.jcs
@@ -127,7 +101,6 @@ extras/
 **/*.mf
 **/*.mime
 **/*.mingw
-**/*.mk
 **/*.mod
 **/*.mov
 **/*.nbattrs
@@ -143,7 +116,6 @@ extras/
 **/*.odp
 **/*.ods
 **/*.odt
-**/*.ooo_build
 **/*.org-debian-menus
 **/*.orig
 **/*.otp
@@ -161,7 +133,6 @@ extras/
 **/*.pdf
 **/*.pem
 **/*.pgm
-**/*.pl
 **/*.plist
 **/*.pln
 **/*.pm
@@ -170,15 +141,11 @@ extras/
 **/*.policy
 **/*.ppm
 **/*.ppt
-**/*.prj
-**/*.properties
-**/*.props
 **/*.PS
 **/*.psd
 **/*.psw
 **/*.ptr
 **/*.py
-**/*.r
 **/*.ras
 **/*.rdb
 **/*.rdf
@@ -204,12 +171,10 @@ extras/
 **/*.sds
 **/*.sdv
 **/*.sdw
-**/*.sed
 **/*.settings
 **/*.sfd
 **/*.sgf
 **/*.sgv
-**/*.sh
 **/*.sid
 **/*.skl
 **/*.slk
@@ -223,7 +188,6 @@ extras/
 **/*.sog
 **/*.soh
 **/*.spec
-**/*.sql
 **/*.srs
 **/*.stc
 **/*.strings
@@ -239,7 +203,6 @@ extras/
 **/*.sxw
 **/*.tab
 **/*.tail
-**/*.tcsh
 **/*.template
 **/*.tests
 **/*.tga
@@ -250,11 +213,9 @@ extras/
 **/*.tpt
 **/*.tree
 **/*.ttf
-**/*.txt
 **/*.types
 **/*.unx
 **/*.url
-**/*.vb
 **/*.vbp
 **/*.vbproj
 **/*.vbs
@@ -272,12 +233,9 @@ extras/
 **/*.wps
 **/*.wsc
 **/*.wsf
-**/*.xba
 **/*.xbm
 **/*.xcd
 **/*.xcl
-**/*.xcs
-**/*.xcu
 **/*.xdl
 **/*.xhp
 **/*.xlb
@@ -290,13 +248,352 @@ extras/
 **/*.xltm
 **/*.xltx
 **/*.xmi
-**/*.xml
 **/*.xpm
 **/*.xrm
 **/*.xsce
-**/*.xsd
-**/*.xsl
-**/*.xslt
 **/*.zip
 **/*.zuml
 
+main/accessibility/bridge/org/openoffice/accessibility/manifest
+main/accessibility/prj/l10n
+main/accessibility/workben/TODO
+main/accessibility/workben/org/openoffice/accessibility/awb/manifest
+
+main/afms/delzip
+
+main/automation/prj/l10n
+main/avmedia/source/java/manifest
+
+main/bean/util/delzip
+main/binfilter/no_localization
+main/binfilter/prj/l10n
+main/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/manifest
+
+main/cairo/cairo/dummy_pkg_config
+
+main/cli_ure/source/basetypes/cli_basetypes_config
+main/cli_ure/source/native/cli_cppuhelper_config
+main/cli_ure/source/ure/cli_ure_config
+main/cli_ure/unotypes/cli_uretypes_config
+
+main/configmgr/qa/unit/no_localization
+
+main/cppuhelper/qa/propertysetmixin/manifest
+main/desktop/scripts/basis-link
+main/desktop/scripts/odf-basis-link
+main/desktop/scripts/so-basis-link
+main/desktop/scripts/ure-link
+main/desktop/test/deployment/active/MANIFEST.MF
+main/desktop/test/deployment/locationtest/MANIFEST.MF
+main/desktop/test/deployment/locationtest/delzip
+main/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/MANIFEST.MF
+main/desktop/test/deployment/passive/MANIFEST.MF
+main/desktop/test/deployment/update/updateinfocreation/build/MANIFEST.MF
+main/desktop/test/deployment/update/updateinfocreation/build/delzip
+main/desktop/zipintro/delzip
+
+main/embeddedobj/prj/l10n
+
+main/embedserv/source/inc/stdafx.h
+
+main/extensions/source/macosx/spotlight/delzip
+main/extras/source/autotext/delzip
+main/extras/source/autotext/lang/delzip
+main/extras/source/database/delzip
+main/extras/source/gallery/bullets/delzip
+main/extras/source/gallery/delzip
+main/extras/source/gallery/gallery_sound/delzip
+main/extras/source/gallery/gallery_system/delzip
+main/extras/source/gallery/htmlexpo/delzip
+main/extras/source/gallery/rulers/delzip
+main/extras/source/gallery/sounds/delzip
+main/extras/source/gallery/www-back/delzip
+main/extras/source/gallery/www-graf/delzip
+main/extras/source/misc_config/delzip
+main/extras/source/palettes/delzip
+main/extras/source/palettes/lang/delzip
+main/extras/source/symbols/delzip
+main/extras/source/templates/lang/delzip
+main/extras/source/templates/layout/lang/delzip
+main/extras/source/templates/presnt/lang/delzip
+main/extras/source/templates/wizard/agenda/lang/delzip
+main/extras/source/templates/wizard/bitmap/delzip
+main/extras/source/templates/wizard/desktop/delzip
+main/extras/source/templates/wizard/desktop/lang/delzip
+main/extras/source/templates/wizard/fax/lang/delzip
+main/extras/source/templates/wizard/letter/lang/delzip
+main/extras/source/templates/wizard/report/lang/delzip
+main/extras/source/templates/wizard/styles/lang/delzip
+main/extras/source/templates/wizard/web/lang/delzip
+main/extras/source/wordbook/delzip
+main/extras/source/wordbook/lang/delzip
+main/extras/unx/source/bitmaps/delzip
+main/extras/unx/source/kde/applnk/delzip
+main/extras/unx/source/kde/icons/delzip
+main/extras/unx/source/kde/icons/mini/delzip
+main/extras/unx/source/kde/mimelnk/application/delzip
+main/extras/unx/source/kde/mimelnk/text/delzip
+main/filter/source/config/fragments/delzip
+
+main/filter/source/xsltfilter/Manifest
+main/filter/source/xsltvalidate/Manifest
+
+main/helpcontent2/source/auxiliary/no_localization
+main/helpcontent2/util/delzip
+main/helpcontent2/util/sbasic/delzip
+main/helpcontent2/util/scalc/delzip
+main/helpcontent2/util/schart/delzip
+main/helpcontent2/util/sdatabase/delzip
+main/helpcontent2/util/sdraw/delzip
+main/helpcontent2/util/shared/delzip
+main/helpcontent2/util/simpress/delzip
+main/helpcontent2/util/smath/delzip
+main/helpcontent2/util/swriter/delzip
+
+main/i18npool/source/breakiterator/data/LICENSE_INFO
+
+main/javaunohelper/util/delzip
+main/javaunohelper/util/manifest
+main/jurt/util/delzip
+main/jurt/util/manifest
+main/jvmaccess/workbench/java/manifest
+main/jvmfwk/plugins/sunmajor/pluginlib/sunjavapluginrc
+main/jvmfwk/source/jvmfwk3rc
+
+main/l10ntools/java/jpropex/jpropex.MF
+main/l10ntools/java/l10nconv/converter.MF
+main/l10ntools/java/receditor/receditor.MF
+
+main/migrationanalysis/no_localization
+main/migrationanalysis/src/wizard/res_defines.h
+
+main/migrationanalysis/util/delzip
+main/mysqlc/source/delzip
+
+main/odk/no_localization
+
+main/odk/pack/gendocu/java/package-list
+main/odk/pack/gendocu/uno/package-list
+
+main/odk/util/delzip
+
+main/ooo_custom_images/industrial/TODO
+main/ooo_custom_images/industrial/duplicates
+main/ooo_custom_images/industrial/missing
+
+main/psprint_config/configuration/delzip
+main/psprint_config/configuration/ppds/delzip
+
+main/qadevOOo/runner/manifest
+main/qadevOOo/testdocs/backend/org/openoffice/manifest
+main/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/manifest
+main/qadevOOo/testdocs/qadevlibs/source/test/manifest
+main/rat-excludes
+
+main/redland/raptor/raptor-1.4.18.patch.os2
+main/redland/rasqal/rasqal-0.9.16.patch.os2
+main/redland/redland/redland-1.0.8.patch.os2
+
+main/reportbuilder/template/delzip
+main/reportbuilder/util/delzip
+main/ridljar/source/unoloader/com/sun/star/lib/unoloader/manifest
+main/ridljar/source/unoloader/delzip
+main/ridljar/util/delzip
+
+main/sal/workben/clipboardwben/testcopy/resource.h
+main/sal/workben/clipboardwben/testpaste/resource.h
+main/sal/workben/clipboardwben/testviewer/resource.h
+
+main/sc/uiconfig/layout/delzip
+main/scripting/examples/delzip
+main/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/Empty.bsh_
+main/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/EmptyParcelDescriptor.xml_
+main/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/ParcelDescriptor.xml_
+
+main/sdext/source/minimizer/delzip
+main/sdext/source/pdfimport/delzip
+
+main/sdext/source/pdfimport/wrapper/keyword_list
+
+main/sdext/source/presenter/delzip
+
+main/setup_native/source/mac/macinstall.ulf
+main/setup_native/source/opensolaris/bundledextensions/installed
+
+main/setup_native/source/packinfo/linuxcopyrightfile
+main/setup_native/source/packinfo/private1copyrightfile
+main/setup_native/source/packinfo/solariscopyrightfile
+
+main/sfx2/workben/custompanel/delzip
+
+main/smoketestdoc/com/sun/star/comp/smoketest/MANIFEST.MF
+main/smoketestdoc/com/sun/star/comp/smoketest/delzip
+
+main/solenv/bin/genmap
+main/solenv/bin/install-sh
+
+main/solenv/inc/startup/summary
+
+main/soltools/winunistd/unistd.h
+main/splitbuild/bm
+main/stoc/test/javavm/testcomponent/manifest
+
+main/svtools/inc/svtools/chartprettypainter.hxx
+main/svtools/source/misc/chartprettypainter.cxx
+
+main/svx/uiconfig/layout/delzip
+main/sw/qa/core/performance-jobfile
+main/sw/source/filter/ww8/CREDITS
+main/sw/uiconfig/layout/delzip
+
+main/sysui/desktop/debian/control
+main/sysui/desktop/debian/postrm
+main/sysui/desktop/debian/prerm
+
+main/sysui/desktop/macosx/delzip
+main/sysui/desktop/share/documents.ulf
+main/sysui/desktop/share/launcher_genericname.ulf
+
+main/sysui/desktop/slackware/slack-desc
+main/sysui/desktop/slackware/update-script
+
+main/sysui/desktop/solaris/depend
+main/sysui/desktop/solaris/pkginfo
+
+main/sysui/desktop/solaris/prototype
+
+main/testautomation/global/input/empty/please_do_not_delete_this_file
+
+main/testgraphical/references/unxlngi/singletest/tolerance.ini_
+
+main/testtools/com/sun/star/comp/bridge/manifest
+main/testtools/source/bridgetest/pyuno/pyuno
+main/toolkit/doc/layout/TODO
+main/toolkit/uiconfig/layout/delzip
+
+main/toolkit/workben/no_localization
+
+main/ure/source/delzip
+main/vcl/aqua/source/res/delzip
+
+main/vcl/unx/generic/fontmanager/afm_keyword_list
+
+main/vcl/unx/gtk/a11y/TODO
+main/wizards/com/sun/star/wizards/agenda/MANIFEST.MF
+main/wizards/com/sun/star/wizards/common/MANIFEST.MF
+main/wizards/com/sun/star/wizards/common/delzip
+main/wizards/com/sun/star/wizards/db/MANIFEST.MF
+main/wizards/com/sun/star/wizards/fax/MANIFEST.MF
+main/wizards/com/sun/star/wizards/form/MANIFEST.MF
+main/wizards/com/sun/star/wizards/letter/MANIFEST.MF
+main/wizards/com/sun/star/wizards/query/MANIFEST.MF
+main/wizards/com/sun/star/wizards/report/MANIFEST.MF
+main/wizards/com/sun/star/wizards/report/delzip
+main/wizards/com/sun/star/wizards/table/MANIFEST.MF
+main/wizards/com/sun/star/wizards/web/MANIFEST.MF
+
+main/wizards/source/config/delzip
+main/wizards/source/configshare/delzip
+main/wizards/source/depot/delzip
+main/wizards/source/euro/delzip
+main/wizards/source/formwizard/delzip
+main/wizards/source/gimmicks/delzip
+main/wizards/source/importwizard/delzip
+main/wizards/source/launcher/delzip
+main/wizards/source/schedule/delzip
+main/wizards/source/standard/delzip
+main/wizards/source/template/delzip
+main/wizards/source/tools/delzip
+main/wizards/source/tutorials/delzip
+main/wizards/source/webwizard/delzip
+
+main/writerfilter/source/doctok/qnametostrfooter
+
+main/writerfilter/source/ooxml/modelcleanup
+main/writerfilter/source/ooxml/rngtocxx
+main/writerfilter/source/ooxml/tokenxmlfooter
+main/writerfilter/source/ooxml/tokenxmlheader
+
+main/writerfilter/source/resourcemodel/analyzerfooter
+main/writerfilter/source/resourcemodel/qnametostrfooter
+main/writerfilter/source/resourcemodel/setdebugflags
+main/writerfilter/source/resourcemodel/sprmcodetostrfooter
+
+main/xmerge/source/activesync/XMergeFactory.h
+main/xmerge/source/activesync/XMergeFilter.h
+main/xmerge/source/activesync/XMergeSync.h
+main/xmerge/source/activesync/resource.h
+main/xmerge/source/activesync/stdafx.h
+
+main/xmlhelp/source/com/sun/star/help/MANIFEST.MF
+main/xmlhelp/util/delzip
+
+main/xmlsecurity/test_docs/CAs/Root_1/demoCA/crl/DO_NOT_CREATE_A_CRL
+main/xmlsecurity/test_docs/CAs/Root_1/demoCA/crlnumber
+main/xmlsecurity/test_docs/CAs/Root_1/demoCA/serial
+main/xmlsecurity/test_docs/CAs/Root_10/demoCA/crlnumber
+main/xmlsecurity/test_docs/CAs/Root_10/demoCA/serial
+main/xmlsecurity/test_docs/CAs/Root_11/demoCA/crlnumber
+main/xmlsecurity/test_docs/CAs/Root_11/demoCA/serial
+main/xmlsecurity/test_docs/CAs/Root_2/demoCA/crl/DO_NOT_CREATE_A_CRL
+main/xmlsecurity/test_docs/CAs/Root_2/demoCA/crlnumber
+main/xmlsecurity/test_docs/CAs/Root_2/demoCA/serial
+main/xmlsecurity/test_docs/CAs/Root_3/demoCA/crlnumber
+main/xmlsecurity/test_docs/CAs/Root_3/demoCA/serial
+main/xmlsecurity/test_docs/CAs/Root_4/demoCA/crlnumber
+main/xmlsecurity/test_docs/CAs/Root_4/demoCA/serial
+main/xmlsecurity/test_docs/CAs/Root_5/demoCA/crl/DO_NOT_CREATE_A_CRL
+main/xmlsecurity/test_docs/CAs/Root_5/demoCA/crlnumber
+main/xmlsecurity/test_docs/CAs/Root_5/demoCA/serial
+main/xmlsecurity/test_docs/CAs/Root_6/demoCA/crl/DO_NOT_INSTALL_THIS_CRL
+main/xmlsecurity/test_docs/CAs/Root_6/demoCA/crlnumber
+main/xmlsecurity/test_docs/CAs/Root_6/demoCA/serial
+main/xmlsecurity/test_docs/CAs/Root_7/demoCA/crl/DO_NOT_INSTALL_THIS_CRL
+main/xmlsecurity/test_docs/CAs/Root_7/demoCA/crlnumber
+main/xmlsecurity/test_docs/CAs/Root_7/demoCA/serial
+main/xmlsecurity/test_docs/CAs/Root_8/demoCA/crl/DO_NOT_INSTALL_THIS_CRL
+main/xmlsecurity/test_docs/CAs/Root_8/demoCA/crlnumber
+main/xmlsecurity/test_docs/CAs/Root_8/demoCA/serial
+main/xmlsecurity/test_docs/CAs/Root_9/demoCA/DO_NO_INSTALL_THIS_ROOT_CERTIFICATE
+main/xmlsecurity/test_docs/CAs/Root_9/demoCA/crlnumber
+main/xmlsecurity/test_docs/CAs/Root_9/demoCA/serial
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_1/demoCA/crl/DO_NOT_CREATE_A_CRL
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_1/demoCA/crlnumber
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_1/demoCA/serial
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_10/DO_NOT_INSTALL_THIS_CERTIFICATE
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_10/demoCA/DO_NOT_INSTALL_THIS_CERTIFICATE
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_10/demoCA/crl/DO_NOT_INSTALL_THIS_CRL
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_10/demoCA/crlnumber
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_10/demoCA/serial
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_2/demoCA/crlnumber
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_2/demoCA/serial
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_3/demoCA/crl/DO_NOT_CREATE_A_CRL
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_3/demoCA/crlnumber
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_3/demoCA/serial
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_4/demoCA/crlnumber
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_4/demoCA/serial
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_5/demoCA/crl/DO_NOT_INSTALL_THIS_CRL
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_5/demoCA/crlnumber
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_5/demoCA/serial
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_6/demoCA/crl/DO_NOT_CREATE_A_CRL
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_6/demoCA/crlnumber
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_6/demoCA/serial
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_7/demoCA/crl/DO_NOT_INSTALL_THIS_CRL
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_7/demoCA/crlnumber
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_7/demoCA/serial
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_8/demoCA/crl/DO_NOT_INSTALL_THIS_CRL
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_8/demoCA/crlnumber
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_8/demoCA/serial
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_9/demoCA/crlnumber
+main/xmlsecurity/test_docs/CAs/Sub_CA_1_Root_9/demoCA/serial
+main/xmlsecurity/test_docs/CAs/Sub_CA_2_Root_4/demoCA/crlnumber
+main/xmlsecurity/test_docs/CAs/Sub_CA_2_Root_4/demoCA/serial
+main/xmlsecurity/test_docs/CAs/Sub_CA_2_Root_7/demoCA/crl/DO_NOT_INSTALL_THIS_CRL
+main/xmlsecurity/test_docs/CAs/Sub_CA_2_Root_7/demoCA/crlnumber
+main/xmlsecurity/test_docs/CAs/Sub_CA_2_Root_7/demoCA/serial
+main/xmlsecurity/test_docs/CAs/Sub_CA_2_Root_8/demoCA/crl/DO_NOT_INSTALL_THIS_CRL
+main/xmlsecurity/test_docs/CAs/Sub_CA_2_Root_8/demoCA/crlnumber
+main/xmlsecurity/test_docs/CAs/Sub_CA_2_Root_8/demoCA/serial
+main/xmlsecurity/tools/demo/manifest
+
+

Modified: incubator/ooo/branches/alg/install/main/readlicense_oo/docs/readme.dtd
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/readlicense_oo/docs/readme.dtd?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/readlicense_oo/docs/readme.dtd (original)
+++ incubator/ooo/branches/alg/install/main/readlicense_oo/docs/readme.dtd Fri Feb 24 14:14:33 2012
@@ -1,4 +1,23 @@
-<!-- edited with XML Spy v4.4 U (http://www.xmlspy.com) by Frank Loehmann (Star Office GmbH) -->
+<!--***********************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ ***********************************************************-->
 <!ELEMENT Readme (Section)+>
 <!ATTLIST Readme
 	name CDATA #REQUIRED

Modified: incubator/ooo/branches/alg/install/main/readlicense_oo/docs/readme/readme.xrm
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/readlicense_oo/docs/readme/readme.xrm?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/readlicense_oo/docs/readme/readme.xrm (original)
+++ incubator/ooo/branches/alg/install/main/readlicense_oo/docs/readme/readme.xrm Fri Feb 24 14:14:33 2012
@@ -244,16 +244,6 @@
 			<p id="access7" xml:lang="en-US">For more information on the accessibility features in ${PRODUCTNAME}, see <a href="http://www.openoffice.org/access/">http://www.openoffice.org/access/</a></p>
 		</div>
 
-		<div id="Registration">
-			<h2 id="reg1" xml:lang="en-US">Registration </h2>
-			<p id="reg2" xml:lang="en-US">Please take a little time to complete the minimal Product Registration process when you install the software. While registration is optional, we encourage you to register, since the information enables the community to make an even better software suite and address user needs directly. Through its Privacy Policy, the ${PRODUCTNAME} Community takes every precaution to safeguard your personal data. If you missed the registration at installation, you can return and register at any time at by choosing "Help - Registration" from the main menu.</p>
-		</div>
-
-		<div id="UserSurvey">
-			<h2 id="survey" xml:lang="en-US">User Survey</h2>
-			<p id="survey1" xml:lang="en-US">There is also a User Survey located online which we encourage you to fill out. The User Survey results will help ${PRODUCTNAME} move more rapidly in setting new standards for the creation of the next-generation office suite. Through its Privacy Policy, the ${PRODUCTNAME} Community takes every precaution to safeguard your personal data.</p>
-		</div>
-
 		<div id="UserSupport">
 			<h2 id="support" xml:lang="en-US">User Support</h2>
 			<p id="support1" xml:lang="en-US">The main support page <a href="http://support.openoffice.org/">http://support.openoffice.org/</a> offers various possibilities for help with ${PRODUCTNAME}. Your question may have already been answered - check the Community Forum at <a href="http://user.services.openoffice.org">http://user.services.openoffice.org</a> or search the archives of the 'users@openoffice.org' mailing list at <a href="http://www.openoffice.org/mail_list.html">http://www.openoffice.org/mail_list.html</a>. Alternatively, you can send in your questions to <a href="mailto:users@openoffice.org">users@openoffice.org</a>. How to subscribe to the list (to get an email response) is explained on this page: <a href="http://wiki.services.openoffice.org/wiki/Website/Content/help/mailinglists">http://wiki.services.openoffice.org/wiki/Website/Content/help/mailinglists</a>.</p>
@@ -268,32 +258,32 @@
 		<div id="GettingInvolved">
 			<h2 id="gettinginvolved1" xml:lang="en-US">Getting Involved</h2>
 			<p id="gettinginvolved2" xml:lang="en-US">The ${PRODUCTNAME} Community would very much benefit from your active participation in the development of this important open source project.</p>
-			<p id="gettingimvolved3" xml:lang="en-US">As a user, you are already a valuable part of the suite's development process and we would like to encourage you to take an even more active role with a view to being a long-term contributor to the community. Please join and check out the user page at <a href="http://www.openoffice.org">http://www.openoffice.org</a></p>
+			<p id="gettingimvolved3" xml:lang="en-US">As a user, you are already a valuable part of the suite's development process and we would like to encourage you to take an even more active role with a view to being a long-term contributor to the community. Please join and check out the user page at <a href="http://incubator.apache.org/openofficeorg/get-involved.html">http://incubator.apache.org/openofficeorg/get-involved.html</a></p>
 			<h3 id="howtostart" xml:lang="en-US">How to Start</h3>
 			<p id="howtostart1" xml:lang="en-US">The best way to start contributing is to subscribe to one or more of the mailing lists, lurk for a while, and gradually use the mail archives to familiarize yourself with many of the topics covered since the ${PRODUCTNAME} source code was released back in October 2000. When you're comfortable, all you need to do is send an email self-introduction and jump right in. If you are familiar with Open Source Projects, check out our To-Dos list and see if there is anything you would like to help with at <a href="http://development.openoffice.org/todo.html">http://development.openoffice.org/todo.html</a>.</p>
 			<h3 id="subscribe" xml:lang="en-US">Subscribe</h3>
-			<p id="subscribe1" xml:lang="en-US">Here are a few of the Project mailing lists to which you can subscribe at <a href="http://www.openoffice.org/mail_list.html">http://www.openoffice.org/mail_list.html</a></p>
+			<p id="subscribe1" xml:lang="en-US">Here are a few of the Project mailing lists to which you can subscribe at <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html">http://incubator.apache.org/openofficeorg/mailing-lists.html</a></p>
 			<ul>
 				<li>
-					<p id="subscribelist1" xml:lang="en-US">News: announce@openoffice.org *recommended to all users* (light traffic)</p>
+					<p id="subscribelist1" xml:lang="en-US">News: ooo-announce@incubator.apache.org *recommended to all users* (light traffic)</p>
 				</li>
 
 				<li>
-					<p id="subscribelist2" xml:lang="en-US">Main user forum: user@openoffice.org *easy way to lurk on discussions* (heavy traffic)</p>
+					<p id="subscribelist2" xml:lang="en-US">Main user forum: ooo-users@incubator.apache.org *easy way to lurk on discussions* (heavy traffic)</p>
 				</li>
 
 				<li>
-					<p id="subscribelist3" xml:lang="en-US">Marketing project: dev@marketing.openoffice.org *beyond development* (getting heavy)</p>
+					<p id="subscribelist3" xml:lang="en-US">Marketing project: ooo-marketing@incubator.apache.org *beyond development* (getting heavy)</p>
 				</li>
 
 				<li>
-					<p id="subscribelist4" xml:lang="en-US">General code contributor list: dev@openoffice.org (moderate/heavy)</p>
+					<p id="subscribelist4" xml:lang="en-US">General code contributor list: ooo-dev@incubator.apache.org (moderate/heavy)</p>
 				</li>
 			</ul>
-			<h3 xml:lang="en-US">Joining one or more Projects</h3>
+			<h3 xml:lang="en-US">Joining the Project</h3>
 			<p id="joining" xml:lang="en-US">You can make major contributions to this important open source project even if you have limited software design or coding experience. Yes, you!</p>
-			<p id="joining1" url="ahead" xml:lang="en-US">At <a href="http://projects.openoffice.org/index.html">http://projects.openoffice.org/index.html</a> you will find projects ranging from Localization, Porting and Groupware to some real core coding projects. If you are not a developer, try the Documentation or the Marketing Project. The OpenOffice.org Marketing Project is applying both guerilla and traditional commercial techniques to marketing open source software, and we are doing it across language and cultural barriers, so you can help just by spreading the word and telling a friend about this office suite.</p>
-			<p id="joining3" xml:lang="en-US">You can help by joining the Marketing Communications &amp; Information Network on <a href="http://marketing.openoffice.org/contacts.html">http://marketing.openoffice.org/contacts.html</a> where you can provide point communication contact with press, media, government agencies, consultants, schools, Linux Users Groups and developers in your country and local community.</p>
+			<p id="joining1" url="ahead" xml:lang="en-US">At <a href="http://incubator.apache.org/openofficeorg/get-involved.html">http://incubator.apache.org/openofficeorg/get-involved.html</a> you will find a first overview where you can start with, ranging from Localization, QA, user support to some real core coding projects. If you are not a developer, try the Documentation or the Marketing Project. The OpenOffice.org Marketing Project is applying both guerilla and traditional commercial techniques to marketing open source software, and we are doing it across language and cultural barriers, so you can help just by spreading the word and telling a friend about this office suite.</p>
+			<p id="joining3" xml:lang="en-US">You can help by joining the marktig mailig list ooo-marketing@incubator.apache.org or visit the Marketing Communications &amp; Information Network on <a href="http://marketing.openoffice.org">http://marketing.openoffice.org</a> where you can provide point communication contact with press, media, government agencies, consultants, schools, Linux Users Groups and developers in your country and local community.</p>
 		</div>
 
 		<div id="Credits">
@@ -303,7 +293,7 @@
 
 		<div id="ModifiedSourceCode">
 			<h2 id="sdffd23r3cefwefew" xml:lang="en-US">Used / Modified Source Code</h2>
-			<p id="sdffd23red32efew">Portions Copyright 1998, 1999 James Clark. Portions Copyright 1996, 1998 Netscape Communications Corporation.</p>
+			<p id="sdffd23red32efew">For detailed information about used and or modified source code see the NOTICE file whihc is part of the installation.</p>
 		</div>
 	</body>
 </html>

Modified: incubator/ooo/branches/alg/install/main/readlicense_oo/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/readlicense_oo/prj/d.lst?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/readlicense_oo/prj/d.lst (original)
+++ incubator/ooo/branches/alg/install/main/readlicense_oo/prj/d.lst Fri Feb 24 14:14:33 2012
@@ -40,3 +40,10 @@ dos: echo ==============================
 ..\%__SRC%\misc\UNX\README_* %_DEST%\bin%_EXT%\osl
 ..\%__SRC%\misc\UNX\README_*.html %_DEST%\bin%_EXT%\osl
 
+dos: echo =====================================================================
+dos: echo Delivering NOTICE file
+dos: echo =====================================================================
+
+# deliver the NOTICE and LICENSE file in the main root from here for later use in the packaging process
+..\..\NOTICE %_DEST%\bin%_EXT%\osl
+..\..\LICENSE %_DEST%\bin%_EXT%\osl

Modified: incubator/ooo/branches/alg/install/main/sal/inc/rtl/tres.h
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sal/inc/rtl/tres.h?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sal/inc/rtl/tres.h (original)
+++ incubator/ooo/branches/alg/install/main/sal/inc/rtl/tres.h Fri Feb 24 14:14:33 2012
@@ -1,3 +1,23 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
 #ifndef _RTL_TRES_H_
 #define _RTL_TRES_H_
 

Modified: incubator/ooo/branches/alg/install/main/sal/qa/helper/gcov/build_coverage
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sal/qa/helper/gcov/build_coverage?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sal/qa/helper/gcov/build_coverage (original)
+++ incubator/ooo/branches/alg/install/main/sal/qa/helper/gcov/build_coverage Fri Feb 24 14:14:33 2012
@@ -1,3 +1,23 @@
+# *************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+# *************************************************************
 
 # this is a helper, to build sal with the right compiler parameters
 # IMPORTANT, this works only within Linux

Modified: incubator/ooo/branches/alg/install/main/sal/qa/helper/gcov/gcov_all
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sal/qa/helper/gcov/gcov_all?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sal/qa/helper/gcov/gcov_all (original)
+++ incubator/ooo/branches/alg/install/main/sal/qa/helper/gcov/gcov_all Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
 #!/bin/sh
+# *************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+# *************************************************************
 # $Id: gcov_all,v 1.4 2005-11-02 17:23:43 kz Exp $
 # This helper run lists all c and cxx files from selected directories.
 

Modified: incubator/ooo/branches/alg/install/main/sal/qa/helper/gcov/statistics
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sal/qa/helper/gcov/statistics?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sal/qa/helper/gcov/statistics (original)
+++ incubator/ooo/branches/alg/install/main/sal/qa/helper/gcov/statistics Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
 #!/bin/sh
+# *************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+# *************************************************************
 # $Id: statistics,v 1.3 2003-06-11 16:38:03 vg Exp $
 
 ./gcov_filter.pl -i ../../../util/sal.map --showallfunc FOO | sort | uniq >exportedfunctions.txt

Modified: incubator/ooo/branches/alg/install/main/sal/qa/rtl/process/rtl_Process_Const.h
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sal/qa/rtl/process/rtl_Process_Const.h?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sal/qa/rtl/process/rtl_Process_Const.h (original)
+++ incubator/ooo/branches/alg/install/main/sal/qa/rtl/process/rtl_Process_Const.h Fri Feb 24 14:14:33 2012
@@ -1,3 +1,23 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
 
 #ifndef _RTL_PROCESS_CONST_H_
 #define _RTL_PROCESS_CONST_H_

Modified: incubator/ooo/branches/alg/install/main/sal/rtl/source/hash.h
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sal/rtl/source/hash.h?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sal/rtl/source/hash.h (original)
+++ incubator/ooo/branches/alg/install/main/sal/rtl/source/hash.h Fri Feb 24 14:14:33 2012
@@ -1,5 +1,25 @@
 #ifndef INCLUDED_RTL_SOURCE_HASH_H
 #define INCLUDED_RTL_SOURCE_HASH_H
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
 
 #include <sal/types.h>
 #include <rtl/ustring.h>

Modified: incubator/ooo/branches/alg/install/main/sal/test/bootstrap
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sal/test/bootstrap?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sal/test/bootstrap (original)
+++ incubator/ooo/branches/alg/install/main/sal/test/bootstrap Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
 #/bin/tcsh
+# *************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+# *************************************************************
 
 setenv MYBOOTSTRAPTESTVALUE 0
 echo 1

Modified: incubator/ooo/branches/alg/install/main/sccomp/source/solver/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sccomp/source/solver/makefile.mk?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sccomp/source/solver/makefile.mk (original)
+++ incubator/ooo/branches/alg/install/main/sccomp/source/solver/makefile.mk Fri Feb 24 14:14:33 2012
@@ -59,7 +59,7 @@ SHL1STDLIBS=    $(COMPHELPERLIB)    \
                 $(CPPULIB)          \
                 $(SALLIB)           \
                 $(TOOLSLIB)         \
-                $(COINMPLIB)
+                $(COINMPLIBS)
 
 SHL1DEPN=       makefile.mk
 SHL1DEF=        $(MISC)$/$(SHL1TARGET).def

Modified: incubator/ooo/branches/alg/install/main/scp2/source/ooo/common_brand.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/scp2/source/ooo/common_brand.scp?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/scp2/source/ooo/common_brand.scp (original)
+++ incubator/ooo/branches/alg/install/main/scp2/source/ooo/common_brand.scp Fri Feb 24 14:14:33 2012
@@ -1006,7 +1006,7 @@ ProfileItem gid_Brand_Profileitem_Versio
     Section = "Version";
     Order = 15;
     Key = "UpdateURL";
-  #if defined(BUILD_SPECIAL)
+  #if defined(ENABLE_ONLINE_UPDATE)
   #ifdef WNT
     Value = "${UPDATEURL}";
   #else  // defined WNT

Modified: incubator/ooo/branches/alg/install/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/scp2/source/ooo/file_library_ooo.scp?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ incubator/ooo/branches/alg/install/main/scp2/source/ooo/file_library_ooo.scp Fri Feb 24 14:14:33 2012
@@ -1513,9 +1513,7 @@ File gid_File_Lib_Ucpchelp1
     Styles = (PACKED);
 End
 
-#ifdef SYSTEM_NEON
 SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
-#endif
 
 SPECIAL_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1)
 
@@ -2000,3 +1998,48 @@ End
 #endif
 #endif
 
+File gid_File_Lib_Apr
+     #ifdef WNT
+        Name = SPECIAL_NAME(libapr-1);
+     #else
+	// Looks like the major version number is part of the name, not
+	// part of the suffix.  An error?
+	#ifdef MACOSX
+            Name = STRING(CONCAT6(libapr-1,.0.,APR_MINOR,.,APR_MICRO,UNXSUFFIX));
+        #else
+            Name = STRING(CONCAT6(libapr-1,UNXSUFFIX,.0.,APR_MINOR,.,APR_MICRO));
+        #endif
+     #endif
+     PACKED_LIB_FILE_BODY;
+End
+
+File gid_File_Lib_AprUtil
+    #ifdef WNT
+        Name = SPECIAL_NAME(apr-util);
+    #else
+	// Looks like the major version number is part of the name, not
+	// part of the suffix.  An error?
+	#ifdef MACOSX
+            Name = STRING(CONCAT6(libaprutil-1,.0.,APR_UTIL_MINOR,.,APR_UTIL_MICRO,UNXSUFFIX));
+	#else
+            Name = STRING(CONCAT6(libaprutil-1,UNXSUFFIX,.0.,APR_UTIL_MINOR,.,APR_UTIL_MICRO));
+	#endif
+    #endif
+    PACKED_LIB_FILE_BODY;
+End
+
+File gid_File_Lib_Serf
+    #ifdef WNT
+        Name = SPECIAL_NAME(serf);
+    #else
+	// Looks like the major version number is part of the name, not
+	// part of the suffix.  An error?
+	#ifdef MACOSX
+            Name = STRING(CONCAT6(libserf-1,.0.,SERF_MINOR,.,SERF_MICRO,UNXSUFFIX));
+	#else
+            Name = STRING(CONCAT6(libserf-1,UNXSUFFIX,.0.,SERF_MINOR,.,SERF_MICRO));
+	#endif
+    #endif
+    PACKED_LIB_FILE_BODY;
+End
+

Modified: incubator/ooo/branches/alg/install/main/scp2/source/ooo/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/scp2/source/ooo/makefile.mk?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/scp2/source/ooo/makefile.mk (original)
+++ incubator/ooo/branches/alg/install/main/scp2/source/ooo/makefile.mk Fri Feb 24 14:14:33 2012
@@ -240,6 +240,21 @@ SCPDEFS+=-DOPENSSL
 SCPDEFS+=-DDISABLE_ATL
 .ENDIF
 
+# Detect version numbers for apr, apr-util, serf.
+.INCLUDE : apr_version.mk
+.INCLUDE : aprutil_version.mk
+.INCLUDE : serf_version.mk
+SCPDEFS+=\
+    -DAPR_MAJOR=$(APR_MAJOR)		\
+    -DAPR_MINOR=$(APR_MINOR)		\
+    -DAPR_MICRO=$(APR_MICRO)		\
+    -DAPR_UTIL_MAJOR=$(APR_UTIL_MAJOR)	\
+    -DAPR_UTIL_MINOR=$(APR_UTIL_MINOR)	\
+    -DAPR_UTIL_MICRO=$(APR_UTIL_MICRO)	\
+    -DSERF_MAJOR=$(SERF_MAJOR)		\
+    -DSERF_MINOR=$(SERF_MINOR)		\
+    -DSERF_MICRO=$(SERF_MICRO)
+
 .IF "$(SYSTEM_PYTHON)" == "YES"
 SCPDEFS+=-DSYSTEM_PYTHON
 .ENDIF

Modified: incubator/ooo/branches/alg/install/main/scp2/source/ooo/ooo_brand.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/scp2/source/ooo/ooo_brand.scp?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/scp2/source/ooo/ooo_brand.scp (original)
+++ incubator/ooo/branches/alg/install/main/scp2/source/ooo/ooo_brand.scp Fri Feb 24 14:14:33 2012
@@ -35,6 +35,24 @@ Directory gid_Dir_Brand_Root
 End
 #endif
 
+File gid_File_Txt_Notice
+    TXT_FILE_BODY;
+#ifndef MACOSX
+    Dir = gid_Brand_Dir_Program;
+#else
+    Dir = gid_Dir_Bundle_Contents;
+#endif
+    Name = "NOTICE";
+    Styles = (PACKED);
+End
+
+File gid_File_Txt_License_Root
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+    Name = "LICENSE";
+    Styles = (PACKED);
+End
+
 File gid_Brand_File_ServicesRdb
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Program;

Modified: incubator/ooo/branches/alg/install/main/scp2/source/ooo/shortcut_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/scp2/source/ooo/shortcut_ooo.scp?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/scp2/source/ooo/shortcut_ooo.scp (original)
+++ incubator/ooo/branches/alg/install/main/scp2/source/ooo/shortcut_ooo.scp Fri Feb 24 14:14:33 2012
@@ -90,4 +90,45 @@ End
 
 #endif
 
+#ifdef UNX
+
+// Create links to the fully quantified libraries apr, apr-util, and serf.
+// The major version number is handled in a non-standard way (part of the name).
+// Therefore the hard-coded .0 suffix.
+
+Shortcut gid_Shortcut_Lib_Apr
+    FileID = gid_File_Lib_Apr;
+    Dir = SCP2_OOO_BIN_DIR;
+    #ifdef MACOSX
+        Name = STRING(CONCAT2(libapr-1.0,UNXSUFFIX));
+    #else
+        Name = STRING(CONCAT3(libapr-1,UNXSUFFIX,.0));
+    #endif
+    Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
+End
+
+Shortcut gid_Shortcut_Lib_AprUtil
+    FileID = gid_File_Lib_AprUtil;
+    Dir = SCP2_OOO_BIN_DIR;
+    #ifdef MACOSX
+        Name = STRING(CONCAT2(libaprutil-1.0,UNXSUFFIX));
+    #else
+        Name = STRING(CONCAT3(libaprutil-1,UNXSUFFIX,.0));
+    #endif
+    Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
+End
+
+Shortcut gid_Shortcut_Lib_Serf
+    FileID = gid_File_Lib_Serf;
+    Dir = SCP2_OOO_BIN_DIR;
+    #ifdef MACOSX
+        Name = STRING(CONCAT2(libserf-1.0,UNXSUFFIX));
+    #else
+        Name = STRING(CONCAT3(libserf-1,UNXSUFFIX,.0));
+    #endif
+    Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
+End
+
+#endif
+
 //i44154 -end-

Modified: incubator/ooo/branches/alg/install/main/scp2/source/sdkoo/sdkoo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/scp2/source/sdkoo/sdkoo.scp?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/scp2/source/sdkoo/sdkoo.scp (original)
+++ incubator/ooo/branches/alg/install/main/scp2/source/sdkoo/sdkoo.scp Fri Feb 24 14:14:33 2012
@@ -125,6 +125,20 @@ Module gid_Module_Root
     PackageInfo = "packinfo_sdkoo.txt";
 End
 
+File gid_File_Txt_Notice
+    TXT_FILE_BODY;
+    Dir = gid_Dir_Basis_Sdk;
+    Name = "NOTICE";
+    Styles = (PACKED, SCPZIP_REPLACE);
+End
+
+File gid_File_Txt_License_Root
+    TXT_FILE_BODY;
+    Dir = gid_Dir_Basis_Sdk;
+    Name = "LICENSE";
+    Styles = (PACKED, SCPZIP_REPLACE);
+End
+
 
 File gid_File_Txt_License
     TXT_FILE_BODY;

Modified: incubator/ooo/branches/alg/install/main/scp2/util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/scp2/util/makefile.mk?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/scp2/util/makefile.mk (original)
+++ incubator/ooo/branches/alg/install/main/scp2/util/makefile.mk Fri Feb 24 14:14:33 2012
@@ -182,7 +182,7 @@ SCP1FILES += cairocanvas.par
 SCP1FILES += layout.par
 .ENDIF # ENABLE_LAYOUT == TRUE
 
-.IF "$(BUILD_SPECIAL)"!=""
+.IF "$(ENABLE_ONLINE_UPDATE)" != ""
 SCP1FILES += \
              module_onlineupdate.par   \
              file_onlineupdate.par

Modified: incubator/ooo/branches/alg/install/main/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/Empty.bsh_
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/Empty.bsh_?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/Empty.bsh_ (original)
+++ incubator/ooo/branches/alg/install/main/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/Empty.bsh_ Fri Feb 24 14:14:33 2012
@@ -1,3 +1,23 @@
+// *************************************************************
+//  
+//  Licensed to the Apache Software Foundation (ASF) under one
+//  or more contributor license agreements.  See the NOTICE file
+//  distributed with this work for additional information
+//  regarding copyright ownership.  The ASF licenses this file
+//  to you under the Apache License, Version 2.0 (the
+//  "License"); you may not use this file except in compliance
+//  with the License.  You may obtain a copy of the License at
+//  
+//    http://www.apache.org/licenses/LICENSE-2.0
+//  
+//  Unless required by applicable law or agreed to in writing,
+//  software distributed under the License is distributed on an
+//  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+//  KIND, either express or implied.  See the License for the
+//  specific language governing permissions and limitations
+//  under the License.
+//  
+// *************************************************************
 // If using XComponentContext need to uncomment import directive below:
 // import com.sun.star.uno.XComponentContext;
 

Modified: incubator/ooo/branches/alg/install/main/sd/workben/testdll/makefile
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sd/workben/testdll/makefile?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sd/workben/testdll/makefile (original)
+++ incubator/ooo/branches/alg/install/main/sd/workben/testdll/makefile Fri Feb 24 14:14:33 2012
@@ -1,3 +1,23 @@
+# -------------------------------------------------------------
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+# -------------------------------------------------------------
 PRJ=..
 
 PRJNAME=test

Modified: incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx (original)
+++ incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx Fri Feb 24 14:14:33 2012
@@ -1,32 +1,23 @@
-/*************************************************************************
- *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  The Contents of this file are made available subject to
- *  the terms of GNU General Public License Version 2.
- *
- *
- *    GNU General Public License, version 2
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This program is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU General Public License as
- *    published by the Free Software Foundation; either version 2 of
- *    the License, or (at your option) any later version.
- *    
- *    This program 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 General Public License for more details.
- *    
- *    You should have received a copy of the GNU General Public
- *    License along with this program; if not, write to the Free
- *    Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *    Boston, MA 02110-1301, USA.
- *
- ************************************************************************/
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
 
 #include "pdfioutdev_gpl.hxx"
 #include "pnghelper.hxx"

Modified: incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx (original)
+++ incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx Fri Feb 24 14:14:33 2012
@@ -1,32 +1,23 @@
-/*************************************************************************
- *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  The Contents of this file are made available subject to
- *  the terms of GNU General Public License Version 2.
- *
- *
- *    GNU General Public License, version 2
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This program is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU General Public License as
- *    published by the Free Software Foundation; either version 2 of
- *    the License, or (at your option) any later version.
- *    
- *    This program 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 General Public License for more details.
- *    
- *    You should have received a copy of the GNU General Public
- *    License along with this program; if not, write to the Free
- *    Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *    Boston, MA 02110-1301, USA.
- *
- ************************************************************************/
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
 
 #ifndef INCLUDED_PDFI_OUTDEV_HXX
 #define INCLUDED_PDFI_OUTDEV_HXX

Modified: incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx (original)
+++ incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx Fri Feb 24 14:14:33 2012
@@ -1,32 +1,23 @@
-/*************************************************************************
- *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  The Contents of this file are made available subject to
- *  the terms of GNU General Public License Version 2.
- *
- *
- *    GNU General Public License, version 2
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This program is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU General Public License as
- *    published by the Free Software Foundation; either version 2 of
- *    the License, or (at your option) any later version.
- *    
- *    This program 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 General Public License for more details.
- *    
- *    You should have received a copy of the GNU General Public
- *    License along with this program; if not, write to the Free
- *    Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *    Boston, MA 02110-1301, USA.
- *
- ************************************************************************/
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
 
 #include "pnghelper.hxx"
 

Modified: incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx (original)
+++ incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx Fri Feb 24 14:14:33 2012
@@ -1,32 +1,23 @@
-/*************************************************************************
- *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  The Contents of this file are made available subject to
- *  the terms of GNU General Public License Version 2.
- *
- *
- *    GNU General Public License, version 2
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This program is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU General Public License as
- *    published by the Free Software Foundation; either version 2 of
- *    the License, or (at your option) any later version.
- *    
- *    This program 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 General Public License for more details.
- *    
- *    You should have received a copy of the GNU General Public
- *    License along with this program; if not, write to the Free
- *    Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *    Boston, MA 02110-1301, USA.
- *
- ************************************************************************/
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
 #ifndef _IPDF_PNGHELPER_HXX
 #define _IPDF_PNGHELPER_HXX
 

Modified: incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx (original)
+++ incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx Fri Feb 24 14:14:33 2012
@@ -1,32 +1,23 @@
-/*************************************************************************
- *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  The Contents of this file are made available subject to
- *  the terms of GNU General Public License Version 2.
- *
- *
- *    GNU General Public License, version 2
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This program is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU General Public License as
- *    published by the Free Software Foundation; either version 2 of
- *    the License, or (at your option) any later version.
- *    
- *    This program 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 General Public License for more details.
- *    
- *    You should have received a copy of the GNU General Public
- *    License along with this program; if not, write to the Free
- *    Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *    Boston, MA 02110-1301, USA.
- *
- ************************************************************************/
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
 
 #include "pdfioutdev_gpl.hxx"
 //#include "SecurityHandler.h"

Modified: incubator/ooo/branches/alg/install/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/set_soenv.in?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/set_soenv.in (original)
+++ incubator/ooo/branches/alg/install/main/set_soenv.in Fri Feb 24 14:14:33 2012
@@ -1716,6 +1716,7 @@ ToFile( "TARFILE_LOCATION",  $TARFILE_LO
 ToFile( "DO_FETCH_TARBALLS", "@DO_FETCH_TARBALLS@",  "e" );
 ToFile( "CUSTOM_PACK_LIST",  "@CUSTOM_PACK_LIST@",  "e" );
 ToFile( "USE_PACKAGER",      "@USE_PACKAGER@",      "e" );
+ToFile( "ENABLE_ONLINE_UPDATE", "@ENABLE_ONLINE_UPDATE@", "e" );
 #
 # Writing the platform dependent constant values to file.
 # (c = comment, e = environment variable, a = alias )
@@ -1974,16 +1975,12 @@ ToFile( "CURL_LIBS",         "@CURL_LIBS
 ToFile( "SYSTEM_BOOST",      "@SYSTEM_BOOST@",     "e" );
 ToFile( "SYSTEM_MDDS",       "@SYSTEM_MDDS@",      "e" );
 ToFile( "SYSTEM_VIGRA",      "@SYSTEM_VIGRA@",     "e" );
-ToFile( "SYSTEM_NEON",       "@SYSTEM_NEON@",      "e" );
 ToFile( "SYSTEM_GDKPIXBUF",  "@SYSTEM_GDKPIXBUF@",   "e" );
 ToFile( "SYSTEM_GLIB",       "@SYSTEM_GLIB@",   "e" );
 ToFile( "SYSTEM_GETTEXT",    "@SYSTEM_GETTEXT@",   "e" );
 ToFile( "SYSTEM_PANGO",      "@SYSTEM_PANGO@",   "e" );
 ToFile( "SYSTEM_LIBPNG",     "@SYSTEM_LIBPNG@",   "e" );
 ToFile( "SYSTEM_LIBJPEG",    "@SYSTEM_LIBJPEG@",   "e" );
-ToFile( "NEON_VERSION",      "@NEON_VERSION@",     "e" );
-ToFile( "NEON_LIBS",         "@NEON_LIBS@",        "e" );
-ToFile( "NEON_CFLAGS",       "@NEON_CFLAGS@",      "e" );
 ToFile( "DISABLE_XAW",       "@DISABLE_XAW@",      "e" );
 ToFile( "DMAKE_URL",         "@DMAKE_URL@",        "e" );
 ToFile( "DMAKE_PATH",        "@DMAKE_PATH@",       "e" );



Mime
View raw message