The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 0b91e0822d120c8136603353d87c5c7888c525e9
Merge: 2a8502b690b4a0f97099bd83e563a3b9cc29db0e
26667ab0b8c59e4f8f401cf85d61c3f0281d5f26
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Mon Feb 20 03:23:36 2012 +0100
Merge branch 'debian-experimental-3.5' into ubuntu-precise-3.5
diff --combined rules
index d27b317,6c53676..fef1bbf
--- a/rules
+++ b/rules
@@@ -62,8 -62,10 +62,8 @@@ export QUILT_PATCHES=debian/patche
export QUILT_OPTIONS="-p1 -F0"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-# NOT in proper libreoffice-3-5 branch
-# use ./g checkout -b tag-libreoffice-3.5.0.3 libreoffice-3.5.0.3
GIT_TAG=libreoffice-3.5.0.3
-GIT_BRANCH=tag-libreoffice-3.5.0.3
+GIT_BRANCH=libreoffice-3-5.0.3
SOURCE_TREE=.
STAMP_DIR=debian/stampdir
TARFILE_LOCATION=$(CURDIR)/ext-sources
@@@ -456,14 -458,6 +456,14 @@@ ifeq "$(SQUEEZE_BACKPORT)" "y
ENABLE_PDFIMPORT=n
endif
+ifeq "$(DEB_VENDOR)" "Ubuntu"
+ IMAGES+=human
+ CONFIGURE_FLAGS+= --with-theme="$(patsubst galaxy,default,$(IMAGES))"
+ ENABLE_REPORTDESIGN:=n
+ SYSTEM_STUFF := $(filter-out lucene libcmis libexttextcat graphite
sampleicc libvisio lpsolve, $(SYSTEM_STUFF))
+ CONFIGURE_FLAGS += --with-intro-progressbar-color=221,72,20
+endif
+
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
CC_PREFIX:=$(shell gcc -dumpmachine)-
@@@ -512,7 -506,7 +512,7 @@@ ifneq "$(ENABLE_PRESENTER_CONSOLE)" "y
CONFIGURE_FLAGS += --disable-ext-presenter-console
endif
ifeq "$(ENABLE_PDFIMPORT)" "y"
- BUILD_DEPS += , libpoppler-dev (>= 0.8.0), libpoppler-private-dev,
libpoppler-cpp-dev
+ BUILD_DEPS += , libpoppler-dev (>= 0.8.0), libpoppler-cpp-dev
else
CONFIGURE_FLAGS += --disable-ext-pdfimport
endif
@@@ -865,7 -859,7 +865,7 @@@ ifneq (,$(filter nss, $(SYSTEM_STUFF))
DBG_DBG_SUGGESTS+= , libnss3-1d-dbg
endif
ifneq (,$(filter mozilla-headers, $(SYSTEM_STUFF)))
- BUILD_DEPS+= , xulrunner-dev
+ BUILD_DEPS+= , xulrunner-dev | firefox-dev
endif
CONFIGURE_FLAGS += --disable-build-mozilla --disable-mozilla
ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NPSOPLUGIN_ARCHS)))
@@@ -1617,7 -1611,7 +1617,7 @@@ ifeq "$(BUILD_PYUNO)" "y
endif
ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
- $(CURDIR)/debian/rules check
+ unset DISPLAY && $(CURDIR)/debian/rules check gb_FULLDEPS=
endif
touch $@
@@@ -1636,10 -1630,11 +1636,12 @@@ endi
export SAL_USE_VCLPLUGIN="svp"; \
$(MAKE) check gb_FULLDEPS=
# doesn't get cleaned up.. (at least the dirs, the contents are gone)
- cd $(CURDIR)/debian/smoketest && \
- find . -noleaf -maxdepth 1 ! -name "." -exec rm -rf {} \;
+ if test -d $(CURDIR)/debian/smoketest; then \
+ cd $(CURDIR)/debian/smoketest && \
+ find . -noleaf -maxdepth 1 ! -name "." -exec rm -rf {} \; ; \
+ fi
+
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
cd $(SOURCE_TREE)/smoketest && \
patch -p1 -R <
$(CURDIR)/debian/patches/smoketest-disable-db-insert-delete-seek-tests.diff
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rzouo-0006r2...@vasks.debian.org
