use wrap-and-sort

3 files changed, 200 insertions, 130 deletions

diff --git a/debian/control b/debian/control
index 72dc23e..5351456 100644
--- a/debian/control
+++ b/debian/control
@@ -2,23 +2,56 @@ Source: qt4-x11
 Section: libs
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-Uploaders: Fathi Boudra <fabo@debian.org>, Modestas Vainius <modax@debian.org>, Sune Vuorela <debian@pusling.com>,
-Build-Depends: debhelper (>= 7.4.13), pkg-kde-tools (>= 0.6.4), flex,
- firebird2.1-dev [amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sh4 sparc],
- freetds-dev, g++ (>= 4:4.5) [s390], g++-4.6 (>= 4.6.0-7~) [armel],
- libasound2-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
- libaudio-dev, libcups2-dev, libdbus-1-dev, libfreetype6-dev,
- libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
- libglib2.0-dev,
- libglu1-mesa-dev [!armel !armhf] | libglu-dev [!armel !armhf],
- libgles2-mesa-dev [armel armhf] | libgles2-dev [armel armhf],
- libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libgtk2.0-dev,
- libice-dev, unixodbc-dev, libjpeg-dev, libmng-dev, libmysqlclient-dev,
- libpam0g-dev, libpng12-dev, libpq-dev, libreadline-dev, libsm-dev,
- libsqlite0-dev, libsqlite3-dev, libssl-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,
- libxtst-dev, libxv-dev, zlib1g-dev
+Uploaders: Fathi Boudra <fabo@debian.org>,
+           Modestas Vainius <modax@debian.org>,
+           Sune Vuorela <debian@pusling.com>,
+Build-Depends: debhelper (>= 7.4.13),
+               firebird2.1-dev [amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sh4 sparc],
+               flex,
+               freetds-dev,
+               g++ (>= 4:4.5) [s390],
+               g++-4.6 (>= 4.6.0-7~) [armel],
+               libasound2-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
+               libaudio-dev,
+               libcups2-dev,
+               libdbus-1-dev,
+               libfreetype6-dev,
+               libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
+               libgles2-mesa-dev [armel armhf] | libgles2-dev [armel armhf],
+               libglib2.0-dev,
+               libglu1-mesa-dev [!armel !armhf] | libglu-dev [!armel !armhf],
+               libgstreamer-plugins-base0.10-dev,
+               libgstreamer0.10-dev,
+               libgtk2.0-dev,
+               libice-dev,
+               libjpeg-dev,
+               libmng-dev,
+               libmysqlclient-dev,
+               libpam0g-dev,
+               libpng12-dev,
+               libpq-dev,
+               libreadline-dev,
+               libsm-dev,
+               libsqlite0-dev,
+               libsqlite3-dev,
+               libssl-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,
+               libxtst-dev,
+               libxv-dev,
+               pkg-kde-tools (>= 0.6.4),
+               unixodbc-dev,
+               zlib1g-dev
 Standards-Version: 3.9.2
 Homepage: http://qt.nokia.com/
 Vcs-Git: git://git.debian.org/pkg-kde/qt/qt4-x11.git
@@ -26,7 +59,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=summary
 
 Package: libqtcore4
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 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)
 Description: Qt 4 core module
@@ -37,9 +70,13 @@ Description: Qt 4 core module
 
 Package: libqt4-core
 Architecture: any
-Depends: ${misc:Depends}, libqtcore4 (= ${binary:Version}), libqt4-network (= ${binary:Version}),
- libqt4-script (= ${binary:Version}), libqt4-xml (= ${binary:Version}),
- libqt4-dbus (= ${binary:Version}), libqt4-test (= ${binary:Version})
+Depends: libqt4-dbus (= ${binary:Version}),
+         libqt4-network (= ${binary:Version}),
+         libqt4-script (= ${binary:Version}),
+         libqt4-test (= ${binary:Version}),
+         libqt4-xml (= ${binary:Version}),
+         libqtcore4 (= ${binary:Version}),
+         ${misc:Depends}
 Description: transitional package for Qt 4 core non-GUI runtime libraries
  Qt is a cross-platform C++ application framework.  Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -49,13 +86,17 @@ Description: transitional package for Qt 4 core non-GUI runtime libraries
 
 Package: libqtgui4
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, fontconfig
+Depends: fontconfig, ${misc:Depends}, ${shlibs:Depends}
 Recommends: libcups2
 Suggests: qt4-qtconfig
