* Update lintian override

* Re-order packages in control.
* Sync libqt4-dev dependencies with build-dep.
* Move sql drivers plugins in libqt4-sql package.
* Drop LD_LIBRARY_PATH. It seems useless, we build fine without it.
* Drop the workaround for shlibdeps failure. Packages re-ordering fixes it.

6 files changed, 118 insertions, 111 deletions

diff --git a/debian/control b/debian/control
index de09efa..c9bacf2 100644
--- a/debian/control
+++ b/debian/control
@@ -18,18 +18,19 @@ Homepage: http://www.trolltech.com
 Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/trunk/packages/qt4-x11
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/qt4-x11
 
-Package: libqt4-dev
+Package: libqt4-qt3support
 Architecture: any
-Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-core (= ${binary:Version}), libqt4-gui (= ${binary:Version}), libqt4-sql (= ${binary:Version}), libqt4-qt3support (= ${binary:Version}), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), x11proto-core-dev, libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, libmng-dev (>= 1.0.3), libpng12-0-dev, libjpeg62-dev, zlib1g-dev, libfreetype6-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libxft-dev, libaudio-dev, libpq-dev, libglib2.0-dev, libsqlite0-dev
-Conflicts: qt3-dev-tools (<= 3:3.3.4-7)
-Suggests: qt4-dev-tools, qt4-doc
-Description: Qt 4 development files
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libqt4-gui (<< 4.2.1-1)
+Description: Qt 3 compatibility library for Qt 4
  Qt is a cross-platform C++ application framework.  Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
- This packages contains the header development files and development
- programs such as qmake used for building Qt4 applications.
+ This packages contains the Qt 3 compatibility library for Qt 4.  It
+ allows applications designed to use deprecated Qt 3 classes and
+ functions to work with Qt 4, with help from the qt3to4 porting tool
+ found in the libqt4-dev package.
 
 Package: libqt4-core
 Architecture: any
@@ -69,32 +70,69 @@ Description: Qt 4 SQL database module
  PostgreSQL, MySQL, and SQLite databases.  If you wish to to use the SQL
  module for development, you should install the libqt4-dev package.
 
-Package: libqt4-qt3support
+Package: libqt4-dbus
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libqt4-gui (<< 4.2.1-1)
-Description: Qt 3 compatibility library for Qt 4
+Replaces: libqt4-core (<< 4.4.0~tp1-1)
+Description: Qt 4 D-Bus module
  Qt is a cross-platform C++ application framework.  Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
- This packages contains the Qt 3 compatibility library for Qt 4.  It
- allows applications designed to use deprecated Qt 3 classes and
- functions to work with Qt 4, with help from the qt3to4 porting tool
- found in the libqt4-dev package.
+ This package contains the D-Bus module for Qt.
+ .
+ The QtDBus module is a Unix-only library that you can use to make Inter-Process
+ Communication using the D-Bus protocol.
+ .
+ Applications using the QtDBus module can provide services to other, remote
+ applications by exporting objects, as well as use services exported by those
+ applications by placing calls and accessing properties.
 
-Package: qt4-designer
+Package: libqt4-webkit
 Architecture: any
-Section: devel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-dev
-Conflicts: libqt4-designer
-Replaces: libqt4-designer, qt4-dev-tools (<= 4.0.1-2)
-Description: Qt 4 Designer
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Qt 4 WebKit module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the WebKit module for Qt.
+
+Package: libqt4-xmlpatterns
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Qt 4 XML patterns module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the XmlPatterns module for Qt.
+ .
+ QtXmlPatterns is a XQuery and XPath engine for XML and custom data models.
+
+Package: libqt4-dev
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libqt4-core (= ${binary:Version}), libqt4-gui (= ${binary:Version}),
+ libqt4-sql (= ${binary:Version}), libqt4-qt3support (= ${binary:Version}),
+ firebird2.0-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc],
+ libaudio-dev, libcupsys2-dev, libdbus-1-dev, libfreetype6-dev,
+ libgl1-mesa-dev | libgl-dev, libglib2.0-dev, libglu1-mesa-dev | libglu-dev,
+ libice-dev, libiodbc2-dev, libjpeg62-dev, libmng-dev, libmysqlclient15-dev,
+ libpam0g-dev, libpng12-dev, libpq-dev, libreadline5-dev, libsm-dev,
+ libsqlite0-dev, libsqlite3-dev, libtiff4-dev, libx11-dev, libxcursor-dev,
+ libxext-dev, libxft-dev, libxi-dev, libxinerama-dev, libxmu-dev,
+ libxrandr-dev, libxrender-dev, libxslt1-dev, libxt-dev, x11proto-core-dev,
+ zlib1g-dev
+Conflicts: qt3-dev-tools (<= 3:3.3.4-7)
+Suggests: qt4-dev-tools, qt4-doc
+Description: Qt 4 development files
  Qt is a cross-platform C++ application framework.  Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
