[libreoffice] 02/09: use system glm, mwaw, mdds
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 63d6be5d9dbbd8a267e5093c7def60947cdc30b7
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Sun Jun 21 22:37:45 2015 +0200
use system glm, mwaw, mdds
---
changelog | 3 ++-
rules | 5 -----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/changelog b/changelog
index 5d83760..32098c4 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,9 @@
libreoffice (1:5.0.0~rc1-0ubuntu1~wily1) wily; urgency=medium
* first upstream rc
+ * use system glm, mwaw, mdds again
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Sun, 21 Jun 2015 20:00:59 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Sun, 21 Jun 2015 22:36:08 +0200
libreoffice (1:5.0.0~beta3-0ubuntu1~wily1) wily; urgency=medium
diff --git a/rules b/rules
index 28dd1f5..69d9201 100755
--- a/rules
+++ b/rules
@@ -684,11 +684,6 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
# libwps 0.4-4 is not yet in wily/main, no MIR needed, needs sync from debian experimental
SYSTEM_STUFF := $(filter-out libwps, $(SYSTEM_STUFF))
- # libglm 0.9.6.3 is already in wily/main, we should use system lib now
- # libmwaw 0.3.5 is already in wily/main, we should use system lib now
- # mdds 0.12.0 is already in wily/main, we should use system lib now
- SYSTEM_STUFF := $(filter-out libmwaw mdds glm, $(SYSTEM_STUFF))
-
ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
ENABLE_HELP=n
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: