svn commit: r1441909 [2/45] - in /openoffice/branches/l10n: ./ ext_libraries/apr-util/ ext_libraries/apr/ ext_libraries/hunspell/ ext_sources/ extras/l10n/source/ast/ extras/l10n/source/da/ extras/l10n/source/eu/ extras/l10n/source/gd/ extras/l10n/sour...

[jani]

Propchange: openoffice/branches/l10n/
------------------------------------------------------------------------------
  Merged /openoffice/trunk:r1413471-1441901
  Merged /openoffice/branches/alg/clibboard:r1428975-1437368
  Merged /incubator/ooo/trunk:r1412675-1413470

Modified: openoffice/branches/l10n/ext_libraries/apr-util/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n/ext_libraries/apr-util/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/ext_libraries/apr-util/makefile.mk (original)
+++ openoffice/branches/l10n/ext_libraries/apr-util/makefile.mk Sun Feb  3 
13:23:59 2013
@@ -62,7 +62,7 @@ CONFIGURE_FLAGS=
 
 BUILD_DIR=$(CONFIGURE_DIR)
 BUILD_ACTION=$(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+#BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 
 .ELIF "$(GUI)" == "OS2"
 

Modified: openoffice/branches/l10n/ext_libraries/apr/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n/ext_libraries/apr/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/ext_libraries/apr/makefile.mk (original)
+++ openoffice/branches/l10n/ext_libraries/apr/makefile.mk Sun Feb  3 13:23:59 
2013
@@ -66,8 +66,8 @@ CONFIGURE_ACTION=.$/configure --prefix=$
 CONFIGURE_FLAGS=
 
 BUILD_DIR=$(CONFIGURE_DIR)
-BUILD_ACTION=$(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+BUILD_ACTION=$(GNUMAKE) --debug=b
+#BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 
 # Make apr-1-config believe that apr has been installed.
 INSTALL_ACTION=if [ -f apr-1-config.orig ]; then mv -f apr-1-config.orig 
apr-1-config; fi;     \

Modified: openoffice/branches/l10n/ext_libraries/hunspell/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n/ext_libraries/hunspell/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/ext_libraries/hunspell/makefile.mk (original)
+++ openoffice/branches/l10n/ext_libraries/hunspell/makefile.mk Sun Feb  3 
13:23:59 2013
@@ -53,7 +53,7 @@ PATCH_FILES=                                      \
 CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) configure
 CONFIGURE_FLAGS= --disable-shared --with-pic
 .IF "$(COMNAME)"=="sunpro5"
-CONFIGURE_FLAGS+= CFLAGS=-xc99=none
+CONFIGURE_FLAGS+= CFLAGS="-xc99=none" 
CXXFLAGS="-I$(SOLARVER)/$(INPATH)/inc/stl -library=no%Cstd" 
LDFLAGS="-L$(SOLARVER)/$(INPATH)/lib -lstlport_sunpro"
 .ENDIF                  # "$(COMNAME)"=="sunpro5"
 
 .IF "$(SYSBASE)"!=""

Modified: openoffice/branches/l10n/ext_sources/.gitignore
URL: 
http://svn.apache.org/viewvc/openoffice/branches/l10n/ext_sources/.gitignore?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/ext_sources/.gitignore (original)
+++ openoffice/branches/l10n/ext_sources/.gitignore Sun Feb  3 13:23:59 2013
@@ -1,2 +1 @@
-/fetch.log
-
+*