[SCM] Qt 4 packaging branch, master, updated. debian/4.7.3-2-10-g318ee59

Fathi Boudra fabo at alioth.debian.org
Wed Jun 22 06:49:04 UTC 2011


The following commit has been merged in the master branch:
commit cd02c1ebfc70713921b269c76fd145dd43f9195c
Author: Fathi Boudra <fabo at debian.org>
Date:   Wed Jun 22 09:27:55 2011 +0300

    avoid varaible expansion
---
 debian/rules |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 03d949d..2b67a30 100755
--- a/debian/rules
+++ b/debian/rules
@@ -226,11 +226,16 @@ override_dh_auto_install:
 	dh_auto_install -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp/
 
 	# Ship private headers - ugly hack to build Qt Creator QML Designer
-	mkdir -p debian/tmp/usr/include/qt4
-	cd $(CURDIR)/include && rsync -aR Qt{Core,Declarative,Gui,Script}/private \
-	          ../debian/tmp/usr/include/qt4/
-	cd $(CURDIR) && rsync -aR src/{corelib,declarative,gui,script}/*/*_p.h \
-	          debian/tmp/usr/include/
+	cd $(CURDIR)/include && rsync -aR QtCore/private \
+	                                  QtDeclarative/private \
+	                                  QtGui/private \
+	                                  QtScript/private \
+	                                  ../debian/tmp/usr/include/qt4/
+	cd $(CURDIR) && rsync -aR src/corelib/*/*_p.h \
+	                          src/declarative/*/*_p.h \
+	                          src/gui/*/*_p.h \
+	                          src/script/*/*_p.h \
+	                          debian/tmp/usr/include/
 
 	# Fix wrong path in pkgconfig files
 	find $(CURDIR)/debian/tmp/usr/lib/pkgconfig -type f -name '*.pc' \

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list