[Libreoffice-commits] core.git: 2 commits - configure.ac RepositoryExternal.mk
Julien Nabet
serval2412 at yahoo.fr
Tue Mar 26 13:52:30 PDT 2013
RepositoryExternal.mk | 2 +-
configure.ac | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 4a4b7abe46022e2af759520a56806f0a7e9af3ce
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Tue Mar 26 21:50:16 2013 +0100
Update commons-lang and commons-codec versions
Change-Id: I97b4ad2f2f671f8dc61e43836899d5532103ad9d
diff --git a/configure.ac b/configure.ac
index 5127e5a..ff30a7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9845,8 +9845,8 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then
AC_MSG_RESULT([external])
if test "$ENABLE_MEDIAWIKI" = "YES"; then
if test -z $COMMONS_CODEC_JAR; then
- AC_CHECK_FILE(/usr/share/java/commons-codec-1.3.jar,
- [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar ],
+ AC_CHECK_FILE(/usr/share/java/commons-codec-1.6.jar,
+ [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.6.jar ],
[
AC_CHECK_FILE(/usr/share/java/commons-codec.jar,
[ COMMONS_CODEC_JAR=/usr/share/java/commons-codec.jar ],
@@ -9860,8 +9860,8 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then
fi
if test -z $COMMONS_LANG_JAR; then
- AC_CHECK_FILE(/usr/share/java/commons-lang-2.3.jar,
- [ COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar ],
+ AC_CHECK_FILE(/usr/share/java/commons-lang-2.4.jar,
+ [ COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.4.jar ],
[
AC_CHECK_FILE(/usr/share/java/commons-lang.jar,
[ COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar ],
commit a70aeefe38f3ed30b232268d0cd1b80303ceba32
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Tue Mar 26 21:49:53 2013 +0100
Blind fix for commons-lang 2.4
Change-Id: I30a339ce3f18f890dfd16b59970db93d6b160b30
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2a66b3d..ea49592 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2535,7 +2535,7 @@ else # !SYSTEM_APACHE_COMMONS
$(eval $(call gb_Helper_register_jars,OXT,\
commons-codec-1.6 \
commons-httpclient-3.1 \
- commons-lang-2.3 \
+ commons-lang-2.4 \
commons-logging-1.1.1 \
))
More information about the Libreoffice-commits
mailing list