[libreoffice] 01/08: 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 master
in repository libreoffice.

commit 38639d9f14c8a6d05760feb132d6bc085d4c61e9
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
---
 control        | 4 ++--
 control.sdk.in | 4 ++--
 rules          | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/control b/control
index 3f89ad8..c05789e 100644
--- a/control
+++ b/control
@@ -4113,9 +4113,9 @@ Depends: libreoffice-core (= ${binary:Version}),
          ${shlibs:Depends}
 Recommends: g++, ${java-common-depends}, ${java-runtime-depends}
 Suggests: libmythes-dev, libreoffice-dev-doc, libreofficekit-dev
-Replaces: libreoffice-dev-common (<< 1:5.3.2~)
+Replaces: libreoffice-dev-common (<< 1:5.4.1~)
 Conflicts: libreoffice (<< 1:5.2.5-2~), libreoffice-dev-doc (<< 1:5.2.5-2~)
-Breaks: libreoffice-dev-common (<< 1:5.3.2~)
+Breaks: libreoffice-dev-common (<< 1:5.4.1~)
 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 e6c7815..563563b 100644
--- a/control.sdk.in
+++ b/control.sdk.in
@@ -8,9 +8,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-dev-common (<< 1:5.3.2~)
+Replaces: libreoffice-dev-common (<< 1:5.4.1~)
 Conflicts: libreoffice-dev-doc (<< 1:5.2.5-2~), libreoffice (<< 1:5.2.5-2~)
-Breaks: libreoffice-dev-common (<< 1:5.3.2~)
+Breaks: libreoffice-dev-common (<< 1:5.4.1~)
 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 dd15408..a547b6e 100755
--- a/rules
+++ b/rules
@@ -2343,6 +2343,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