[libreoffice] 17/25: use internal glm for now
This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to branch ubuntu-wily-5.0
in repository libreoffice.
commit c4eb2cb3bbd706746a8ce41c8846efec1333bb22
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Jun 3 17:48:37 2015 +0200
use internal glm for now
---
changelog | 6 ++++++
rules | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/changelog b/changelog
index a782f7e..37bf931 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.0.0~beta1-1ubuntu1~vivid2) vivid; urgency=medium
+
+ * use more internal libs for now
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 03 Jun 2015 17:48:40 +0200
+
libreoffice (1:5.0.0~beta1-1ubuntu1~vivid1) vivid; urgency=medium
* new upstream beta
diff --git a/rules b/rules
index 699f987..abcfff3 100755
--- a/rules
+++ b/rules
@@ -674,7 +674,7 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
ENABLE_EVO2:=n
SYSTEM_STUFF := $(filter-out libetonyek, $(SYSTEM_STUFF))
SYSTEM_STUFF := $(filter-out orcus libgltf coinmp, $(SYSTEM_STUFF))
- SYSTEM_STUFF := $(filter-out libmwaw libwps mdds lpsolve, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libmwaw libwps mdds lpsolve glm, $(SYSTEM_STUFF))
# libetonyek 0.1.1 is in vivid/universe, needs MIR, was shipped with LibreOffice in utopic/main
# libgltf-dev (0.0.2-2) is in vivid/universe, needs MIR, new with LibreOffice 4.4
# libcoinor-libcoinmp-dev is in vivid/universe, needs MIR, new with LibreOffice 4.4
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: