[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.4+dfsg-2-7-g6d1fb01

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 6d1fb0161c293dadfc9b26e079820308479d5509
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu May 9 15:35:40 2013 -0300

    Move qt4.conf from libqt4-dev to libqtcore4.
    
    It will not be strange to find apps explicitely calling the qt4 config.
    Add Breaks+Replaces to libqtcore4 against libqt4-dev << 4:4.8.4+dfsg-2.
---
 debian/changelog          |    3 +++
 debian/control            |    6 ++++--
 debian/libqt4-dev.install |    1 -
 debian/libqtcore4.install |    1 +
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 50e2e96..9ba20a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ qt4-x11 (4:4.8.4+dfsg-3) UNRELEASED; urgency=low
   * Also ship a default config in the second search path of qtchooser, used as
     a last-resort fallback.
   * Update symbols files.
+  * Move qt4.conf from libqt4-dev to libqtcore4. It will not be strange to find
+    apps explicitely calling the qt4 config.
+    - Add Breaks+Replaces to libqtcore4 against libqt4-dev << 4:4.8.4+dfsg-2.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 06 May 2013 21:00:32 -0300
 
diff --git a/debian/control b/debian/control
index 033b3e7..baaf730 100644
--- a/debian/control
+++ b/debian/control
@@ -69,8 +69,10 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: libthai0, libicu48
-Replaces: libqt4-core (<< 4.4.0~beta1-1), libqt4-gui (<< 4.4.0~beta1-1)
-Breaks: libqt4-core (<< 4.4.0~beta1-1), libqt4-gui (<< 4.4.0~beta1-1)
+Replaces: libqt4-core (<< 4.4.0~beta1-1), libqt4-gui (<< 4.4.0~beta1-1),
+ libqt4-dev (<< 4:4.8.4+dfsg-2)
+Breaks: libqt4-core (<< 4.4.0~beta1-1), libqt4-gui (<< 4.4.0~beta1-1),
+ libqt4-dev (<< 4:4.8.4+dfsg-2)
 Description: Qt 4 core module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
diff --git a/debian/libqt4-dev.install b/debian/libqt4-dev.install
index e1814ba..6942e37 100644
--- a/debian/libqt4-dev.install
+++ b/debian/libqt4-dev.install
@@ -1,4 +1,3 @@
-usr/share/qtchooser/qt4.conf
 #usr/include/qt4/Qt/QtOpenVG
 #usr/include/qt4/Qt/qvg.h
 #usr/include/qt4/QtOpenVG/QtOpenVG
diff --git a/debian/libqtcore4.install b/debian/libqtcore4.install
index c85884f..95bef9b 100644
--- a/debian/libqtcore4.install
+++ b/debian/libqtcore4.install
@@ -24,3 +24,4 @@ usr/share/qt4/translations/qt_sv.qm
 usr/share/qt4/translations/qt_uk.qm
 usr/share/qt4/translations/qt_zh_CN.qm
 usr/share/qt4/translations/qt_zh_TW.qm
+usr/share/qtchooser/qt4.conf

-- 
Qt 4 packaging