[libreoffice] 01/02: actually _do_ enable pdfium even though it's a internal lib. close #814598

[Rene Engelhard]

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

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit 887bf8d15b06caa576a2df670da1d62ecc932620
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Feb 14 13:57:29 2017 +0100

    actually _do_ enable pdfium even though it's a internal lib. close #814598
---
 changelog               | 6 ++++++
 copyright               | 5 +++++
 rules                   | 2 +-
 source/include-binaries | 1 +
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 4c4e8d1..e02bbf4 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,12 @@
 libreoffice (1:5.4.0~alpha0~git20170213-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
+    - is now able to do "insert->image, choose pdf". Not insert->docunent
+      but close enough, so this closes: #814598
+      (unfortunately only using internal pdfium. sigh.)
+
+  * tarballs/9ac66c71463f9440e3ccc996c5e66556-pdfium-3004.tar.bz2,
+    debian/copyright, debian/source/include-binaries: include pdfium
 
  -- Rene Engelhard <rene at debian.org>  Thu, 24 Nov 2016 07:27:55 +0100
 
diff --git a/copyright b/copyright
index d84b50a..a2400d9 100644
--- a/copyright
+++ b/copyright
@@ -458,6 +458,11 @@ Files: tarballs/*swingEx*
 Copyright: Copyright 2008 by Sun Microsystems, Inc.
 License: LGPL-3
 
+Files: tarballs/*pdfium*
+Copyright: // Copyright 2014-2016 PDFium Authors.
+           // Original code copyright 2014 Foxit Software Inc.
+License: BSD
+
 Files: debian/missing-sources/jquery-3.1.1.js
 Copyright: Copyright jQuery Foundation and other contributors 
 License: MIT
diff --git a/rules b/rules
index fcb59b5..196344f 100755
--- a/rules
+++ b/rules
@@ -431,7 +431,7 @@ SYSTEM_STUFF += odbc
 SYSTEM_STUFF += curl
 SYSTEM_STUFF += sane
 SYSTEM_STUFF += poppler
-ENABLE_PDFIUM=n
+ENABLE_PDFIUM=y
 SYSTEM_STUFF += libpng
 SYSTEM_STUFF += nss
 ENABLE_HELP=y
diff --git a/source/include-binaries b/source/include-binaries
index b942f39..43dad70 100644
--- a/source/include-binaries
+++ b/source/include-binaries
@@ -5,3 +5,4 @@ tarballs/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 tarballs/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 tarballs/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 tarballs/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
+tarballs/9ac66c71463f9440e3ccc996c5e66556-pdfium-3004.tar.bz2

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