Bug#614365: Move designer plugins to libqt4-dev

[Felix Geyer <debfx-pkg@fobos.de>]

Source: qt4-x11
Version: 4:4.7.1-2
Severity: wishlist
Tags: patch

Please move the Qt Designer plugins from libqt4-declarative and
libqt4-qt3support to libqt4-dev.

This would save some space on default installations as the dependency
from libqt4-qt3support on libqt4-designer is dropped.

>From b0e7428d427bc2b51865b3077486e29b7e778a26 Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx-pkg@fobos.de>
Date: Mon, 21 Feb 2011 13:51:40 +0100
Subject: [PATCH] Move Qt Designer plugins to libqt4-dev.

This drops the dependency from libqt4-qt3support on libqt4-designer.
---
 debian/control                    |    2 +-
 debian/libqt4-declarative.install |    1 -
 debian/libqt4-dev.install         |    2 ++
 debian/libqt4-qt3support.install  |    1 -
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 4e2fb70..09fb344 100644
--- a/debian/control
+++ b/debian/control
@@ -410,7 +410,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (= ${binary:Version}),
  libqt4-declarative (= ${binary:Version}), qt4-qmake (= ${binary:Version})
 Recommends: libqt4-opengl-dev (= ${binary:Version}), libqtwebkit-dev (>= 2.0~)
 Breaks: libqtwebkit-dev (<< 2.0~), libqt4-opengl-dev (<< 4.4.0-2)
-Replaces: libqtwebkit-dev (<< 2.0~), libqt4-opengl-dev (<< 4.4.0-2)
+Replaces: libqtwebkit-dev (<< 2.0~), libqt4-opengl-dev (<< 4.4.0-2), libqt4-qt3support (<< 4:4.7.1-3), libqt4-declarative (<< 4:4.7.1-3)
 Suggests: qt4-dev-tools, qt4-doc, libmysqlclient-dev, libsqlite0-dev, libsqlite3-dev, libpq-dev, unixodbc-dev, firebird2.1-dev
 Description: Qt 4 development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
diff --git a/debian/libqt4-declarative.install b/debian/libqt4-declarative.install
index f993aa2..b7c43b7 100644
--- a/debian/libqt4-declarative.install
+++ b/debian/libqt4-declarative.install
@@ -1,2 +1 @@
 usr/lib/libQtDeclarative.so.*
-usr/lib/qt4/plugins/designer/libqdeclarativeview.so
diff --git a/debian/libqt4-dev.install b/debian/libqt4-dev.install
index 5f1b663..0c12324 100644
--- a/debian/libqt4-dev.install
+++ b/debian/libqt4-dev.install
@@ -2814,4 +2814,6 @@ usr/lib/pkgconfig/QtTest.pc
 usr/lib/pkgconfig/QtUiTools.pc
 usr/lib/pkgconfig/QtXml.pc
 usr/lib/pkgconfig/QtXmlPatterns.pc
+usr/lib/qt4/plugins/designer/libqdeclarativeview.so
+usr/lib/qt4/plugins/designer/libqt3supportwidgets.so
 usr/share/qt4/q3porting.xml
diff --git a/debian/libqt4-qt3support.install b/debian/libqt4-qt3support.install
index 137efdd..1d932b8 100644
--- a/debian/libqt4-qt3support.install
+++ b/debian/libqt4-qt3support.install
@@ -1,3 +1,2 @@
 usr/lib/libQt3Support.so.*
 usr/lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so
-usr/lib/qt4/plugins/designer/libqt3supportwidgets.so
-- 
1.7.1