[libreoffice] 04/06: temporarily use internal boost, cppunit, libcmis, liborcus and temporarily disable -evolution
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 6e1683444bcce055057233773b95ef87bb36f739
Author: Rene Engelhard <rene@debian.org>
Date: Sun Aug 2 17:23:54 2015 +0200
temporarily use internal boost, cppunit, libcmis, liborcus and temporarily disable -evolution
---
changelog | 6 ++++--
control | 35 -----------------------------------
patches/series | 2 +-
rules | 10 +++++-----
4 files changed, 10 insertions(+), 43 deletions(-)
diff --git a/changelog b/changelog
index 5bebdd0..2a2adb4 100644
--- a/changelog
+++ b/changelog
@@ -6,8 +6,10 @@ libreoffice (1:5.0.0~rc5-2) UNRELEASED; urgency=medium
- 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
- * debian/patches/series: disable liborcus-0.9.1,diff
-
+ - 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)
diff --git a/control b/control
index 8dc5a0f..1dbbfbf 100644
--- a/control
+++ b/control
@@ -38,23 +38,16 @@ Build-Depends: ant (>= 1.7.0),
libabw-dev (>= 0.1),
libarchive-zip-perl,
libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386],
- libboost-date-time-dev (>= 1.55),
- libboost-dev (>= 1.55),
- libboost-iostreams-dev (>= 1.55),
- libboost-system-dev (>= 1.55),
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),
libcollada2gltfconvert-dev (>= 20140924-2)[amd64 i386],
- libcppunit-dev (>= 1.12),
libcups2-dev,
libcurl4-gnutls-dev,
libdbus-glib-1-dev (>= 0.70),
libe-book-dev (>= 0.1.1),
- libebook1.2-dev,
libeot-dev,
libetonyek-dev (>= 0.1.2),
libexpat1-dev,
@@ -96,7 +89,6 @@ 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.0),
libpagemaker-dev,
libpcre3-dev [amd64 i386],
libpng12-dev,
@@ -4329,25 +4321,6 @@ Description: MariaDB/MySQL Connector extension for LibreOffice
The MariaDB/MySQL Connector extension allows one to use the MariaDB or MySQL
database from LibreOffice without any wrapper layer such as ODBC or JDBC.
-Package: libreoffice-evolution
-Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386
-Section: gnome
-Depends: libreoffice-base,
- libreoffice-common (>= 1:3.4.0~),
- libreoffice-core (= ${binary:Version}),
- ${libebook-dep},
- ${misc:Depends},
- ${shlibs:Depends}
-Recommends: evolution
-Breaks: ure (<< 1.5.1+OOo3.1.1-15)
-Replaces: libreoffice-common (<< 1:3.3.3-2~)
-Description: office productivity suite -- Evolution addressbook support
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package allows LibreOffice to access Evolution address books.
- You need to install evolution separately.
-
Package: libreoffice-subsequentcheckbase
Section: libs
Priority: extra
@@ -4384,26 +4357,19 @@ Depends: ant (>= 1.7.0),
libabw-dev (>= 0.1),
libarchive-zip-perl,
libbluetooth-dev,
- libboost-date-time-dev (>= 1.55),
- libboost-dev (>= 1.55),
- libboost-iostreams-dev (>= 1.55),
- libboost-system-dev (>= 1.55),
libbsh-java,
libcairo2-dev,
libcdr-dev (>= 0.1),
libclucene-dev (>= 2.3.3.4-2),
- libcmis-dev (>= 0.5.0),
libcollada2gltfconvert-dev (>= 20140924-2),
libcommons-codec-java,
libcommons-httpclient-java,
libcommons-lang-java,
libcommons-logging-java,
- libcppunit-dev (>= 1.12),
libcups2-dev,
libcurl4-gnutls-dev,
libdbus-glib-1-dev (>= 0.70),
libe-book-dev (>= 0.1.1),
- libebook1.2-dev,
libeot-dev,
libetonyek-dev (>= 0.1.2),
libexpat1-dev,
@@ -4444,7 +4410,6 @@ Depends: ant (>= 1.7.0),
libnss3-dev (>= 3.12.3),
libo3dgc-dev (>= 0~20131011-2),
libodfgen-dev (>= 0.1),
- liborcus-dev (>= 0.9.0),
libpagemaker-dev,
libpcre3-dev,
libpng12-dev,
diff --git a/patches/series b/patches/series
index 68fb3ac..7cbce93 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 35361b7..c7617a2 100755
--- a/rules
+++ b/rules
@@ -160,7 +160,7 @@ 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"
BOOST_MINVER= (>= 1.55)
@@ -372,7 +372,7 @@ BUILD_GTK=y
#ifeq "$(DEB_DISTRIBUTION)" "experimental"
BUILD_GTK3=y
#endif
-ENABLE_EVO2=y
+ENABLE_EVO2=n
ENABLE_GVFS=n
ENABLE_GCONF=y
ENABLE_GIO=y
@@ -384,7 +384,7 @@ SYSTEM_STUFF += graphite
SYSTEM_STUFF += harfbuzz
ALLOC=system
SYSTEM_STUFF += libexttextcat
-SYSTEM_STUFF += cppunit
+#SYSTEM_STUFF += cppunit
DEFAULT_IMAGE=galaxy
IMAGES:=$(DEFAULT_IMAGE) hicontrast oxygen tango sifr breeze
ENABLE_MYSQLNATIVE=y
@@ -397,7 +397,7 @@ SYSTEM_STUFF += postgresql
DICT_DIR=/usr/share/hunspell
HYPH_DIR=/usr/share/hyphen
THES_DIR=/usr/share/mythes
-SYSTEM_STUFF += libcmis
+#SYSTEM_STUFF += libcmis
SYSTEM_STUFF += jpeg
SYSTEM_STUFF += libxml
SYSTEM_STUFF += expat
@@ -423,7 +423,7 @@ ENABLE_TELEPATHY=n
ENABLE_LIBLANGTAG=y
SYSTEM_STUFF += liblangtag
ENABLE_ORCUS=y
-SYSTEM_STUFF += orcus
+#SYSTEM_STUFF += orcus
USE_UCPP=y
ifeq "$(USE_UCPP)" "y"
SYSTEM_STUFF += ucpp
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: