[libreoffice] 01/01: add ghostscript to the "EPS Suggests" and add pstoedit, imagemagick and ghostscript as (test) Build-Depends:

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice.

commit 1d5884b8cd127e914fe0ac5a5389298c851ff2bc
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Thu Jul 20 12:39:36 2017 +0000

    add ghostscript to the "EPS Suggests" and add pstoedit, imagemagick and ghostscript as (test) Build-Depends:
---
 changelog  | 3 +++
 control    | 6 +++++-
 control.in | 3 ++-
 rules      | 5 +++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 2ff9cea..9936661 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,9 @@ libreoffice (1:5.4.0~rc2-2) UNRELEASED; urgency=medium
 
   * debian/rules:
     - strip librhino-java from java:Depends, we use the internal one still..
+    - add pstoedit, imagemagick and ghostscript as (test) Build-Depends:
+  * debian/control.in:
+    - add ghostscript to the "EPS Suggests"
 
  -- Rene Engelhard <rene at debian.org>  Sat, 15 Jul 2017 12:24:52 +0000
 
diff --git a/control b/control
index a1d0ac3..65d976d 100644
--- a/control
+++ b/control
@@ -33,8 +33,10 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                gcc-7 (>= 7-20170106) [m68k],
                gdb [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                gettext,
+               ghostscript [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                gobject-introspection (>= 1.32.0),
                gperf,
+               imagemagick [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                java-common (>= 0.49),
                javahelper (>= 0.37~),
                junit4 (>= 4.8.2-2) [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
@@ -146,6 +148,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                maven-repo-helper,
                opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2) [amd64 i386],
                pkg-config,
+               pstoedit [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                python3,
                python3-dev (>= 3.3),
                rapidjson-dev [amd64 i386],
@@ -227,6 +230,7 @@ Recommends: fonts-crosextra-caladea,
             libreoffice-wiki-publisher,
             ${java-common-depends}
 Suggests: cups-bsd,
+          ghostscript,
           hunspell-dictionary,
           hyphen-hyphenation-patterns,
           iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser,
@@ -284,7 +288,7 @@ Description: office productivity suite (metapackage)
     Mozilla profile with Certificates needed for XML Security...
   * openjdk-6-jre | gcj-jre | java5-runtime:
     Java Runtime Environment for use with LibreOffice
-  * pstoedit / imagemagick: helper tools for EPS thumbnails
+  * pstoedit / imagemagick / ghostscript: helper tools for EPS
   * gstreamer0.10-plugins-*: GStreamer plugins for use with LibreOffices
     media backend
   * libpaper-utils: papersize detection support via paperconf
diff --git a/control.in b/control.in
index 093b74c..7a12ed5 100644
--- a/control.in
+++ b/control.in
@@ -59,6 +59,7 @@ Recommends: ${java-common-depends},
             libreoffice-wiki-publisher, 
             libreoffice-sdbc-postgresql
 Suggests: cups-bsd,
+          ghostscript,
           hunspell-dictionary,
           hyphen-hyphenation-patterns,
           iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser,
@@ -115,7 +116,7 @@ Description: office productivity suite (metapackage)
     Mozilla profile with Certificates needed for XML Security...
   * openjdk-6-jre | gcj-jre | java5-runtime:
     Java Runtime Environment for use with LibreOffice
-  * pstoedit / imagemagick: helper tools for EPS thumbnails
+  * pstoedit / imagemagick / ghostscript: helper tools for EPS
   * gstreamer0.10-plugins-*: GStreamer plugins for use with LibreOffices
     media backend
   * libpaper-utils: papersize detection support via paperconf
diff --git a/rules b/rules
index f97624f..5e73c77 100755
--- a/rules
+++ b/rules
@@ -957,6 +957,11 @@ endif
     ifneq (,$(filter cppunit, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libcppunit-dev (>= $(CPPUNIT_MINVER))$(OOO_NO_CHECK_ARCHS) <!nocheck>
     endif
+	# 17:35 <@sberg_> vmiklos, oh, what kind of poor test is that? "warn:sal.osl:3785:2:sal/osl/unx/process.cxx:344: ChildStatusProc : starting 'pstoedit' failed" etc. is what I see in workdir/CppunitTest/filter_eps_test.test.log...
+
+	BUILD_DEPS += , pstoedit$(OOO_NO_CHECK_ARCHS) <!nocheck>
+	BUILD_DEPS += , imagemagick$(OOO_NO_CHECK_ARCHS) <!nocheck>
+	BUILD_DEPS += , ghostscript$(OOO_NO_CHECK_ARCHS) <!nocheck>
   else
 	CONFIGURE_FLAGS += --without-cppunit
   endif

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