- Qt Designer is a tool for designing and building graphical user
- interfaces (GUIs) from Qt components.
+ This packages contains the header development files and development
+ programs such as qmake used for building Qt4 applications.
 
 Package: libqt4-debug
 Architecture: any
@@ -105,6 +143,19 @@ Description: Qt 4 library debugging symbols
  .
  This packages contains the debugging symbols for the Qt 4 libraries.
 
+Package: qt4-designer
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-dev
+Conflicts: libqt4-designer
+Replaces: libqt4-designer, qt4-dev-tools (<= 4.0.1-2)
+Description: Qt 4 Designer
+ Qt is a cross-platform C++ application framework.  Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ Qt Designer is a tool for designing and building graphical user
+ interfaces (GUIs) from Qt components.
+
 Package: qt4-dev-tools
 Architecture: any
 Section: devel
@@ -145,42 +196,3 @@ Description: Qt 4 API documentation
  can be viewed in conjunction with the Qt Assistant found in the
  qt4-dev-tools package.
 
-Package: libqt4-dbus
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libqt4-core (<< 4.4.0~tp1-1)
-Description: Qt 4 D-Bus module
- Qt is a cross-platform C++ application framework.  Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains the D-Bus module for Qt.
- .
- The QtDBus module is a Unix-only library that you can use to make Inter-Process
- Communication using the D-Bus protocol.
- .
- Applications using the QtDBus module can provide services to other, remote
- applications by exporting objects, as well as use services exported by those
- applications by placing calls and accessing properties.
-
-Package: libqt4-webkit
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Qt 4 WebKit module
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains the WebKit module for Qt.
-
-Package: libqt4-xmlpatterns
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Qt 4 XML patterns module
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains the XmlPatterns module for Qt.
- .
- QtXmlPatterns is a XQuery and XPath engine for XML and custom data models.
diff --git a/debian/libqt4-debug.lintian b/debian/libqt4-debug.lintian
index 8548cb6..2973368 100644
--- a/debian/libqt4-debug.lintian
+++ b/debian/libqt4-debug.lintian
@@ -1,34 +1,34 @@
 libqt4-debug: package-name-doesnt-match-sonames
 
-libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtAssistantClient.so.4.3.4.debug
-libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtDesigner.so.4.3.4.debug
-libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtGui.so.4.3.4.debug
-libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtTest.so.4.3.4.debug
-libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtDesignerComponents.so.4.3.4.debug
-libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtOpenGL.so.4.3.4.debug
-libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtSql.so.4.3.4.debug
-libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQt3Support.so.4.3.4.debug
-libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtNetwork.so.4.3.4.debug
-libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtXml.so.4.3.4.debug
-libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtCore.so.4.3.4.debug
-libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtSvg.so.4.3.4.debug
-libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtDBus.so.4.3.4.debug
-libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtScript.so.4.3.4.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtAssistantClient.so.4.4.0.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtDesigner.so.4.4.0.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtGui.so.4.4.0.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtTest.so.4.4.0.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtDesignerComponents.so.4.4.0.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtOpenGL.so.4.4.0.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtSql.so.4.4.0.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQt3Support.so.4.4.0.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtNetwork.so.4.4.0.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtXml.so.4.4.0.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtCore.so.4.4.0.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtSvg.so.4.4.0.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtDBus.so.4.4.0.debug
+libqt4-debug: sharedobject-in-library-directory-not-actually-a-shlib usr/lib/libQtScript.so.4.4.0.debug
 
-libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQt3Support.so.4.3.4.debug
-libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtAssistantClient.so.4.3.4.debug
-libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtCore.so.4.3.4.debug
-libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtDBus.so.4.3.4.debug
-libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtDesigner.so.4.3.4.debug
-libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtDesignerComponents.so.4.3.4.debug
-libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtGui.so.4.3.4.debug
-libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtNetwork.so.4.3.4.debug
-libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtOpenGL.so.4.3.4.debug
-libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtScript.so.4.3.4.debug
-libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtSql.so.4.3.4.debug
-libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtSvg.so.4.3.4.debug
-libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtTest.so.4.3.4.debug
-libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtXml.so.4.3.4.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQt3Support.so.4.4.0.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtAssistantClient.so.4.4.0.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtCore.so.4.4.0.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtDBus.so.4.4.0.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtDesigner.so.4.4.0.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtDesignerComponents.so.4.4.0.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtGui.so.4.4.0.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtNetwork.so.4.4.0.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtOpenGL.so.4.4.0.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtScript.so.4.4.0.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtSql.so.4.4.0.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtSvg.so.4.4.0.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtTest.so.4.4.0.debug
+libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/libQtXml.so.4.4.0.debug
 libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so.debug
 libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/accessible/libqtaccessiblewidgets.so.debug
 libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/codecs/libqcncodecs.so.debug
