[libreoffice] 02/02: *really* fix -dbgsym 0775 permissions

[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 a36106ca8a4ca71a5a7fcbfff2b197981836835e
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat Oct 14 16:36:25 2017 +0200

    *really* fix -dbgsym 0775 permissions
---
 changelog |  9 +++++++++
 rules     | 13 ++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index ea0b74a..73d3a64 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,12 @@
+libreoffice (1:5.4.2-4) UNRELEASED; urgency=medium
+
+  * debian/rules:
+    - *really* fix -dbgsym 0775 permissions by manually fixing them after
+      mkdir -p's (dh_fixperms doesn't run on -dbgsym) which apparently
+      create them as 775 (at least on the buildds)
+
+ -- Rene Engelhard <rene at debian.org>  Sat, 14 Oct 2017 16:39:06 +0200
+
 libreoffice (1:5.4.2-3) unstable; urgency=medium
 
   * debian/patches/ww8export-HAVE_MORE_FONTS.diff, debian/rules: revert
diff --git a/rules b/rules
index 932e9c3..d13be25 100755
--- a/rules
+++ b/rules
@@ -2119,9 +2119,6 @@ $(STAMP_DIR)/install-common:
 	$(CURDIR)/debian/scripts/gid2pkgdirs.sh
 ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"
 	make cmd cmd="export DESTDIR=$(CURDIR)/debian/tmp; $(CURDIR)/solenv/bin/install-gdb-printers -a /usr/share/gdb/auto-load/$(OODIR) -c -i /$(OODIR) -p /usr/share/libreoffice/gdb"
-	# fix permissions
-	find $(CURDIR)/debian/tmp -perm 0775 -exec chmod 755 {} \;
-	find $(CURDIR)/debian/tmp -perm 0664 -exec chmod 644 {} \;
 endif
 
 	# FIXME
@@ -3308,6 +3305,16 @@ else
 	dh_strip -a
 endif
 	dh_fixperms -a
+ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"
+	# dh_fixperms is not run on -dbgsym. And we get 0775 directories. Fix it
+	# manually
+	#16:29 < nthykier> _rene_: I would recommend a "find debian/$(CORE_DBG_ROOT) 
+	#	debian/$(UNO_LIBS_DBG_ROOT) debian/$(WRITER_DBG_ROOT) -exec 
+	#	chmod go=rX,u+rw,a-s {} +"
+	#16:29 < nthykier> Should be faster and is the same expression as used by 
+	#	dh_fixperms
+	find debian/$(CORE_DBG_ROOT) debian/$(UNO_LIBS_DBG_ROOT) debian/$(WRITER_DBG_ROOT) chmod go=rX,u+rw,a-s {} +
+endif
 	dh_icons -a
 	dh_compress -a -X.py -X.mk -X.sxd
 ifeq "$(ENABLE_INTROSPECTION)" "y"

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