[libreoffice] 01/01: initial dwz support

[Rene Engelhard]

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

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

commit 1d1ce657128ea86ad38374e011129802eaef7803
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Oct 26 17:56:36 2017 +0200

    initial dwz support
---
 changelog |  7 ++++++-
 control   |  2 ++
 rules     | 31 +++++++++++++++++++++++++++++--
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index d0b057a..4c7c365 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,12 @@
-libreoffice (1:6.0.0~beta1~git20171023-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~beta1~git20171026-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
+  * debian/rules:
+    - use (dh_)dwz and install the multifile file into uno-libs3-dbgsym.
+      Thanks Matthias Klose for the hint.
+      Make *-dbgsym depend on uno-libs3-dbgsym which contain the above file
+
  -- Rene Engelhard <rene at debian.org>  Thu, 19 Oct 2017 15:49:57 +0200
 
 libreoffice (1:6.0.0~alpha1-1) experimental; urgency=medium
diff --git a/control b/control
index 8cb33fe..ac9baef 100644
--- a/control
+++ b/control
@@ -15,6 +15,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                coinor-libcoinmp-dev (>= 1.8.3-2),
                coinor-libcoinutils-dev (>= 2.10.14+repack1-1),
                debhelper (>= 10),
+               debhelper (>= 10.10.4),
                default-jdk (>= 1:1.6) [!hppa !mips64 !s390 !sparc],
                default-jdk (>= 2:1.7-52.1) [kfreebsd-any],
                default-jdk (>= 2:1.8-55) [sparc64],
@@ -22,6 +23,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                dh-apparmor,
                dh-python,
                dpkg-dev (>= 1.18.2~),
+               dwz,
                fastjar,
                firebird-dev (>= 3.0.0.32483.ds4-4) [!hppa !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64],
                firebird3.0-server-core [!hppa !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
diff --git a/rules b/rules
index 213b6fd..12ede98 100755
--- a/rules
+++ b/rules
@@ -199,6 +199,14 @@ QT_MINVER= (>= 4:4.8)
 KDELIBS_MINVER= (>= 4:4.3.4)
 ifneq (noddebs,$(findstring noddebs,$(DEB_BUILD_OPTIONS)))
 BUILD_DBGSYM_PACKAGES=y
+ifeq "$(DEB_HOST_ARCH)" "amd64"
+USE_DWZ=y
+DWZ_ARGS:=-L 100000000
+USE_DWZ_MULTIFILE=n
+ifeq "$(USE_DWZ_MULTIFILE)" "y"
+DWZ_ARGS += -m $(DEB_SOURCE)-$(DEB_VERSION).$(DEB_HOST_ARCH)
+endif
+endif
 endif
 SYSTEM_STUFF += xmlsec
 
@@ -678,6 +686,7 @@ ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "s
   # BE archs don't run them anyway and this wouldn't be in effect...
   SYSTEM_STUFF := $(filter-out libwps libmwaw,$(SYSTEM_STUFF))
   STRETCH_BACKPORT=y
+  USE_DWZ:=n
 endif
 ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "UNRELEASED"
   BUGS=mailto:debian-openoffice at lists.debian.org
@@ -750,6 +759,11 @@ else
 endif
 USE_GOLD=n
 
+ifeq "$(USE_DWZ)" "y"
+	BUILD_DEPS += , debhelper (>= 10.10.4)
+	BUILD_DEPS += , dwz
+endif
+
 ifneq "$(ENABLE_GLTF)" "y"
 	CONFIGURE_FLAGS += --disable-gltf
 else
@@ -1625,6 +1639,9 @@ clean-debdir:
 	rm -f debian/*.install debian/*.dirs debian/*.changelog
 	rm -f debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm debian/*.triggers
 	rm -f debian/pom*.xml
+ifeq "$(USE_DWZ_MULTIFILE)" "y"
+	rm -f $(DEB_SOURCE)-$(DEB_VERSION).$(DEB_HOST_ARCH)
+endif
 
 	rm -rf $(CURDIR)/debian/locales
 
@@ -3239,6 +3256,9 @@ $(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch debian/control $(STAMP_DIR)/
 	dh_link -a
 ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"
 	rm -rf debian/$(URE_DBG_ROOT) debian/$(CORE_DBG_ROOT) debian/$(WRITER_DBG_ROOT)
+  ifeq "$(USE_DWZ)" "y"
+	dh_dwz -a -- $(DWZ_ARGS)
+  endif
 	dh_strip -a -Nure -Nuno-libs3 $(DH_STRIP_DBG_OPTION_LO)
 	dh_strip -pure $(DH_STRIP_DBG_OPTION_URE)
 	dh_strip -puno-libs3 $(DH_STRIP_DBG_OPTION_UNO_LIBS)
@@ -3276,6 +3296,11 @@ ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"
 		debian/$(UNO_LIBS_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice
 	mv debian/$(CORE_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice/sal.py \
 		debian/$(UNO_LIBS_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice
+  ifeq "$(USE_DWZ_MULTIFILE)" "y"
+	mkdir -p debian/$(UNO_LIBS_DBG_ROOT)/usr/lib/debug/.dwz/
+	cp $(DEB_SOURCE)-$(DEB_VERSION).$(DEB_HOST_ARCH) \
+		debian/$(UNO_LIBS_DBG_ROOT)/usr/lib/debug/.dwz
+  endif
 else
 	dh_strip -a
 endif
@@ -3438,8 +3463,10 @@ ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"
 		perl -pi -e 's/^(Depends:.*)/\1\nRecommends: gdb, python3-six/' \
 		debian/.debhelper/$$i/dbgsym-root/DEBIAN/control; \
 	done
-	perl -pi -e 's/Recommends: /Recommends: uno-libs3-dbgsym, /' \
-		debian/$(CORE_DBG_ROOT)/DEBIAN/control
+	for i in $(filter-out uno-libs3,$(ARCH_DEP_PACKAGES)); do \
+		perl -pi -e 's/^(Depends:.*)/\1, uno-libs3-dbgsym/' \
+		debian/.debhelper/$$i/dbgsym-root/DEBIAN/control; \
+	done
 	perl -pi -e 's/Recommends: /Recommends: libreoffice-core-dbgsym, /' \
 		debian/$(WRITER_DBG_ROOT)/DEBIAN/control
 endif

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