-Breaks: libqt4-core (<< 4.0.1-3), libqt4-gui (<< 4.4.0),
- qt4-designer (<< 4.1.4), libqt4-designer (<< 4.4.0~beta1-1)
-Replaces: libqt4-core (<< 4.0.1-3), libqt4-gui (<< 4.4.0),
- qt4-designer (<< 4.1.4), libqt4-designer (<< 4.4.0~beta1-1)
+Breaks: libqt4-core (<< 4.0.1-3),
+        libqt4-designer (<< 4.4.0~beta1-1),
+        libqt4-gui (<< 4.4.0),
+        qt4-designer (<< 4.1.4)
+Replaces: libqt4-core (<< 4.0.1-3),
+          libqt4-designer (<< 4.4.0~beta1-1),
+          libqt4-gui (<< 4.4.0),
+          qt4-designer (<< 4.1.4)
 Description: Qt 4 GUI module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -64,8 +105,11 @@ Description: Qt 4 GUI module
 
 Package: libqt4-gui
 Architecture: any
-Depends: ${misc:Depends}, libqtgui4 (= ${binary:Version}), libqt4-svg (= ${binary:Version}), libqt4-opengl (= ${binary:Version}),
- libqt4-designer (= ${binary:Version})
+Depends: libqt4-designer (= ${binary:Version}),
+         libqt4-opengl (= ${binary:Version}),
+         libqt4-svg (= ${binary:Version}),
+         libqtgui4 (= ${binary:Version}),
+         ${misc:Depends}
 Description: transitional package for Qt 4 GUI runtime libraries
  Qt is a cross-platform C++ application framework.  Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -76,7 +120,7 @@ Description: transitional package for Qt 4 GUI runtime libraries
 
 Package: libqt4-network
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqt4-core (<< 4.4.0~beta1-1)
 Replaces: libqt4-core (<< 4.4.0~beta1-1)
 Description: Qt 4 network module
@@ -88,7 +132,7 @@ Description: Qt 4 network module
 
 Package: libqt4-opengl
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqt4-gui (<< 4.4.0~beta1-1)
 Replaces: libqt4-gui (<< 4.4.0~beta1-1)
 Description: Qt 4 OpenGL module
@@ -103,7 +147,7 @@ Description: Qt 4 OpenGL module
 
 Package: libqt4-script
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqt4-core (<< 4.4.0~beta1-1)
 Replaces: libqt4-core (<< 4.4.0~beta1-1)
 Description: Qt 4 script module
@@ -114,7 +158,7 @@ Description: Qt 4 script module
 
 Package: libqt4-scripttools
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 4 script tools module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -127,7 +171,7 @@ Description: Qt 4 script tools module
 
 Package: libqt4-sql
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: libqt4-sql-mysql | libqt4-sql-odbc | libqt4-sql-psql | libqt4-sql-sqlite | libqt4-sql-sqlite2 | libqt4-sql-ibase [amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sh4 sparc]
 Suggests: libqt4-dev
 Description: Qt 4 SQL module
@@ -142,7 +186,7 @@ Description: Qt 4 SQL module
 
 Package: libqt4-sql-ibase
 Architecture: amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sh4 sparc
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: libqt4-dev
 Description: Qt 4 InterBase/FireBird database driver
  This package contains the InterBase/FireBird plugin for Qt 4.
@@ -152,7 +196,7 @@ Description: Qt 4 InterBase/FireBird database driver
 
 Package: libqt4-sql-mysql
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: libqt4-dev
 Description: Qt 4 MySQL database driver
  This package contains the MySQL plugin for Qt 4.
