[libreoffice] 05/09: move calc/styles.xml into -calc

[Rene Engelhard]

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

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

commit f1f5f9fd006c45f0554d5a3bb65d3c2e554bc6c0
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Jan 30 19:58:29 2017 +0100

    move calc/styles.xml into -calc
---
 control    | 2 ++
 control.in | 2 ++
 rules      | 7 +++++++
 3 files changed, 11 insertions(+)

diff --git a/control b/control
index b6a9bbc..f7ce3d8 100644
--- a/control
+++ b/control
@@ -537,6 +537,8 @@ Depends: libreoffice-base-core (= ${binary:Version}) [!hppa !ia64 !mips64 !s390
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: ${opencl-sug}
+Replaces: libreoffice-common (<< 1:5.3.0~rc3)
+Breaks: libreoffice-common (<< 1:5.3.0~rc3)
 Description: office productivity suite -- spreadsheet
  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 2d179e6..ac26808 100644
--- a/control.in
+++ b/control.in
@@ -372,6 +372,8 @@ Depends: libreoffice-base-core (= ${binary:Version})%OOO_NO_BASE_ARCHS%,
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: ${opencl-sug}
+Replaces: libreoffice-common (<< 1:5.3.0~rc3)
+Breaks: libreoffice-common (<< 1:5.3.0~rc3)
 Description: office productivity suite -- spreadsheet
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
diff --git a/rules b/rules
index 3b283c3..e55018d 100755
--- a/rules
+++ b/rules
@@ -2379,6 +2379,13 @@ ifeq "$(ENABLE_FIREBIRD)" "y"
   endif
 endif
 
+	# move calcs styles.xml to -calc. Is there also in 5.4 but not in 5.3
+	# yet but according to upstream "it should be in calc" and
+        # "the one that has it in calc is correct"
+	mkdir -p $(PKGDIR)-calc/$(OODIR)/share/calc
+	mv $(PKGDIR)-common/$(OODIR)/share/calc/styles.xml \
+		$(PKGDIR)-calc/$(OODIR)/share/calc/
+
 	find debian/tmp ! -perm -200 | xargs -r chmod u+w
 
 	touch $@

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