[libreoffice] 94/152: move animcore into DRAW (closes: #833181)

[Rene Engelhard]

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

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit 9a480538632575e7cb070581c0606b0e9c448139
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Aug 10 10:03:20 2016 +0200

    move animcore into DRAW (closes: #833181)
---
 changelog                                  |  3 +++
 control.in                                 |  2 ++
 patches/make-package-modules-not-suck.diff | 12 ++++++++++--
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index e0901a9..c7fe90f 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,9 @@ libreoffice (1:5.2.0-0ubuntu1) yakkety; urgency=medium
   * add transitional for -gtk -> gtk2
   * Add style class to LibreOffice toolbars in gtk3 with gtk3-toolbar-styleclass.diff
   * disable mergedlibs on BSD, thanks Joe Boden (LP: #1598492)
+  * cherry-picked from Debian:
+    - debian/patches/make-package-modules-not-suck.diff: move animcore into
+      DRAW (closes: #833181)
 
  -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Wed, 10 Aug 2016 13:26:40 +0200
 
diff --git a/control.in b/control.in
index 05db7bd..07d7420 100644
--- a/control.in
+++ b/control.in
@@ -401,6 +401,8 @@ Depends: libreoffice-core (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: libreoffice-pdfimport
+Replaces: libreoffice-impress (<< 1:5.2.0-0ubuntu1)
+Breaks: libreoffice-impress (<< 1:5.2.0-0ubuntu1)
 Description: office productivity suite -- drawing
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index 7eee2fb..5d3e997 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -10,6 +10,7 @@ Subject: [PATCH] make-package-modules-not-suck.diff
  4 files changed, 31 insertions(+), 20 deletions(-)
 
 diff --git a/Repository.mk b/Repository.mk
+index 14a1c07..eab8078 100644
 --- a/Repository.mk
 +++ b/Repository.mk
 @@ -199,13 +199,28 @@ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
@@ -42,11 +43,13 @@ diff --git a/Repository.mk b/Repository.mk
  	date \
  	pricing \
  	sc \
-@@ -217,6 +232,13 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \
+=======
+@@ -217,6 +232,14 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \
  	$(call gb_Helper_optional,SCRIPTING,vbaobj) \
  ))
  
 +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,draw, \
++	animcore \
 +	sd \
 +	sdd \
 +	sdfilt \
@@ -56,7 +59,12 @@ diff --git a/Repository.mk b/Repository.mk
  $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \
  	svgfilter \
  	flash \
-@@ -241,6 +263,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,impress, \
+@@ -236,11 +259,11 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,tde, \
+ ))
+ 
+ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,impress, \
+-	animcore \
+ 	placeware \
  	PresenterScreen \
  	PresentationMinimizer \
  	wpftimpress \

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