@@ -162,7 +206,7 @@ Description: Qt 4 MySQL database driver
 
 Package: libqt4-sql-odbc
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: libqt4-dev
 Description: Qt 4 ODBC database driver
  This package contains the ODBC plugin for Qt 4.
@@ -172,7 +216,7 @@ Description: Qt 4 ODBC database driver
 
 Package: libqt4-sql-psql
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: libqt4-dev
 Description: Qt 4 PostgreSQL database driver
  This package contains the PostgreSQL plugin for Qt 4.
@@ -182,7 +226,7 @@ Description: Qt 4 PostgreSQL database driver
 
 Package: libqt4-sql-sqlite
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: libqt4-dev
 Description: Qt 4 SQLite 3 database driver
  This package contains the SQLite 3 plugin for Qt 4.
@@ -192,7 +236,7 @@ Description: Qt 4 SQLite 3 database driver
 
 Package: libqt4-sql-sqlite2
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: libqt4-dev
 Description: Qt 4 SQLite 2 database driver
  This package contains the SQLite 2 plugin for Qt 4.
@@ -202,7 +246,7 @@ Description: Qt 4 SQLite 2 database driver
 
 Package: libqt4-sql-tds
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: libqt4-dev
 Description: Qt 4 FreeTDS database driver
  This package contains the FreeTDS plugin for Qt 4.
@@ -212,7 +256,7 @@ Description: Qt 4 FreeTDS database driver
 
 Package: libqt4-svg
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqt4-gui (<< 4.4.0~beta1-1)
 Replaces: libqt4-gui (<< 4.4.0~beta1-1)
 Description: Qt 4 SVG module
@@ -226,7 +270,7 @@ Description: Qt 4 SVG module
 
 Package: libqt4-webkit
 Architecture: any
-Depends: ${misc:Depends}, libqtwebkit4 (>= 2.0~)
+Depends: libqtwebkit4 (>= 2.0~), ${misc:Depends}
 Description: transitional package for 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.
@@ -236,7 +280,7 @@ Description: transitional package for Qt 4 WebKit module
 
 Package: libqt4-xml
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqt4-core (<< 4.4.0~beta1-1)
 Replaces: libqt4-core (<< 4.4.0~beta1-1)
 Description: Qt 4 XML module
@@ -248,7 +292,7 @@ Description: Qt 4 XML module
 
 Package: libqt4-xmlpatterns
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs: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.
@@ -257,7 +301,7 @@ Description: Qt 4 XML patterns module
 
 Package: libqt4-dbus
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: libqt4-core (<< 4.4.0~beta1-1), libqt4-dev (<< 4:4.7.1)
 Breaks: libqt4-core (<< 4.4.0~beta1-1), libqt4-dev (<< 4:4.7.1)
 Description: Qt 4 D-Bus module
@@ -273,7 +317,7 @@ Description: Qt 4 D-Bus module
 
 Package: libqt4-qt3support
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqt4-gui (<< 4.2.1-1), qt4-designer (<< 4.4.0~beta1-1)
 Replaces: libqt4-gui (<< 4.2.1-1), qt4-designer (<< 4.4.0~beta1-1)
 Description: Qt 3 compatibility library for Qt 4
@@ -288,7 +332,7 @@ Description: Qt 3 compatibility library for Qt 4
 
 Package: libqt4-designer
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqt4-gui (<< 4.4.0~beta1-1)
 Replaces: libqt4-gui (<< 4.4.0~beta1-1)
 Description: Qt 4 designer module
@@ -301,7 +345,7 @@ Description: Qt 4 designer module
 
 Package: libqt4-help
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 4 help module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -311,7 +355,7 @@ Description: Qt 4 help module
 
 Package: libqt4-assistant
 Architecture: any
-Depends: ${misc:Depends}, libqtassistantclient4 (>= 4.6.3)
+Depends: libqtassistantclient4 (>= 4.6.3), ${misc:Depends}
 Description: transitional package for Qt 4 assistant module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -321,7 +365,7 @@ Description: transitional package for Qt 4 assistant module
 
 Package: libqt4-test
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqt4-core (<< 4.4.0~beta1-1)
 Replaces: libqt4-core (<< 4.4.0~beta1-1)
 Description: Qt 4 test module
