[libreoffice] 01/01: re-enable -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 636666426b4c47737f6460a8c417fd402186fe79
Author: Rene Engelhard <rene@debian.org>
Date: Sat Aug 8 13:44:43 2015 +0000
re-enable -evolution
---
changelog | 3 +--
control | 21 +++++++++++++++++++++
rules | 2 +-
3 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/changelog b/changelog
index bba06d6..93f2058 100644
--- a/changelog
+++ b/changelog
@@ -9,11 +9,10 @@ libreoffice (1:5.0.1~rc1-1) UNRELEASED; urgency=medium
(closes: #794717)
- fix SYSTEM_GCC_CHECK for gcc 5; remove obsolete >= 4.7 check for Qt to get
correct build-dep
- - temporarily disable -evolution until libebook1.2-dev is installable again
* debian/control.in: suggest breeze-icon-theme in -style-breeze (like the
other ones do for oxygen/tango)
- -- Rene Engelhard <rene@debian.org> Thu, 06 Aug 2015 19:36:13 +0200
+ -- Rene Engelhard <rene@debian.org> Sat, 08 Aug 2015 13:43:28 +0000
libreoffice (1:5.0.0~rc5-1) experimental; urgency=medium
diff --git a/control b/control
index c6ab1d9..012ac30 100644
--- a/control
+++ b/control
@@ -54,6 +54,7 @@ Build-Depends: ant (>= 1.7.0),
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,
@@ -4328,6 +4329,25 @@ 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
@@ -4383,6 +4403,7 @@ Depends: ant (>= 1.7.0),
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,
diff --git a/rules b/rules
index 59be957..3a3b018 100755
--- a/rules
+++ b/rules
@@ -376,7 +376,7 @@ BUILD_GTK=y
#ifeq "$(DEB_DISTRIBUTION)" "experimental"
BUILD_GTK3=y
#endif
-ENABLE_EVO2=n
+ENABLE_EVO2=y
ENABLE_GVFS=n
ENABLE_GCONF=y
ENABLE_GIO=y
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: