[SCM] Qt 4 packaging branch, master, updated. debian/4.8.7+dfsg-6-3-gb25f2cf

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=20709d7

The following commit has been merged in the master branch:
commit 20709d77012cc376f6f577ee96f1ec742bc35779
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Mar 21 21:36:30 2016 +0100

    Move qtchooser configuration files from libqtcore4 to qtchooser itself.
    
    Except the qt-default one.
---
 debian/changelog          |  3 +++
 debian/libqtcore4.install |  3 ---
 debian/rules              | 10 +---------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 52d1eee..49d2def 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qt4-x11 (4:4.8.7+dfsg-7) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Move qtchooser configuration files (except the qt-default one) from
+    libqtcore4 to qtchooser itself.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 21 Mar 2016 21:26:26 +0100
 
diff --git a/debian/libqtcore4.install b/debian/libqtcore4.install
index 50bc42f..eb42c83 100644
--- a/debian/libqtcore4.install
+++ b/debian/libqtcore4.install
@@ -2,6 +2,3 @@ usr/lib/*/libQtCLucene.so.*
 usr/lib/*/libQtCore.so.*
 usr/lib/*/qt-default/qtchooser/default.conf
 usr/lib/*/qt4/plugins/codecs/*.so
-usr/lib/*/qtchooser/4.conf
-usr/lib/*/qtchooser/qt4.conf
-usr/share/qtchooser/qt4-*.conf
diff --git a/debian/rules b/debian/rules
index e07d3b9..e9f64ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -314,16 +314,8 @@ override_dh_auto_install:
 	# by the libjs-jquery package.
 	rm -fv debian/tmp/usr/share/qt4/doc/html/scripts/jquery.js
 
-	# Add a configuration for qtchooser
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/qtchooser
-	echo "/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/bin" > $(CURDIR)/debian/tmp/usr/share/qtchooser/qt4-$(DEB_HOST_MULTIARCH).conf
-	echo "/usr/lib/$(DEB_HOST_MULTIARCH)" >> $(CURDIR)/debian/tmp/usr/share/qtchooser/qt4-$(DEB_HOST_MULTIARCH).conf
-
-	# Ship 4.conf and qt4.conf for this arch, and a default.conf.
-	# 4.conf makes calling qtchooser prettier.
+	# Configuration file for qt4-default package
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser
-	ln -s /usr/share/qtchooser/qt4-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/4.conf
-	ln -s /usr/share/qtchooser/qt4-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/qt4.conf
 	ln -s /usr/share/qtchooser/qt4-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/default.conf
 
 	# As a special case to avoid FTBFSs for current Qt4 packages, ship a second

-- 
Qt 4 packaging