The following commit has been merged in the debian-experimental-3.7 branch:
commit e0920719d8ea5ddedcae84dc76e6f770dcb49874
Author: Rene Engelhard <[email protected]>
Date: Mon Oct 8 21:33:17 2012 +0200
git update; adapt javascript/beanshell flags
diff --git a/changelog b/changelog
index 2e8bc80..afd2b57 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.7.0~alpha0~git20121004-1) UNRELEASED; urgency=low
+libreoffice (1:3.7.0~alpha0~git20121008-1) UNRELEASED; urgency=low
* new upstream snapshot
- contains new driver for mozab (mork). Automatically enabled thus
@@ -11,7 +11,7 @@ libreoffice (1:3.7.0~alpha0~git20121004-1) UNRELEASED;
urgency=low
- use gstreamer1.0
* debian/uno-libs3.symbols: update
- -- Rene Engelhard <[email protected]> Fri, 20 Jul 2012 11:16:51 +0200
+ -- Rene Engelhard <[email protected]> Mon, 08 Oct 2012 21:32:03 +0200
libreoffice (1:3.6.2-1) UNRELEASED; urgency=low
diff --git a/rules b/rules
index f065728..c52168d 100755
--- a/rules
+++ b/rules
@@ -1111,12 +1111,12 @@ ifeq "$(ENABLE_JAVA)" "y"
BSH_DEPENDS = bsh (>= 2.0b4)
JAVA_GCJ_DEPENDS += , bsh-gcj [$(OOO_GCJ_ARCHS)]
endif
- CONFIGURE_FLAGS += --enable-ext-scripting-beanshell
+ CONFIGURE_FLAGS += --enable-scripting-beanshell
else
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-script-provider-bsh
endif
ifeq "$(ENABLE_SCRIPT_PROVIDER_JS)" "y"
- CONFIGURE_FLAGS += --enable-ext-scripting-javascript
+ CONFIGURE_FLAGS += --enable-scripting-javascript
else
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-script-provider-js
endif
@@ -1611,8 +1611,8 @@ $(STAMP_DIR)/build-arch:
# somehow...
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH)
./autogen.sh $(CONFIGURE_FLAGS) \
--without-help --without-doxygen --disable-ext-wiki-publisher \
- --disable-ext-report-builder --disable-ext-scripting-javascript
\
- --disable-ext-scripting-beanshell
+ --disable-ext-report-builder --disable-scripting-javascript \
+ --disable-scripting-beanshell
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH)
DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d`
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(MAKE) build gb_FULLDEPS=
gb_Deliver_HARDLINK=T
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