@@ -333,7 +377,7 @@ Description: Qt 4 test module
 
 Package: libqt4-phonon
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Conflicts: libphonon4
 Breaks: kdelibs5 (<= 4:4.0.80)
 Replaces: kdelibs5 (<= 4:4.0.80), libphonon4
@@ -350,9 +394,11 @@ Description: Qt 4 Phonon module
 
 Package: libqt4-declarative
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: qt4-qmlviewer, libqt4-declarative-folderlistmodel,
- libqt4-declarative-gestures, libqt4-declarative-particles
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Suggests: libqt4-declarative-folderlistmodel,
+          libqt4-declarative-gestures,
+          libqt4-declarative-particles,
+          qt4-qmlviewer
 Description: Qt 4 Declarative module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -362,7 +408,7 @@ Description: Qt 4 Declarative module
 
 Package: libqt4-declarative-folderlistmodel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 4 folderlistmodel QML plugin
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -371,7 +417,7 @@ Description: Qt 4 folderlistmodel QML plugin
 
 Package: libqt4-declarative-gestures
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 4 gestures QML plugin
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -380,7 +426,7 @@ Description: Qt 4 gestures QML plugin
 
 Package: libqt4-declarative-particles
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 4 particles QML plugin
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -390,20 +436,38 @@ Description: Qt 4 particles QML plugin
 Package: libqt4-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (= ${binary:Version}),
- libqt4-network (= ${binary:Version}), libqt4-dbus (= ${binary:Version}),
- libqtgui4 (= ${binary:Version}),
- libqt4-svg (= ${binary:Version}), libqt4-xml (= ${binary:Version}),
- libqt4-sql (= ${binary:Version}), libqt4-script (= ${binary:Version}),
- libqt4-scripttools (= ${binary:Version}), libqt4-xmlpatterns (= ${binary:Version}),
- libqt4-qt3support (= ${binary:Version}), libqt4-designer (= ${binary:Version}),
- libqt4-help (= ${binary:Version}), libqt4-test (= ${binary:Version}),
- libqt4-declarative (= ${binary:Version}), qt4-qmake (= ${binary:Version}),
- qt4-linguist-tools (= ${binary:Version})
+Depends: libqt4-dbus (= ${binary:Version}),
+         libqt4-declarative (= ${binary:Version}),
+         libqt4-designer (= ${binary:Version}),
+         libqt4-help (= ${binary:Version}),
+         libqt4-network (= ${binary:Version}),
+         libqt4-qt3support (= ${binary:Version}),
+         libqt4-script (= ${binary:Version}),
+         libqt4-scripttools (= ${binary:Version}),
+         libqt4-sql (= ${binary:Version}),
+         libqt4-svg (= ${binary:Version}),
+         libqt4-test (= ${binary:Version}),
+         libqt4-xml (= ${binary:Version}),
+         libqt4-xmlpatterns (= ${binary:Version}),
+         libqtcore4 (= ${binary:Version}),
+         libqtgui4 (= ${binary:Version}),
+         qt4-linguist-tools (= ${binary:Version}),
+         qt4-qmake (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: libqt4-opengl-dev (= ${binary:Version}), libqtwebkit-dev (>= 2.0~)
-Breaks: libqtwebkit-dev (<< 2.0~), libqt4-opengl-dev (<< 4.4.0-2), g++-4.6 (<< 4.6.0-7~) [armel]
-Replaces: libqtwebkit-dev (<< 2.0~), libqt4-opengl-dev (<< 4.4.0-2)
-Suggests: qt4-dev-tools, qt4-doc, libmysqlclient-dev, libsqlite0-dev, libsqlite3-dev, libpq-dev, unixodbc-dev, firebird2.1-dev
+Breaks: g++-4.6 (<< 4.6.0-7~) [armel],
+        libqt4-opengl-dev (<< 4.4.0-2),
+        libqtwebkit-dev (<< 2.0~)
+Replaces: libqt4-opengl-dev (<< 4.4.0-2), libqtwebkit-dev (<< 2.0~)
+Suggests: firebird2.1-dev,
+          libmysqlclient-dev,
+          libpq-dev,
+          libsqlite0-dev,
+          libsqlite3-dev,
+          qt4-dev-tools,
+          qt4-doc,
+          unixodbc-dev
 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.
@@ -414,11 +478,13 @@ Description: Qt 4 development files
 Package: libqt4-opengl-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends},
