[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4_rc1-1-149-g7769f6b
The following commit has been merged in the debian-experimental-4.0 branch:
commit 7dd156132b12b4d73be3abbcefa4766824c22b9d
Author: Rene Engelhard <rene@debian.org>
Date: Sun Nov 25 14:02:51 2012 +0100
use --disable-dependency-tracking instead of gb_FULLDEPS=
diff --git a/changelog b/changelog
index ff02f13..0e712de 100644
--- a/changelog
+++ b/changelog
@@ -18,6 +18,7 @@ libreoffice (1:4.0.0~alpha1+git20121124-1) UNRELEASED; urgency=low
- use gstreamer1.0
- temporarily disable python3-uno as the new python-based wizards
(in comon!) don't work with it...
+ - use --disable-dependency-tracking instead of gb_FULLDEPS=
* debian/uno-libs3.symbols: update
* debian/control*.in, debian/rules, debian/scripts/gid2pkgdirs.sh: binfilter
is gone. yay.
diff --git a/rules b/rules
index eb75da7..fe53aed 100755
--- a/rules
+++ b/rules
@@ -339,7 +339,8 @@ CONFIGURE_FLAGS= \
--disable-online-update \
--disable-fetch-external \
--without-fonts \
- --without-myspell-dicts
+ --without-myspell-dicts \
+ --disable-dependency-tracking
ifeq "$(shell echo $(DEB_VERSION_UPSTREAM) | grep -E '(alpha|beta)'; echo $$?)" "0"
CONFIGURE_FLAGS += --enable-release-build
@@ -1575,7 +1576,7 @@ $(STAMP_DIR)/build-arch:
--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
+ 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_Deliver_HARDLINK=T
ifeq "$(BUILD_PYUNO)" "y"
ifeq "$(ENABLE_PYTHON3)" "y"
@@ -1620,7 +1621,7 @@ $(STAMP_DIR)/build-indep:
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ./autogen.sh $(CONFIGURE_FLAGS) $(CONFIGURE_FLAGS_LANG)
- 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
+ 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_Deliver_HARDLINK=T
touch $@
--
LibreOffice packaging repository
Reply to: