[libreoffice] 04/08: use internal mdds and npapi
This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to branch ubuntu-trusty-4.2
in repository libreoffice.
commit 1b33aaaf500695940242137756cc260602a15d73
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Sat Jun 14 22:21:31 2014 +0200
use internal mdds and npapi
---
changelog | 7 +++++++
rules | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/changelog b/changelog
index d02e268..76fceac 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:4.2.5~rc2-0ubuntu2) trusty; urgency=medium
+
+ * uae internal mdds, external dependency was bumped
+ * use internal npapi, Firefox 30 would break external
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Sat, 14 Jun 2014 22:16:17 +0200
+
libreoffice (1:4.2.5~rc2-0ubuntu1) trusty; urgency=medium
* bump upstream version
diff --git a/rules b/rules
index d013200..0a1d726 100755
--- a/rules
+++ b/rules
@@ -624,7 +624,7 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
USE_VLC:=n
#temp. hacks
ENABLE_EVO2:=n
- SYSTEM_STUFF := $(filter-out libodfgen libmwaw libetonyek libfreehand libebook libeot libabw, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out npapi-headers mdds libodfgen libmwaw libetonyek libfreehand libebook libeot libabw, $(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: