[libreoffice] 01/01: move /usr/include/libreoffice/sal/typesizes.h symlink to -dev instead of -dev-common (closes: #858199)

[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 6d8ddbfcf34a70748df14a4c8f3f3241f02bfb60
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Mar 19 20:55:07 2017 +0100

    move /usr/include/libreoffice/sal/typesizes.h symlink to -dev instead of -dev-common (closes: #858199)
---
 changelog      | 8 ++++++++
 control        | 4 +++-
 control.sdk.in | 3 ++-
 rules          | 2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index 230333b..1ddd3b6 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:5.2.6-2) unstable; urgency=medium
+
+  * debian/rules:
+    - move /usr/include/libreoffice/sal/typesizes.h symlink to -dev
+      instead of -dev-common (closes: #858199)
+
+ -- Rene Engelhard <rene at debian.org>  Sun, 19 Mar 2017 19:11:37 +0100
+
 libreoffice (1:5.2.6-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/control b/control
index ccd8aa8..52398b1 100644
--- a/control
+++ b/control
@@ -4372,8 +4372,10 @@ Depends: libreoffice-core (= ${binary:Version}),
 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-core (<< 1:4.1.0~beta1),
+          libreoffice-dev-common (<< 1:5.2.6-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)
 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 aa64eb0..3c6e42a 100644
--- a/control.sdk.in
+++ b/control.sdk.in
@@ -9,8 +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)
+Replaces: libreoffice-core (<< 1:4.1.0~beta1), libreoffice-common (<< 1:4.1.0~beta1), libreoffice-dev-common (<< 1:5.2.6-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)
 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 469b7af..e7f348e 100755
--- a/rules
+++ b/rules
@@ -2318,7 +2318,7 @@ ifeq "$(PACKAGE_SDK)" "y"
 	mkdir -p $(PKGDIR)-dev/usr/include/$(DEB_HOST_MULTIARCH)/libreoffice/sal
 	mv $(PKGDIR)-dev-common/usr/include/libreoffice/sal/typesizes.h \
 		$(PKGDIR)-dev/usr/include/$(DEB_HOST_MULTIARCH)/libreoffice/sal
-	cd $(PKGDIR)-dev-common/usr/include/libreoffice/sal/ && \
+	cd $(PKGDIR)-dev/usr/include/libreoffice/sal/ && \
 		ln -s /usr/include/$(DEB_HOST_MULTIARCH)/libreoffice/sal/typesizes.h
 	mkdir -p $(PKGDIR)-dev-common/usr/share/idl
 	mv $(PKGDIR)-dev/usr/share/idl/libreoffice \

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