diff options
| author | Sune Vuorela <debian@pusling.com> | 2008-04-12 16:16:06 +0000 |
|---|---|---|
| committer | Sune Vuorela <debian@pusling.com> | 2008-04-12 16:16:06 +0000 |
| commit | e722a35f6a6e9bddb3088a57f4f65021128ba0b8 (patch) | |
| tree | 9634fd3d8df3df3d768fdf98f15487d1574921b2 | |
| parent | c931a35c61a9fbac6acc729fcb4ebed88ffc6d5c (diff) | |
| download | qt4-x11-e722a35f6a6e9bddb3088a57f4f65021128ba0b8.tar.gz | |
add conflicts/replaces for qtwebkit-dev
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 0b3a4fd..a32de4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +qt4-x11 (4.4.0~rc1-4) unstable; urgency=low + + * Have libqt4-dev conflict/replace libqtwebkit-dev. + + -- Sune Vuorela <debian@pusling.com> Sat, 12 Apr 2008 18:14:01 +0200 + qt4-x11 (4.4.0~rc1-3) unstable; urgency=low +++ Changes by Sune Vuorela: diff --git a/debian/control b/debian/control index d38e5c6..5b5600c 100644 --- a/debian/control +++ b/debian/control @@ -317,7 +317,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-help (= ${binary:Version}), libqt4-assistant (= ${binary:Version}), libqt4-test (= ${binary:Version}), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, -Conflicts: qt3-dev-tools (<= 3:3.3.4-7) +Conflicts: qt3-dev-tools (<= 3:3.3.4-7), libqtwebkit-dev +Replaces: libqtwebkit-dev Suggests: qt4-dev-tools, qt4-doc Description: Qt 4 development files Qt is a cross-platform C++ application framework. Qt's primary feature |