[libreoffice] 45/152: lp#1524638: use system ucpp instead of bundling

Rene Engelhard rene at moszumanska.debian.org
Thu Jul 27 19:16:55 UTC 2017


This is an automated email from the git hooks/post-receive script.

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit 0dc467be4a971723bfed7a726463bd2e404681da
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Feb 17 01:30:24 2016 +0100

    lp#1524638: use system ucpp instead of bundling
---
 changelog | 3 ++-
 rules     | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 83a2dc4..137dea6 100644
--- a/changelog
+++ b/changelog
@@ -4,8 +4,9 @@ libreoffice (1:5.1.0~rc3-0ubuntu3~ppa1) xenial; urgency=medium
     autopkgtests
   * add libreoffice-style-elementary from upstream (LP: #1483914)
   * continue building libreoffice-gtk3, but dont default-deploy (yet)
+  * use system ucpp instead of bundling (LP: #1524638)
 
- -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Wed, 17 Feb 2016 01:26:56 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Wed, 17 Feb 2016 01:28:51 +0100
 
 libreoffice (1:5.1.0~rc3-0ubuntu2) xenial; urgency=medium
 
diff --git a/rules b/rules
index 1418b63..3ee982c 100755
--- a/rules
+++ b/rules
@@ -738,7 +738,6 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
   #temp. hacks
   ENABLE_EVO2:=n
   #SYSTEM_STUFF := $(filter-out orcus, $(SYSTEM_STUFF))
-  SYSTEM_STUFF := $(filter-out ucpp, $(SYSTEM_STUFF))
 
   ENABLE_COLLADA := n
   ENABLE_GLTF := n

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git



More information about the Pkg-openoffice-commits mailing list