[SCM] qtbase packaging branch, master, updated. debian/5.0.0-1-8-gec4dee7

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=ec4dee7

The following commit has been merged in the master branch:
commit ec4dee7750dae4c7c60a85acfd71ad3c0b42167a
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Jan 7 09:00:38 2013 +0000

    Add back qtchooser conf, now under /usr/share
---
 debian/qt5-default.install |    3 +--
 debian/qtbase5-dev.install |    3 +--
 debian/rules               |    8 ++++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/debian/qt5-default.install b/debian/qt5-default.install
index 8730d3f..85422d0 100644
--- a/debian/qt5-default.install
+++ b/debian/qt5-default.install
@@ -1,2 +1 @@
-# do not ship a default.conf
-#etc/xdg/qtchooser/default.conf
+usr/share/qtchooser/default.conf
diff --git a/debian/qtbase5-dev.install b/debian/qtbase5-dev.install
index f0a87ff..a79ca22 100644
--- a/debian/qtbase5-dev.install
+++ b/debian/qtbase5-dev.install
@@ -1,5 +1,4 @@
-# do not ship a qt5.conf in qtbase5-dev
-#etc/xdg/qtchooser/qt5.conf
+usr/share/qtchooser/qt5.conf
 usr/include/qt5/QtConcurrent/QtConcurrent
 usr/include/qt5/QtConcurrent/QtConcurrentFilter
 usr/include/qt5/QtConcurrent/QtConcurrentMap
diff --git a/debian/rules b/debian/rules
index 026695e..951bd1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -225,10 +225,10 @@ override_dh_auto_install:
 		-exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/
/" {} \;
 
 	# Add a configuration for qtchooser
-	mkdir -p $(CURDIR)/debian/tmp/etc/xdg/qtchooser
-	echo "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin" > $(CURDIR)/debian/tmp/etc/xdg/qtchooser/qt5.conf
-	echo "/usr/lib/$(DEB_HOST_MULTIARCH)" >> $(CURDIR)/debian/tmp/etc/xdg/qtchooser/qt5.conf
-	ln -s /etc/xdg/qtchooser/qt5.conf $(CURDIR)/debian/tmp/etc/xdg/qtchooser/default.conf
+	mkdir -p $(CURDIR)/debian/tmp/usr/share/qtchooser
+	echo "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin" > $(CURDIR)/debian/tmp/usr/share/qtchooser/qt5.conf
+	echo "/usr/lib/$(DEB_HOST_MULTIARCH)" >> $(CURDIR)/debian/tmp/usr/share/qtchooser/qt5.conf
+	ln -s /usr/share/qtchooser/qt5.conf $(CURDIR)/debian/tmp/usr/share/qtchooser/default.conf
 
 	# Remove leftover directories
 	find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5 -depth -type d \( -false \

-- 
qtbase packaging