[SCM] qtchooser packaging branch, master, updated. 3f1d306170d1674fd6ab8576232511f5ba47f29c

[Timo Jyrinki]

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

The following commit has been merged in the master branch:
commit 3f1d306170d1674fd6ab8576232511f5ba47f29c
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Jan 21 15:18:55 2013 +0000

    conflict with earlier, not including
---
 debian/control |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/control b/debian/control
index 783a839..2dd308d 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Homepage: https://qt-project.org/
 Package: qtchooser
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libqt4-dev-bin (<= 4:4.8.4+dfsg-1), qt4-designer (<= 4:4.8.4+dfsg-1), qt4-dev-tools (<= 4:4.8.4+dfsg-1), qt4-linguist-tools (<= 4:4.8.4+dfsg-1), qt4-qmake (<= 4:4.8.4+dfsg-1), qt4-qtconfig (<= 4:4.8.4+dfsg-1), qdbus (<= 4:4.8.4+dfsg-1)
+Conflicts: libqt4-dev-bin (<= 4:4.8.4+dfsg-1~), qt4-designer (<= 4:4.8.4+dfsg-1~), qt4-dev-tools (<= 4:4.8.4+dfsg-1~), qt4-linguist-tools (<= 4:4.8.4+dfsg-1~), qt4-qmake (<= 4:4.8.4+dfsg-1~), qt4-qtconfig (<= 4:4.8.4+dfsg-1~), qdbus (<= 4:4.8.4+dfsg-1~)
 Description: Wrapper to select between Qt development binary versions
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.

-- 
qtchooser packaging