@@ -44,20 +44,20 @@ libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/imageformats/l
 libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/imageformats/libqtiff.so.debug
 libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/inputmethods/libqimsw-multi.so.debug
 
-libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQt3Support.so.4.3.4.debug
-libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtAssistantClient.so.4.3.4.debug
-libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtCore.so.4.3.4.debug
-libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtDBus.so.4.3.4.debug
-libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtDesigner.so.4.3.4.debug
-libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtDesignerComponents.so.4.3.4.debug
-libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtGui.so.4.3.4.debug
-libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtNetwork.so.4.3.4.debug
-libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtOpenGL.so.4.3.4.debug
-libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtScript.so.4.3.4.debug
-libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtSql.so.4.3.4.debug
-libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtSvg.so.4.3.4.debug
-libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtTest.so.4.3.4.debug
-libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtXml.so.4.3.4.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQt3Support.so.4.4.0.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtAssistantClient.so.4.4.0.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtCore.so.4.4.0.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtDBus.so.4.4.0.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtDesigner.so.4.4.0.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtDesignerComponents.so.4.4.0.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtGui.so.4.4.0.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtNetwork.so.4.4.0.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtOpenGL.so.4.4.0.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtScript.so.4.4.0.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtSql.so.4.4.0.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtSvg.so.4.4.0.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtTest.so.4.4.0.debug
+libqt4-debug: shared-lib-without-dependency-information ./usr/lib/libQtXml.so.4.4.0.debug
 libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so.debug
 libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/accessible/libqtaccessiblewidgets.so.debug
 libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/codecs/libqcncodecs.so.debug
diff --git a/debian/libqt4-gui.install b/debian/libqt4-gui.install
index edf5ebd..524180e 100644
--- a/debian/libqt4-gui.install
+++ b/debian/libqt4-gui.install
@@ -11,4 +11,3 @@ usr/lib/qt4/plugins/iconengines/libqsvgicon.so
 usr/lib/qt4/plugins/imageformats/*.so
 usr/lib/qt4/plugins/inputmethods/libqimsw-multi.so
 usr/lib/qt4/plugins/script/libqtscriptdbus.so
-usr/lib/qt4/plugins/sqldrivers/*.so
diff --git a/debian/libqt4-sql.install b/debian/libqt4-sql.install
index 04783f7..5a61aad 100644
--- a/debian/libqt4-sql.install
+++ b/debian/libqt4-sql.install
@@ -1 +1,2 @@
 usr/lib/libQtSql.so.*
+usr/lib/qt4/plugins/sqldrivers/*.so
diff --git a/debian/patches/series b/debian/patches/series
index b7c4dfc..c46c580 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -30,3 +30,4 @@
 60_m68k_inotify_fix.diff
 70_hppa_ldcw_fix.diff
 80_hurd_max_path.diff
+
diff --git a/debian/rules b/debian/rules
index 93be989..45e4172 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 
 export QTDIR := $(shell pwd)
 export PATH := $(QTDIR)/bin:$(PATH)
-export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH)
 export LDFLAGS := -Wl,--no-undefined -Wl,--as-needed
 
 QTVERSION := $(shell ls changes-* | cut -f2 -d '-')
@@ -27,11 +26,6 @@ DEB_DH_MAKESHLIBS_ARGS_ALL := -V
 
 DEB_DH_STRIP_ARGS_libqt4-debug := --exclude=.debug
 
-# workaround for failure:
-# no dependency information found for /tmp/buildd/qt4-x11-4.4.0~beta1/lib/libQtWebKit.so.4
-# (used by debian/qt4-designer/usr/lib/qt4/plugins/designer/libqwebview.so).
-DEB_DH_SHLIBDEPS_ARGS_qt4-designer := --dpkg-shlibdeps-params=--ignore-missing-info
-
 # Qt4.4.0-beta1 does not contain changes file
 #DEB_INSTALL_CHANGELOGS_ALL := changes-$(QTVERSION)