[libreoffice] 01/02: install typesizes.h into multiarch include dir; create the libuno_* symlinks in the multiarch libdir (from Ubuntu)

[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 28ae346def922f532bd983def27e997ddbb2ca73
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Sep 7 10:14:56 2016 +0200

    install typesizes.h into multiarch include dir; create the libuno_* symlinks in the multiarch libdir (from Ubuntu)
---
 changelog | 10 ++++++++++
 rules     |  7 ++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index e440ab0..5618f28 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,13 @@
+libreoffice (1:5.2.1-2) UNRELEASED; urgency=medium
+
+  * debian/rules: install typesizes.h into
+    usr/include/$(DEB_HOST_MULTIARCH)/libreoffice/sal/typesizes.h
+
+  * merge from Ubuntu:
+    - uno-libs: Create the libuno_* symlinks in the multiarch libdir
+
+ -- Rene Engelhard <rene at debian.org>  Wed, 07 Sep 2016 10:12:27 +0200
+
 libreoffice (1:5.2.1-1) unstable; urgency=medium
 
   * LibreOffice 5.2.1 final (identical to rc2)
diff --git a/rules b/rules
index 497d6fd..d45e648 100755
--- a/rules
+++ b/rules
@@ -2300,9 +2300,9 @@ ifeq "$(PACKAGE_SDK)" "y"
 	mv $(PKGDIR)-dev/usr/include/libreoffice \
 		$(PKGDIR)-dev-common/usr/include
 	# except include/sal/typesizes.h
-	mkdir -p $(PKGDIR)-dev/usr/include/libreoffice/sal
+	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/libreoffice/sal
+		$(PKGDIR)-dev/usr/include/$(DEB_HOST_MULTIARCH)/libreoffice/sal
 	mkdir -p $(PKGDIR)-dev-common/usr/share/idl
 	mv $(PKGDIR)-dev/usr/share/idl/libreoffice \
 		$(PKGDIR)-dev-common/usr/share/idl
@@ -2608,9 +2608,10 @@ ifeq "$(ENABLE_JAVA)" "y"
 endif
 	# and the public libs to uno-libs3
 	mkdir -p debian/uno-libs3/$(OODIR)/program
+	mkdir -p debian/uno-libs3/usr/lib/$(DEB_HOST_MULTIARCH)
 	for i in debian/ure/$(OODIR)/program/libuno_*so.3; do \
 		mv $$i debian/uno-libs3/$(OODIR)/program; \
-		ln -sf /$(OODIR)/program/`basename $$i` debian/uno-libs3/usr/lib/`basename $$i`; \
+		ln -sf /$(OODIR)/program/`basename $$i` debian/uno-libs3/usr/lib/$(DEB_HOST_MULTIARCH)/`basename $$i`; \
 	done
 	# we also need libxmlreaderlo.so, libreglo.so and libunoidllo.so (libuno_cppuhelpergcc3.so.3
         # needs it) and libstorelo.so (libreglo.so needs it)

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