[SCM] Qt 4 packaging branch, master, updated. debian/4.7.0-rc1-1-70-g1027d3b

Modestas Vainius modax at alioth.debian.org
Sun Dec 5 12:38:46 UTC 2010


The following commit has been merged in the master branch:
commit 52b77df2aa78ba600ae2b88da925aa3b874655c1
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Dec 5 03:30:47 2010 +0200

    Remove bogus executable bits from some Qt data files.
    
    4.7.1 tarball ships with bogus executable bits on some data files in mkspecs,
    docs, examples and demos subdirs. Remove those -x bits when files are installed
    to debian/tmp.
---
 debian/changelog |    3 +++
 debian/rules     |    7 +++++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2464b3f..d922c85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,6 +53,9 @@ qt4-x11 (4:4.7.1-0r1) UNRELEASED; urgency=low
   * Remove quilt from Build-Depends. It's no longer needed for source format
     3.0 (quilt).
   * Confirm symbol files for official 4.7.1 on amd64.
+  * 4.7.1 tarball ships with bogus executable bits on some data files in
+    mkspecs, docs, examples and demos subdirs. Remove those -x bits when files
+    are installed to debian/tmp.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 06 Oct 2010 14:55:15 +0200
 
diff --git a/debian/rules b/debian/rules
index 8338fad..98379a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -260,6 +260,13 @@ override_dh_auto_install:
 	  -o -name .rcc \
 	\) -print0 | xargs -0 rm -rf
 
+	# Remove bogus exec bits from some data files in mkspecs, docs, examples
+	# and demos
+	find debian/tmp/usr/share/qt4/ debian/tmp/usr/lib/qt4/ \
+		-executable -type f \
+		-regex '.*\.\(app\|conf\|cpp\|h\|js\|php\|png\|pro\|xml\|xsl\)$$' \
+		-exec chmod a-x {} \;
+
 override_dh_install:
 	dh_install --list-missing
 

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list