[libreoffice] 01/05: move animcore into DRAW (closes: #833181)
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit 92626e69e4285bc64f5699a8d667c44a962c252d
Author: Rene Engelhard <rene@debian.org>
Date: Wed Aug 10 10:03:20 2016 +0200
move animcore into DRAW (closes: #833181)
---
changelog | 6 +++++-
control | 2 ++
control.in | 2 ++
patches/make-package-modules-not-suck.diff | 32 ++++++++++++++++++------------
4 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/changelog b/changelog
index b00e246..15212b6 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,8 @@
libreoffice (1:5.2.0-2) UNRELEASED; urgency=medium
+ * debian/patches/make-package-modules-not-suck.diff: move animcore into
+ DRAW (closes: #833181)
+
* debian/control.nlpsolver.in: fix override disparity , use old values
(math/extra)
* debian/rules, debian/shlibs.override.libcmis: bump libcmis dependency
@@ -10,10 +13,11 @@ libreoffice (1:5.2.0-2) UNRELEASED; urgency=medium
description to say gtk(2|3) (closes: #833694) - thanks Vincent Levebre
- remove mention of Quickstarter from libreoffice and libreoffice-gtk2
descriptions; gone there since some time
+ - add Replaces:/Breaks: for libanimcorelo.so move
* debian/control.systray.in, debian/rules: install the systray stuff into a
new -systray package (if enabled)
- -- Rene Engelhard <rene@debian.org> Mon, 08 Aug 2016 07:25:15 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 10 Aug 2016 10:02:27 +0200
libreoffice (1:5.2.0-1) unstable; urgency=medium
diff --git a/control b/control
index 34ba130..cbf87f1 100644
--- a/control
+++ b/control
@@ -554,6 +554,8 @@ Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
+Replaces: libreoffice-impress (<< 1:5.2.0-2)
+Breaks: libreoffice-impress (<< 1:5.2.0-2)
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/control.in b/control.in
index 946ccca..63ab290 100644
--- a/control.in
+++ b/control.in
@@ -384,6 +384,8 @@ Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
+Replaces: libreoffice-impress (<< 1:5.2.0-2)
+Breaks: libreoffice-impress (<< 1:5.2.0-2)
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 6ed7cf0..db3fa98 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -45,10 +45,10 @@ index 7d2a347..a15ac52 100644
$(eval $(call gb_AutoInstall_add_module,extensions_ct2n,,,,))
$(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
diff --git a/Repository.mk b/Repository.mk
-index 61173d3..38cc001 100644
+index 14a1c07..eab8078 100644
--- a/Repository.mk
+++ b/Repository.mk
-@@ -194,13 +194,28 @@ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
+@@ -199,13 +199,28 @@ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,base, \
abp \
@@ -78,11 +78,12 @@ index 61173d3..38cc001 100644
date \
pricing \
sc \
-@@ -212,6 +227,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 \
@@ -92,7 +93,12 @@ index 61173d3..38cc001 100644
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \
svgfilter \
flash \
-@@ -236,6 +258,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 \
@@ -100,7 +106,7 @@ index 61173d3..38cc001 100644
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,onlineupdate, \
-@@ -296,11 +319,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+@@ -301,11 +324,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
ctl \
cui \
$(call gb_Helper_optional,DBCONNECTIVITY, \
@@ -113,7 +119,7 @@ index 61173d3..38cc001 100644
deploymentmisc \
$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
$(if $(USING_X11),desktop_detector) \
-@@ -313,10 +333,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+@@ -318,10 +338,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
evtatt \
expwrap \
$(call gb_Helper_optional,DBCONNECTIVITY, \
@@ -124,7 +130,7 @@ index 61173d3..38cc001 100644
fps_office \
for \
forui \
-@@ -335,7 +353,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+@@ -340,7 +358,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
gie \
hyphen \
icg \
@@ -132,7 +138,7 @@ index 61173d3..38cc001 100644
ldapbe2 \
localebe1 \
log \
-@@ -348,8 +365,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+@@ -353,8 +370,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
msfilter \
$(call gb_Helper_optional,SCRIPTING,msforms) \
mtfrenderer \
@@ -141,7 +147,7 @@ index 61173d3..38cc001 100644
odfflatxml \
offacc \
oox \
-@@ -363,13 +378,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+@@ -368,13 +383,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
sb \
$(call gb_Helper_optional,DBCONNECTIVITY,sdbt) \
scn \
@@ -155,7 +161,7 @@ index 61173d3..38cc001 100644
sot \
spell \
$(if $(ENABLE_HEADLESS),,spl) \
-@@ -380,7 +390,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+@@ -385,7 +395,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
svt \
svx \
svxcore \
@@ -163,7 +169,7 @@ index 61173d3..38cc001 100644
syssh \
$(if $(ENABLE_TDEAB),tdeab1) \
$(if $(ENABLE_TDEAB),tdeabdrv1) \
-@@ -464,6 +473,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
+@@ -469,6 +478,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
hwp \
$(if $(ENABLE_LWP),lwpft) \
msword \
@@ -171,7 +177,7 @@ index 61173d3..38cc001 100644
swd \
swui \
t602filter \
-@@ -542,14 +552,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
+@@ -546,14 +556,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
cached1 \
collator_data \
comphelper \
@@ -186,7 +192,7 @@ index 61173d3..38cc001 100644
i18nlangtag \
i18nutil \
index_data \
-@@ -566,7 +574,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
+@@ -570,7 +578,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
package2 \
$(if $(USING_X11),recentfile) \
$(call gb_Helper_optional,SCRIPTING,scriptframe) \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: