[libreoffice] 01/02: Use system-libwpd?, -libcdr, -libmspub, -libvisio, -libodfgen again
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.3
in repository libreoffice.
commit d42bd3e3ec3b7bf345a894887c630f068cd4399f
Author: Rene Engelhard <rene@debian.org>
Date: Fri Jun 6 23:33:17 2014 +0200
Use system-libwpd?, -libcdr, -libmspub, -libvisio, -libodfgen again
This reverts commit c925491845fbd57c4c4b916c516150e11ae70fc3.
---
changelog | 7 +++++++
control | 14 ++++++++++++++
rules | 12 +++++-------
3 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/changelog b/changelog
index ef629cc..24a48ac 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:4.3.0~beta2-2) UNRELEASED; urgency=medium
+
+ * debian/rules:
+ - re-enablen system-libwpd?, -libcdr, -libmspub, -libvisio, -libodfgen
+
+ -- Rene Engelhard <rene@rene-engelhard.de> Fri, 06 Jun 2014 23:34:02 +0200
+
libreoffice (1:4.3.0~beta2-1) experimental; urgency=low
* new upstream beta release
diff --git a/control b/control
index febab73..ee9c377 100644
--- a/control
+++ b/control
@@ -45,6 +45,7 @@ Build-Depends: ant (>= 1.7.0),
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.4.0),
libcppunit-dev (>= 1.12),
@@ -84,12 +85,14 @@ Build-Depends: ant (>= 1.7.0),
libldap2-dev,
liblpsolve55-dev (>= 5.5.0.13-5+b1),
libmdds-dev (>= 0.10.3),
+ libmspub-dev (>= 0.1),
libmwaw-dev (>= 0.3.1),
libmysqlclient-dev,
libmysqlcppconn-dev (>= 1.1.0~r791),
libmythes-dev (>= 2:1.2),
libneon27-gnutls-dev,
libnss3-dev (>= 3.12.3),
+ libodfgen-dev (>= 0.1),
liborbit2-dev,
liborcus-dev (>= 0.7.0),
libpng12-dev,
@@ -105,7 +108,11 @@ Build-Depends: ant (>= 1.7.0),
libssl-dev (>= 0.9.8),
libsuitesparse-dev (>= 1:3.4.0),
libvigraimpex-dev,
+ libvisio-dev (>= 0.1),
libvlc5,
+ libwpd-dev (>= 0.10),
+ libwpg-dev (>= 0.3),
+ libwps-dev (>= 0.3),
libx11-dev,
libxaw7-dev,
libxext-dev,
@@ -4506,6 +4513,7 @@ Depends: ant (>= 1.7.0),
libboost-system-dev (>= 1.49.0-4),
libbsh-java,
libcairo2-dev,
+ libcdr-dev (>= 0.1),
libclucene-dev (>= 2.3.3.4-2),
libcmis-dev (>= 0.4.0),
libcommons-codec-java,
@@ -4548,12 +4556,14 @@ Depends: ant (>= 1.7.0),
libldap2-dev,
liblpsolve55-dev (>= 5.5.0.13-5+b1),
libmdds-dev (>= 0.10.3),
+ libmspub-dev (>= 0.1),
libmwaw-dev (>= 0.3.1),
libmysqlclient-dev,
libmysqlcppconn-dev (>= 1.1.0~r791),
libmythes-dev (>= 2:1.2),
libneon27-gnutls-dev,
libnss3-dev (>= 3.12.3),
+ libodfgen-dev (>= 0.1),
liborbit2-dev,
liborcus-dev (>= 0.7.0),
libpng12-dev,
@@ -4570,7 +4580,11 @@ Depends: ant (>= 1.7.0),
libssl-dev (>= 0.9.8),
libsuitesparse-dev (>= 1:3.4.0),
libvigraimpex-dev,
+ libvisio-dev (>= 0.1),
libvlc5,
+ libwpd-dev (>= 0.10),
+ libwpg-dev (>= 0.3),
+ libwps-dev (>= 0.3),
libx11-dev,
libxaw7-dev,
libxext-dev,
diff --git a/rules b/rules
index e55a3d8..6f82f75 100755
--- a/rules
+++ b/rules
@@ -199,14 +199,12 @@ SYSTEM_STUFF += mythes
SYSTEM_STUFF += icu
ICU_MINVER= (>= 4.6)
SYSTEM_STUFF += librevenge
-#SYSTEM_STUFF += libwpd
-#SYSTEM_STUFF += libwpg
-#SYSTEM_STUFF += libwps
-#SYSTEM_STUFF += libvisio
-#SYSTEM_STUFF += libcdr
-#SYSTEM_STUFF += libmspub
+SYSTEM_STUFF += libwpd libwpg libwps
+SYSTEM_STUFF += libvisio
+SYSTEM_STUFF += libcdr
+SYSTEM_STUFF += libmspub
SYSTEM_STUFF += libmwaw
-#SYSTEM_STUFF += libodfgen
+SYSTEM_STUFF += libodfgen
SYSTEM_STUFF += libetonyek
SYSTEM_STUFF += libfreehand
# this is libe-book, NOT evolutions libebook (which is
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: