[libreoffice] 06/08: set UNO_LIBS_DBG_ROOT to fix gdb helper installation for uno-libs3 again

[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 3e5c97a8f5a1fd6ab944b77c5c182f229c58149a
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Jul 31 11:57:02 2017 +0200

    set UNO_LIBS_DBG_ROOT to fix gdb helper installation for uno-libs3 again
---
 changelog | 3 +++
 rules     | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/changelog b/changelog
index 5afe433..7cbd7b7 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,9 @@ libreoffice (1:5.4.0-2) UNRELEASED; urgency=medium
     - install appstream stuff into /usr/share/metainfo. sigh.
     - make -writer-dbgsym recommend -core-dbgsym as it wants some gdb stuff
       from it
+    - set UNO_LIBS_DBG_ROOT to fix gdb helper installation for uno-libs3 again
+      and make -core-dbgsym and ure-dbgsym recommend uno-libs3-dbgsym
+      (same reason as above)
 
  -- Rene Engelhard <rene at debian.org>  Tue, 25 Jul 2017 22:30:57 +0200
 
diff --git a/rules b/rules
index 6b4db8c..f96d230 100755
--- a/rules
+++ b/rules
@@ -740,6 +740,7 @@ URE_DBG=ure-dbgsym
 CORE_DBG=libreoffice-core-dbgsym
 WRITER_DBG=libreoffice-writer-dbgsym
 URE_DBG_ROOT=.debhelper/ure/dbgsym-root
+UNO_LIBS_DBG_ROOT=.debhelper/uno-libs3/dbgsym-root
 CORE_DBG_ROOT=.debhelper/libreoffice-core/dbgsym-root
 WRITER_DBG_ROOT=.debhelper/libreoffice-writer/dbgsym-root
 else
@@ -3448,6 +3449,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/.debhelper/libreoffice-core/DEBIAN/control
+	perl -pi -e 's/Recommends: /Recommends: uno-libs3-dbgsym, / \
+		debian/.debhelper/ure/DEBIAN/control
 	perl -pi -e 's/Recommends: /Recommends: libreoffice-core-dbgsym, / \
 		debian/.debhelper/libreoffice-writer/DEBIAN/control
 endif

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