- libqt4-opengl (= ${binary:Version}), libqt4-dev (= ${binary:Version}),
- libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
- libglu1-mesa-dev [!armel !armhf] | libglu-dev [!armel !armhf],
- libgles2-mesa-dev [armel armhf] | libgles2-dev [armel armhf]
+Depends: libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
+         libgles2-mesa-dev [armel armhf] | libgles2-dev [armel armhf],
+         libglu1-mesa-dev [!armel !armhf] | libglu-dev [!armel !armhf],
+         libqt4-dev (= ${binary:Version}),
+         libqt4-opengl (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Breaks: libqt4-dev (<< 4.4.0-2)
 Replaces: libqt4-dev (<< 4.4.0-2)
 Description: Qt 4 OpenGL library development files
@@ -432,8 +498,7 @@ Package: libqt4-dbg
 Priority: extra
 Architecture: any
 Section: debug
-Depends: ${shlibs:Depends}, ${misc:Depends},
- libqtcore4 (= ${binary:Version})
+Depends: libqtcore4 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqt4-debug (<< 4.4.0~beta1-1)
 Conflicts: qt-x11-free-dbg
 Replaces: libqt4-debug (<< 4.4.0~beta1-1)
@@ -447,7 +512,7 @@ Package: libqt4-webkit-dbg
 Priority: extra
 Architecture: any
 Section: debug
-Depends: ${misc:Depends}, libqtwebkit4-dbg (>= 2.0~)
+Depends: libqtwebkit4-dbg (>= 2.0~), ${misc:Depends}
 Description: transitional package for Qt 4 WebKit debugging symbols
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -459,8 +524,9 @@ Package: libqt4-xmlpatterns-dbg
 Priority: extra
 Architecture: any
 Section: debug
-Depends: ${shlibs:Depends}, ${misc:Depends},
- libqt4-xmlpatterns (= ${binary:Version})
+Depends: libqt4-xmlpatterns (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Qt 4 XML patterns library debugging symbols
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -472,8 +538,7 @@ Package: qt4-demos-dbg
 Priority: extra
 Architecture: any
 Section: debug
-Depends: ${shlibs:Depends}, ${misc:Depends},
- qt4-demos (= ${binary:Version})
+Depends: qt4-demos (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 4 examples and demos debugging symbols
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -484,9 +549,13 @@ Description: Qt 4 examples and demos debugging symbols
 Package: qt4-designer
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: qt4-dev-tools (<= 4.0.1-2), libqt4-designer (<< 4.4.0~beta1-1), libqt4-core (<< 4.4.0~beta1-1)
-Replaces: qt4-dev-tools (<= 4.0.1-2), libqt4-designer (<< 4.4.0~beta1-1), libqt4-core (<< 4.4.0~beta1-1)
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libqt4-core (<< 4.4.0~beta1-1),
+        libqt4-designer (<< 4.4.0~beta1-1),
+        qt4-dev-tools (<= 4.0.1-2)
+Replaces: libqt4-core (<< 4.4.0~beta1-1),
+          libqt4-designer (<< 4.4.0~beta1-1),
+          qt4-dev-tools (<= 4.0.1-2)
 Recommends: libqt4-dev
 Description: graphical designer for Qt 4 applications
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -498,10 +567,10 @@ Description: graphical designer for Qt 4 applications
 Package: qt4-dev-tools
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-sql-sqlite
+Depends: libqt4-sql-sqlite, ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqt4-core (<< 4.4.0~beta1-1)
 Replaces: libqt4-core (<< 4.4.0~beta1-1)
-Recommends: libqt4-dev, qt4-doc, qt4-designer
+Recommends: libqt4-dev, qt4-designer, qt4-doc
 Suggests: qt4-doc-html
 Conflicts: qt3-dev-tools-embedded
 Description: Qt 4 development tools
@@ -515,7 +584,7 @@ Description: Qt 4 development tools
 Package: qt4-qmake
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqt4-dev (<< 4.5.0~beta1+snapshot20090114-1)
 Replaces: libqt4-dev (<< 4.5.0~beta1+snapshot20090114-1)
 Description: Qt 4 qmake Makefile generator tool
@@ -536,9 +605,9 @@ Description: Qt 4 qmake Makefile generator tool
 Package: qt4-qtconfig
 Architecture: any
 Section: x11
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: libqt4-gui (<< 4.1.0), libqt4-core (<< 4.4.0~beta1-1)
-Replaces: libqt4-gui (<< 4.1.0), libqt4-core (<< 4.4.0~beta1-1)
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libqt4-core (<< 4.4.0~beta1-1), libqt4-gui (<< 4.1.0)
+Replaces: libqt4-core (<< 4.4.0~beta1-1), libqt4-gui (<< 4.1.0)
 Description: Qt 4 configuration tool
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -549,9 +618,11 @@ Description: Qt 4 configuration tool
 Package: qt4-demos
 Architecture: any
 Section: x11
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: qt4-doc (= ${source:Version}), qt4-dev-tools (= ${source:Version}),
- libqt4-declarative-gestures, libqt4-declarative-particles
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: libqt4-declarative-gestures,
+            libqt4-declarative-particles,
+            qt4-dev-tools (= ${source:Version}),
+            qt4-doc (= ${source:Version})
 Suggests: qt4-qmlviewer
 Description: Qt 4 examples and demos
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -562,7 +633,7 @@ Description: Qt 4 examples and demos
 Package: qt4-qmlviewer
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 4 QML viewer
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -572,7 +643,7 @@ Description: Qt 4 QML viewer
 Package: qt4-linguist-tools
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqt4-dev (<< 4.7.3-2)
 Replaces: libqt4-dev (<< 4.7.3-2)
 Description: Qt 4 Linguist tools
@@ -603,7 +674,7 @@ Package: qt4-doc-html
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Suggests: w3m | www-browser | x-www-browser, libqt4-dev, qt-assistant-compat
+Suggests: libqt4-dev, qt-assistant-compat, w3m | www-browser | x-www-browser
 Description: Qt 4 API documentation (HTML format)
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -611,4 +682,3 @@ Description: Qt 4 API documentation (HTML format)
  This package contains the complete Qt 4 API documentation (HTML format).
  .
  The documentation is provided in HTML format.
-
diff --git a/debian/copyright b/debian/copyright
index d67edba..5f43d9a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -67,7 +67,7 @@ As an additional permission to the GNU Lesser General Public License version
 2.1, the object code form of a "work that uses the Library" may incorporate
 material from a header file that is part of the Library.  You may distribute
 such object code under terms of your choice, provided that:
-    (i)   the header files of the Library have not been modified; and 
+    (i)   the header files of the Library have not been modified; and
     (ii)  the incorporated material is limited to numerical parameters, data
           structure layouts, accessors, macros, inline functions and
           templates; and
@@ -231,16 +231,16 @@ Copyright for src/testlib/3rdparty/valgrind_p.h:
    1. Redistributions of source code must retain the above copyright
       notice, this list of conditions and the following disclaimer.
 
-   2. The origin of this software must not be misrepresented; you must 
-      not claim that you wrote the original software.  If you use this 
-      software in a product, an acknowledgment in the product 
+   2. The origin of this software must not be misrepresented; you must
+      not claim that you wrote the original software.  If you use this
+      software in a product, an acknowledgment in the product
       documentation would be appreciated but is not required.
 
    3. Altered source versions must be plainly marked as such, and must
       not be misrepresented as being the original software.
 
-   4. The name of the author may not be used to endorse or promote 
-      products derived from this software without specific prior written 
+   4. The name of the author may not be used to endorse or promote
+      products derived from this software without specific prior written
       permission.
 
    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
@@ -262,7 +262,7 @@ Copyright for src/testlib/3rdparty/valgrind_p.h:
    the terms of the GNU General Public License, version 2.  See the
    COPYING file in the source distribution for details.
 
-   ---------------------------------------------------------------- 
+   ----------------------------------------------------------------
 
 Copyright for src/testlib/3rdparty/cycle_p.h
 
@@ -312,16 +312,16 @@ Copyright for tests/auto/exceptionsafety_objects/3rdparty/memcheck.h:
    1. Redistributions of source code must retain the above copyright
       notice, this list of conditions and the following disclaimer.
 
-   2. The origin of this software must not be misrepresented; you must 
-      not claim that you wrote the original software.  If you use this 
-      software in a product, an acknowledgment in the product 
+   2. The origin of this software must not be misrepresented; you must
+      not claim that you wrote the original software.  If you use this
+      software in a product, an acknowledgment in the product
       documentation would be appreciated but is not required.
 
    3. Altered source versions must be plainly marked as such, and must
       not be misrepresented as being the original software.
 
-   4. The name of the author may not be used to endorse or promote 
-      products derived from this software without specific prior written 
+   4. The name of the author may not be used to endorse or promote
+      products derived from this software without specific prior written
       permission.
 
    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
@@ -343,7 +343,7 @@ Copyright for tests/auto/exceptionsafety_objects/3rdparty/memcheck.h:
    the terms of the GNU General Public License, version 2.  See the
    COPYING file in the source distribution for details.
 
-   ---------------------------------------------------------------- 
+   ----------------------------------------------------------------
 
 Copyright for tests/auto/exceptionsafety_objects/3rdparty/valgrind.h:
 
@@ -369,16 +369,16 @@ Copyright for tests/auto/exceptionsafety_objects/3rdparty/valgrind.h:
    1. Redistributions of source code must retain the above copyright
       notice, this list of conditions and the following disclaimer.
 
-   2. The origin of this software must not be misrepresented; you must 
-      not claim that you wrote the original software.  If you use this 
-      software in a product, an acknowledgment in the product 
+   2. The origin of this software must not be misrepresented; you must
+      not claim that you wrote the original software.  If you use this
+      software in a product, an acknowledgment in the product
       documentation would be appreciated but is not required.
 
    3. Altered source versions must be plainly marked as such, and must
       not be misrepresented as being the original software.
 
-   4. The name of the author may not be used to endorse or promote 
-      products derived from this software without specific prior written 
+   4. The name of the author may not be used to endorse or promote
+      products derived from this software without specific prior written
       permission.
 
    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
@@ -400,7 +400,7 @@ Copyright for tests/auto/exceptionsafety_objects/3rdparty/valgrind.h:
    the terms of the GNU General Public License, version 2.  See the
    COPYING file in the source distribution for details.
 
-   ---------------------------------------------------------------- 
+   ----------------------------------------------------------------
 
 Copyright for demos/embedded/fluidlauncher/pictureflow.*:
 
@@ -665,7 +665,7 @@ Copyright for src/3rdparty/libtiff/port/*:
 
     Copyright (c) 1987-1994 The Regents of the University of California.
                             All rights reserved.
- 
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
     are met:
@@ -677,7 +677,7 @@ Copyright for src/3rdparty/libtiff/port/*:
     3. Neither the name of the University nor the names of its contributors
        may be used to endorse or promote products derived from this software
        without specific prior written permission.
- 
+
     THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
     ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
     IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -706,7 +706,7 @@ Copyright for src/plugins/codecs/jp/*:
     2. Redistributions in binary form must reproduce the above copyright
        notice, this list of conditions and the following disclaimer in the
        documentation and/or other materials provided with the distribution.
- 
+
     THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
     ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
     IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -721,11 +721,11 @@ Copyright for src/plugins/codecs/jp/*:
 
 Copyright for src/plugins/codecs/kr/*:
 
-    Most of the cp949 code was originally written by Joon-Kyu Park, and is included 
+    Most of the cp949 code was originally written by Joon-Kyu Park, and is included
     in Qt with the author's permission and the grateful thanks of the Qt team.
 
     Copyright (C) 1999-2000 Mizi Research Inc. All rights reserved.
- 
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
     are met:
@@ -734,7 +734,7 @@ Copyright for src/plugins/codecs/kr/*:
     2. Redistributions in binary form must reproduce the above copyright
        notice, this list of conditions and the following disclaimer in the
        documentation and/or other materials provided with the distribution.
- 
+
     THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
     ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
     IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/debian/libqt4-dev.install b/debian/libqt4-dev.install
index dcd7253..32de6b6 100644
--- a/debian/libqt4-dev.install
+++ b/debian/libqt4-dev.install
@@ -1,3 +1,10 @@
+#usr/include/qt4/Qt/QtOpenVG
+#usr/include/qt4/Qt/qvg.h
+#usr/include/qt4/QtOpenVG/QtOpenVG
+#usr/include/qt4/QtOpenVG/qvg.h
+#usr/lib/libQtOpenVG.prl
+#usr/lib/libQtOpenVG.so
+#usr/lib/pkgconfig/QtOpenVG.pc
 usr/bin/moc-qt4
 usr/bin/qdbuscpp2xml
 usr/bin/qdbusxml2cpp
@@ -12,7 +19,6 @@ usr/include/qt4/Qt/QtDeclarative
 usr/include/qt4/Qt/QtGui
 usr/include/qt4/Qt/QtHelp
 usr/include/qt4/Qt/QtNetwork
-#usr/include/qt4/Qt/QtOpenVG
 usr/include/qt4/Qt/QtScript
 usr/include/qt4/Qt/QtScriptTools
 usr/include/qt4/Qt/QtSql
@@ -699,7 +705,6 @@ usr/include/qt4/Qt/qvector2d.h
 usr/include/qt4/Qt/qvector3d.h
 usr/include/qt4/Qt/qvector4d.h
 usr/include/qt4/Qt/qvfbhdr.h
-#usr/include/qt4/Qt/qvg.h
 usr/include/qt4/Qt/qwaitcondition.h
 usr/include/qt4/Qt/qwhatsthis.h
 usr/include/qt4/Qt/qwidget.h
@@ -2520,8 +2525,6 @@ usr/include/qt4/QtNetwork/qtcpserver.h
 usr/include/qt4/QtNetwork/qtcpsocket.h
 usr/include/qt4/QtNetwork/qudpsocket.h
 usr/include/qt4/QtNetwork/qurlinfo.h
-#usr/include/qt4/QtOpenVG/QtOpenVG
-#usr/include/qt4/QtOpenVG/qvg.h
 usr/include/qt4/QtScript/QScriptClass
 usr/include/qt4/QtScript/QScriptClassPropertyIterator
 usr/include/qt4/QtScript/QScriptContext
@@ -2775,8 +2778,6 @@ usr/lib/libQtHelp.prl
 usr/lib/libQtHelp.so
 usr/lib/libQtNetwork.prl
 usr/lib/libQtNetwork.so
-#usr/lib/libQtOpenVG.prl
-#usr/lib/libQtOpenVG.so
 usr/lib/libQtScript.prl
 usr/lib/libQtScript.so
 usr/lib/libQtScriptTools.prl
@@ -2803,7 +2804,6 @@ usr/lib/pkgconfig/QtDesignerComponents.pc
 usr/lib/pkgconfig/QtGui.pc
 usr/lib/pkgconfig/QtHelp.pc
 usr/lib/pkgconfig/QtNetwork.pc
-#usr/lib/pkgconfig/QtOpenVG.pc
 usr/lib/pkgconfig/QtScript.pc
 usr/lib/pkgconfig/QtScriptTools.pc
 usr/lib/pkgconfig/QtSql.pc