[libreoffice] 02/04: USE_UCPP=y
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 14406972943bb46aa98d9897e291a2ecca706e67
Author: Rene Engelhard <rene@debian.org>
Date: Sun Aug 10 20:31:05 2014 +0200
USE_UCPP=y
---
changelog | 2 ++
control | 4 ++--
rules | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/changelog b/changelog
index 54ba17c..443e582 100644
--- a/changelog
+++ b/changelog
@@ -7,6 +7,8 @@ libreoffice (1:4.3.0-3) unstable; urgency=low
* debian/libreoffice-base.postrm.in: missing \...
* debian/control.gltf.in: remove FIXME, mention glTF 3D models and add
Enhances: libreoffice-impress
+ * debian/rules:
+ - USE_UCPP=y (closes: #748004)
-- Rene Engelhard <rene@debian.org> Sat, 09 Aug 2014 09:51:13 +0200
diff --git a/control b/control
index eff0688..d3df5bf 100644
--- a/control
+++ b/control
@@ -11,7 +11,6 @@ Build-Depends: ant (>= 1.7.0),
binutils (>= 2.23) [mips mipsel],
bison,
bzip2,
- cpp-4.7,
debhelper (>= 7.2.3~),
default-jdk,
default-jdk (>= 1:1.7-48) [ia64],
@@ -133,6 +132,7 @@ Build-Depends: ant (>= 1.7.0),
python-dev (>= 2.6),
python3,
python3-dev (>= 3.3),
+ ucpp,
unixodbc-dev (>= 2.2.11),
unzip,
x11proto-render-dev,
@@ -4471,7 +4471,6 @@ Depends: ant (>= 1.7.0),
bc,
bison,
bzip2,
- cpp-4.7,
debhelper (>= 7.2.3~),
default-jdk,
doxygen (>= 1.8.4),
@@ -4594,6 +4593,7 @@ Depends: ant (>= 1.7.0),
python-dev (>= 2.6),
python3,
python3-dev (>= 3.3),
+ ucpp,
unixodbc-dev (>= 2.2.11),
unzip,
x11proto-render-dev,
diff --git a/rules b/rules
index f49c2de..5479336 100755
--- a/rules
+++ b/rules
@@ -438,7 +438,7 @@ ENABLE_LIBLANGTAG=y
SYSTEM_STUFF += liblangtag
ENABLE_ORCUS=y
SYSTEM_STUFF += orcus
-USE_UCPP=n
+USE_UCPP=y
ifeq "$(USE_UCPP)" "y"
SYSTEM_STUFF += ucpp
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: