[libreoffice] 01/01: move settings/dk.mk into -dev, it' arch-dep, thanks Rico

[Rene Engelhard]

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

rene pushed a commit to branch debian-stretch-5.2.7
in repository libreoffice.

commit cc610f6b80131e604abb1310410eb41958bd2f92
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Aug 28 14:32:29 2017 +0200

    move settings/dk.mk into -dev, it' arch-dep, thanks Rico
---
 changelog      | 2 ++
 control        | 4 ++--
 control.sdk.in | 4 ++--
 rules          | 4 ++++
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/changelog b/changelog
index e327363..e1cda0a 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,8 @@ libreoffice (1:5.2.7-1+deb9u1) UNRELEASED; urgency=medium
   * debian/rules:
     - make i386 make check notfatal for now given the i386 Java Stack Clash
       regression
+    - move dk.mk from -dev-common to -dev as it's not arch-indep, thanks
+      Rico Tzschichholz
 
  -- Rene Engelhard <rene at debian.org>  Thu, 13 Jul 2017 23:06:04 +0200
 
diff --git a/control b/control
index b433caa..6f1b5ec 100644
--- a/control
+++ b/control
@@ -4376,9 +4376,9 @@ Recommends: g++, ${java-common-depends}, ${java-runtime-depends}
 Suggests: libmythes-dev, libreoffice-dev-doc, libreofficekit-dev
 Replaces: libreoffice-common (<< 1:4.1.0~beta1),
           libreoffice-core (<< 1:4.1.0~beta1),
-          libreoffice-dev-common (<< 1:5.2.6-2)
+          libreoffice-dev-common (<< 1:5.2.7-2)
 Conflicts: libreoffice (<< 1:5.2.5-2~), libreoffice-dev-doc (<< 1:5.2.5-2~)
-Breaks: libreoffice-dev-common (<< 1:5.2.6-2)
+Breaks: libreoffice-dev-common (<< 1:5.2.7-2)
 Description: office productivity suite -- SDK -- architecture-dependent parts
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.sdk.in b/control.sdk.in
index 3c6e42a..d878680 100644
--- a/control.sdk.in
+++ b/control.sdk.in
@@ -9,9 +9,9 @@ Depends: libreoffice-core (= ${binary:Version}),
          ${shlibs:Depends}
 Recommends: g++, ${java-common-depends}, ${java-runtime-depends}
 Suggests: libmythes-dev, libreofficekit-dev, libreoffice-dev-doc
-Replaces: libreoffice-core (<< 1:4.1.0~beta1), libreoffice-common (<< 1:4.1.0~beta1), libreoffice-dev-common (<< 1:5.2.6-2)
+Replaces: libreoffice-core (<< 1:4.1.0~beta1), libreoffice-common (<< 1:4.1.0~beta1), libreoffice-dev-common (<< 1:5.2.7-2)
 Conflicts: libreoffice-dev-doc (<< 1:5.2.5-2~), libreoffice (<< 1:5.2.5-2~)
-Breaks: libreoffice-dev-common (<< 1:5.2.6-2)
+Breaks: libreoffice-dev-common (<< 1:5.2.7-2)
 Description: office productivity suite -- SDK -- architecture-dependent parts
  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 55dd34c..3f1aed0 100755
--- a/rules
+++ b/rules
@@ -2329,6 +2329,10 @@ ifeq "$(PACKAGE_SDK)" "y"
 		$(PKGDIR)-dev-common/$(OOSDKDIR)
 	mv $(PKGDIR)-dev/$(OOSDKDIR)/set* \
 		$(PKGDIR)-dev-common/$(OOSDKDIR)
+	# settings/dk.mk is not arch-indep
+	mkdir -p $(PKGDIR)-dev/$(OOSDKDIR)/settings
+	mv $(PKGDIR)-dev-common/$(OOSDKDIR)/settings/dk.mk \
+		$(PKGDIR)-dev/$(OOSDKDIR)/settings
 	mv $(PKGDIR)-dev/$(OOSDKDIR)/config* \
 		$(PKGDIR)-dev-common/$(OOSDKDIR)
 	mv $(PKGDIR)-dev/$(OOSDKDIR)/index.html* \

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