This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.0
in repository libreoffice.
commit c681822febea8cee873b45cb2ffc9c60aa9f9614
Author: Rene Engelhard <r...@debian.org>
Date: Mon Aug 3 18:53:20 2015 +0200
bump liborcus, libixion, cppunit, libcmis build-deps to gcc5-rebuild
versions and enable them from sthe system again
---
changelog | 10 +++-------
control | 14 ++++++++++++++
patches/series | 2 +-
rules | 33 ++++++++++++++++++++++++++-------
4 files changed, 44 insertions(+), 15 deletions(-)
diff --git a/changelog b/changelog
index 2a2adb4..09c92a7 100644
--- a/changelog
+++ b/changelog
@@ -1,19 +1,15 @@
libreoffice (1:5.0.0~rc5-2) UNRELEASED; urgency=medium
* debian/rules:
- - bump build-depends on libgltf, *collada* to build-depend on their
- gcc 5 rebuilds
+ - bump build-depends on libgltf, *collada*, cppunit, liborcus, libcmis to
+ build-depend on their gcc 5 rebuilds. Bump boost build-dep to >= 1.58
- fix SYSTEM_GCC_CHECK for gcc 5; remove obsolete >= 4.7 check for Qt to
get
correct build-dep
- - bump libglf/*collada* build-deps to their gcc5 rebuilds
- - temporarily use internal boost, cppunit, libcmis, liborcus until their
are
- rebuilt/-named and/or installable
- temporarily disable -evolution until libebook1.2-dev is installable again
- * debian/patches/series: disable liborcus-0.9.1.diff
* debian/control.in: suggest breeze-icon-theme in -style-breeze (like the
other
ones do for oxygen/tango)
- -- Rene Engelhard <r...@debian.org> Sun, 02 Aug 2015 13:10:32 +0200
+ -- Rene Engelhard <r...@debian.org> Mon, 03 Aug 2015 09:54:31 +0000
libreoffice (1:5.0.0~rc5-1) experimental; urgency=medium
diff --git a/control b/control
index 1dbbfbf..c6ab1d9 100644
--- a/control
+++ b/control
@@ -38,12 +38,18 @@ Build-Depends: ant (>= 1.7.0),
libabw-dev (>= 0.1),
libarchive-zip-perl,
libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386],
+ libboost-date-time-dev (>= 1.58),
+ libboost-dev (>= 1.58),
+ libboost-iostreams-dev (>= 1.58),
+ libboost-system-dev (>= 1.58),
libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
libc6 (>= 2.17-6) [mips mipsel],
libcairo2-dev,
libcdr-dev (>= 0.1),
libclucene-dev (>= 2.3.3.4-2),
+ libcmis-dev (>= 0.5.0-3),
libcollada2gltfconvert-dev (>= 20140924-2)[amd64 i386],
+ libcppunit-dev (>= 1.13.2-2.1),
libcups2-dev,
libcurl4-gnutls-dev,
libdbus-glib-1-dev (>= 0.70),
@@ -89,6 +95,7 @@ Build-Depends: ant (>= 1.7.0),
libnss3-dev (>= 3.12.3),
libo3dgc-dev (>= 0~20131011-2) [amd64 i386],
libodfgen-dev (>= 0.1),
+ liborcus-dev (>= 0.9.2-2),
libpagemaker-dev,
libpcre3-dev [amd64 i386],
libpng12-dev,
@@ -4357,15 +4364,21 @@ Depends: ant (>= 1.7.0),
libabw-dev (>= 0.1),
libarchive-zip-perl,
libbluetooth-dev,
+ libboost-date-time-dev (>= 1.58),
+ libboost-dev (>= 1.58),
+ libboost-iostreams-dev (>= 1.58),
+ libboost-system-dev (>= 1.58),
libbsh-java,
libcairo2-dev,
libcdr-dev (>= 0.1),
libclucene-dev (>= 2.3.3.4-2),
+ libcmis-dev (>= 0.5.0-3),
libcollada2gltfconvert-dev (>= 20140924-2),
libcommons-codec-java,
libcommons-httpclient-java,
libcommons-lang-java,
libcommons-logging-java,
+ libcppunit-dev (>= 1.13.2-2.1),
libcups2-dev,
libcurl4-gnutls-dev,
libdbus-glib-1-dev (>= 0.70),
@@ -4410,6 +4423,7 @@ Depends: ant (>= 1.7.0),
libnss3-dev (>= 3.12.3),
libo3dgc-dev (>= 0~20131011-2),
libodfgen-dev (>= 0.1),
+ liborcus-dev (>= 0.9.2-2),
libpagemaker-dev,
libpcre3-dev,
libpng12-dev,
diff --git a/patches/series b/patches/series
index 7cbce93..68fb3ac 100644
--- a/patches/series
+++ b/patches/series
@@ -28,4 +28,4 @@ odk-no-dot.diff
hppa-is-32bit.diff
gcj-no-bitness-check.diff
rsc-no-error-about-unknown-switch.diff
-#liborcus-0.9.1.diff
+liborcus-0.9.1.diff
diff --git a/rules b/rules
index c7617a2..a69e65e 100755
--- a/rules
+++ b/rules
@@ -160,10 +160,14 @@ SYSTEM_STUFF += altlinuxhyph
USE_LIBHYPHEN=y
LIBALTLINUXHYPH_MINVER= (>= 0.1.1-11)
LIBHYPHEN_MINVER= (>= 2.4)
-#SYSTEM_STUFF += boost
+SYSTEM_STUFF += boost
BOOST_VERSION=default
ifeq "$(BOOST_VERSION)" "default"
+ ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 5 && echo
true)" "true"
+ BOOST_MINVER= (>= 1.58)
+ else
BOOST_MINVER= (>= 1.55)
+ endif
endif
SYSTEM_STUFF += mdds
SYSTEM_STUFF += vigra
@@ -384,7 +388,12 @@ SYSTEM_STUFF += graphite
SYSTEM_STUFF += harfbuzz
ALLOC=system
SYSTEM_STUFF += libexttextcat
-#SYSTEM_STUFF += cppunit
+SYSTEM_STUFF += cppunit
+ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 5 && echo
true)" "true"
+CPPUNIT_MINVER=1.13.2-2.1
+else
+CPPUNIT_MINVER=0.12
+endif
DEFAULT_IMAGE=galaxy
IMAGES:=$(DEFAULT_IMAGE) hicontrast oxygen tango sifr breeze
ENABLE_MYSQLNATIVE=y
@@ -397,7 +406,12 @@ SYSTEM_STUFF += postgresql
DICT_DIR=/usr/share/hunspell
HYPH_DIR=/usr/share/hyphen
THES_DIR=/usr/share/mythes
-#SYSTEM_STUFF += libcmis
+SYSTEM_STUFF += libcmis
+ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 5 && echo
true)" "true"
+LIBCMIS_MINVER=0.5.0-3
+else
+LIBCMIS_MINVER=0.5.0
+endif
SYSTEM_STUFF += jpeg
SYSTEM_STUFF += libxml
SYSTEM_STUFF += expat
@@ -423,7 +437,12 @@ ENABLE_TELEPATHY=n
ENABLE_LIBLANGTAG=y
SYSTEM_STUFF += liblangtag
ENABLE_ORCUS=y
-#SYSTEM_STUFF += orcus
+SYSTEM_STUFF += orcus
+ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 5 && echo
true)" "true"
+LIBORCUS_MINVER=0.9.2-2
+else
+LIBORCUS_MINVER=0.9.0
+endif
USE_UCPP=y
ifeq "$(USE_UCPP)" "y"
SYSTEM_STUFF += ucpp
@@ -837,7 +856,7 @@ ifeq "$(RUN_TESTTOOL)" "y"
CONFIGURE_FLAGS += --enable-hids
endif
ifneq (,$(filter cppunit, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libcppunit-dev (>= 1.12)
+ BUILD_DEPS += , libcppunit-dev (>= $(CPPUNIT_MINVER))
endif
ifeq "$(RUN_MAKE_CHECK)" "y"
BUILD_DEPS += , gdb
@@ -1082,7 +1101,7 @@ endif
ifeq "$(ENABLE_ORCUS)" "y"
ifneq (,$(filter orcus, $(SYSTEM_STUFF)))
- BUILD_DEPS += , liborcus-dev (>= 0.9.0)
+ BUILD_DEPS += , liborcus-dev (>= $(LIBORCUS_MINVER))
endif
else
CONFIGURE_FLAGS += --disable-orcus
@@ -1143,7 +1162,7 @@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
BUILD_DEPS += , libe-book-dev (>= 0.1.1)
endif
ifneq (,$(filter libcmis, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libcmis-dev (>= 0.5.0)
+ BUILD_DEPS += , libcmis-dev (>= $(LIBCMIS_MINVER))
endif
endif
CONFIGURE_FLAGS += --with-external-thes-dir=$(THES_DIR)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1zmftq-0000i0...@moszumanska.debian.org
