Merge Qt4 branch with trunk.

99 files changed, 1723 insertions, 1333 deletions

diff --git a/debian/changelog b/debian/changelog
index 5320460..b47ea30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,148 @@
+qt4-x11 (4.4.0~rc1-2) unstable; urgency=low
+
+  * Add patch for Explicit template specialization cannot have a storage class
+    with gcc-4.3. Specializations of templates cannot explicitly specify
+    a storage class, and have the same storage as the primary template. 
+
+ -- Fathi Boudra <fabo@debian.org>  Wed, 09 Apr 2008 09:40:00 +0200
+
+qt4-x11 (4.4.0~rc1-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #469783)
+
+  +++ Changes by Modestas Vainius:
+
+  * Refresh qt-copy patches:
+    * 0167-fix-group-reading.diff - adjust offsets.
+    * 0180-window-role.diff - adjust offsets.
+    * 0195-compositing-properties.diff - adjust offsets.
+    * 0203-qtexthtmlparser-link-color.diff - adjust offsets.
+    * 0209-prevent-qt-mixing.diff - adjust offsets.
+    * 0214-fix-qgraphicsproxywidget-tab-crash.diff - adjust offsets.
+    * 0216-allow-isystem-for-headers.diff - adjust offsets.
+  * Remove qt-copy patches:
+    * 0172-prefer-xrandr-over-xinerama.diff - merged upstream.
+    * 0178-transparency-window-types.diff - merged upstream.
+    * 0215-compile-with-Xcursor-linkage.diff - merged upstream.
+    * 0217-qurl-isempty-regression.diff - merged upstream.
+    * 0218-qassert-macro-fix.diff - merged upstream.
+    * fix-qt_bootstrapped-typo.diff  - merged upstream.
+  * Add qt-copy patches:
+    * 0220-no-x-recursion-in-xerrhandler.diff - adjust offsets.
+  * Refresh Debian patches:
+    * 02_launch_assistant-qt4.diff - adjust offsets.
+    * 05_append_qt4_target.diff - adopt to upstream changes. lrelease and
+      lupdate have been moved to tools/linguist/, adjust offsets.
+    * 50_kfreebsd_build_fix.diff - adjust offsets.
+    * 80_hurd_max_path.diff - adjust offsets.
+  * Remove Debian patches:
+    * 08_load_ssl.diff - different fix applied upstream.
+  * Update *.install files:
+    * qt4-dev-tools.install: a few renames of the language files,
+      s/assistant-qt3/assistant-qt4/, add usr/bin/xmlpatterns
+  * Add libqt4-core transitional package. (Closes: #473658)
+  * Add debian/not-installed to document files which are deliberately not
+    installed
+  * Avoid calling ./configure repeatedly during build/install: tie ./configure
+    to config.status
+
+  +++ Changes by Fathi Boudra:
+
+  * Re-introduce LD_LIBRARY_PATH workaround to use lrelease.
+  * Remove Conflicts against libqt4-core.
+  * Reorder libqt4-sql dependencies to have packages available on all
+    architectures listed first. (Closes: #473348)
+  * Add architectures availability list to libqt4-sql-ibase package.
+    (Closes: #473348)
+  * Add patch to fix unaligned access on hppa. Thanks to Bernhard R. Link.
+    (Closes: #458133)
+  * Add patch to replace remaining qdbus by dbus. Fix libqtscriptdbus build.
+  * Update configure options:
+    * Replace -qdbus by -dbus.
+    * Add -svg.
+
+  +++ Changes by Matthew Rosewarne:
+
+  * Rewrite clean rule to remove remaining build cruft.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 07 Apr 2008 01:36:54 -0400
+
+qt4-x11 (4.4.0~beta1-1) experimental; urgency=low
+
+  * New upstream release.
+
+  * Add build dependencies: doxygen, firebird2.0-dev, libiodbc2-dev,
+    libpam0g-dev, libreadline5-dev, libxslt1-dev.
+  * Split libqt4-gui and libqt4-core packages.
+  * Create package for each Qt module.
+  * Enable all SQL drivers as plugins and add related packages:
+    libqt4-sql-ibase, libqt4-sql-mysql, libqt4-sql-odbc, libqt4-sql-psql,
+    libqt4-sql-sqlite, libqt4-sql-sqlite2.
+  * Add packages: libqt4-assistant, libqt4-dbus, libqt4-designer, libqt4-help,
+    libqt4-network, libqt4-opengl, libqt4-script, libqt4-svg, libqt4-test,
+    libqt4-webkit, libqt4-xml, libqt4-xmlpatterns and qt4-demos.
+  * Replace libqt4-core by libqtcore4 package.
+  * Rename libqt4-debug to libqt4-dbg like other debug packages in Debian.
+  * Update .lintian override files.
+  * Update .install files.
+  * Move translations files in their respective packages.
+  * Disable DEB_INSTALL_CHANGELOGS_ALL.
+  * Build ibase sql plugin on supported architectures only.
+  * Enable demos, examples, WebKit and XmlPatterns.
+  * Enable exceptions. It is a dependency to XmlPatterns module.
+  * Add qtdemo help collection file.
+  * Split WebKit and XmlPatterns debug packages from libqt4-dbg.
+  * Generate Doxygen tagfile in libqt4-dev. Thanks to Matthew Rosewarne.
+  * Examples and Demos are not shipped compressed anymore.
+  * Refresh qt-copy patches:
+    * 0167-fix-group-reading
+    * 0172-prefer-xrandr-over-xinerama
+    * 0178-transparency-window-types
+    * 0180-window-role
+    * 0191-listview-alternate-row-colors
+    * 0192-itemdelegate-palette-state
+    * 0195-compositing-properties
+    * 0203-qtexthtmlparser-link-color
+    * 0209-prevent-qt-mixing
+    * 0210-fix-crash-q3stylesheet-font-size
+  * Remove qt-copy patches:
+    * 0175-fix-s390-qatomic
+    * 0176-coverity-fixes
+    * 0179-transient-hack
+    * 0187-fix-font-fixed-pitch
+    * 0194-fix-moveonly-dnd-in-itemviews
+    * 0200-fix-qsslsocket-waitfor
+    * 0205-fast-qpixmap-fill
+    * 0211-q3action-crash
+  * Add qt-copy patches:
+    * 0214-fix-qgraphicsproxywidget-tab-crash
+    * 0215-compile-with-Xcursor-linkage
+    * 0216-allow-isystem-for-headers
+    * 0217-qurl-isempty-regression
+    * 0218-qassert-macro-fix
+    * fix-qt_bootstrapped-typo
+  * Refresh Debian patches:
+    * 01_qmake_for_debian
+    * 02_launch_assistant-qt4
+    * 03_launch_moc-qt4
+    * 04_launch_uic-qt4
+    * 05_append_qt4_target
+    * 08_load_ssl
+    * 10_config_tests_fixes
+    * 40_alpha_ice
+    * 41_disable_opengl_visibility
+    * 50_kfreebsd_build_fix
+    * 60_m68k_inotify_fix
+    * 80_hurd_max_path
+  * Remove Debian patches:
+    * 06_qtdemo_destdir. Useless as we ship qtdemo again.
+    * 30_arm_ftbfs_fixes. Merged upstream.
+    * 31_arm_eabi_fix. Upstream changed arm architecture handling.
+      This patch doesn't apply as it is.
+    * 91_qmake_lflags_no-undefined. Merged upstream.
+
+ -- Fathi Boudra <fabo@debian.org>  Thu, 13 Mar 2008 22:34:45 +0100
+
 qt4-x11 (4.3.4-2) unstable; urgency=low
 
   * Add patches:
diff --git a/debian/collection/qtdemo.qhc.uu b/debian/collection/qtdemo.qhc.uu
new file mode 100644
index 0000000..4e4898e
--- /dev/null
+++ b/debian/collection/qtdemo.qhc.uu
@@ -0,0 +1,231 @@
+begin 644 qtdemo.qhc
+M4U%,:71E(&9O<FUA="`S``0``0$`0"`@````%@````````````````````8`
+M```!```````````````"````````````````````````````````````````
+M``````````````4````!`_L`````"`/[````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M```````````````````````````````````````````&`PT````"`MT``X$"
+MW0``````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M``"!(0(%`'6!76,`;P!M`"X`=`!R`&\`;`!L`'0`90!C`&@`+@!D`&4`<P!I
+M`&<`;@!E`'(`+@`T`#0`,``N`"X`+P`N`"X`+P`N`"X`+P`N`"X`+P!S`&@`
+M80!R`&4`+P!Q`'0`-``O`&0`;P!C`"\`:`!T`&T`;``M`&0`90!S`&D`9P!N
+M`&4`<@`O`&0`90!S`&D`9P!N`&4`<@`N`'$`8P!H`'T!!0!=@2UC`&\`;0`N
+M`'0`<@!O`&P`;`!T`&4`8P!H`"X`<0!T`"X`-``T`#``+@`N`"\`+@`N`"\`
+M+@`N`"\`+@`N`"\`<P!H`&$`<@!E`"\`<0!T`#0`+P!D`&\`8P`O`&@`=`!M
+M`&P`+0!Q`'0`+P!Q`'0`+@!Q`&,`:``-`````@/B``/Q`^(`````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````#0($``$=`G$`9`!O`&,`#0$$
+M``$=`7$`9`!O`&,`#0````4#KP`#]P/H`],#Q`.O````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M`````````````!,%`P`M9`!E`',`:0!G`&X`90!R``T$`P`A=`!O`&\`;`!S
+M`!,#`P`M<0!T`'(`90!F`&0`;P!C``T"`P`A-``N`#0`+@`P``<!`P`5<0!T
+M``T````"`\(``^L#P@``````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````)P(#`%51`'0`(`!$`&4`<P!I`&<`;@!E`'(`
+M(`!-`&$`;@!U`&$`;``3`0,`+5$`=``@`#0`+@`T`"X`,``-`````P$_``$_
+M`BH##P``````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````@6@!!R%%
+M10&"270`80!B`&P`90!.`&$`;0!E`',`<`!A`&,`90!4`&$`8@!L`&4`3@!A
+M`&T`90!S`'``80!C`&4`5`!A`&(`;`!E``)#`%(`10!!`%0`10`@`%0`00!"
+M`$P`10`@`$X`80!M`&4`<P!P`&$`8P!E`%0`80!B`&P`90`@`"@`20!D`"``
+M20!.`%0`10!'`$4`4@`@`%``4@!)`$T`00!2`%D`(`!+`$4`60`L`"``3@!A
+M`&T`90`@`%0`10!8`%0`+``@`$8`:0!L`&4`4`!A`'0`:``@`%0`10!8`%0`
+M(``I`(%B`@<A.3D!@E5T`&$`8@!L`&4`1@!O`&P`9`!E`'(`5`!A`&(`;`!E
+M`$8`;P!L`&0`90!R`%0`80!B`&P`90`#0P!2`$4`00!4`$4`(`!4`$$`0@!,
+M`$4`(`!&`&\`;`!D`&4`<@!4`&$`8@!L`&4`(``H`$D`9``@`$D`3@!4`$4`
+M1P!%`%(`(`!0`%(`20!-`$$`4@!9`"``2P!%`%D`+``@`$X`80!M`&4`<P!P
+M`&$`8P!E`$D`9``@`$D`3@!4`$4`1P!%`%(`+``@`$X`80!M`&4`(`!4`$4`
+M6`!4`"``*0"!;@,'(5U=`8(E=`!A`&(`;`!E`$8`:0!L`'0`90!R`$$`=`!T
+M`'(`:0!B`'4`=`!E`%0`80!B`&P`90!&`&D`;`!T`&4`<@!!`'0`=`!R`&D`
+M8@!U`'0`90!4`&$`8@!L`&4`!$,`4@!%`$$`5`!%`"``5`!!`$(`3`!%`"``
+M1@!I`&P`=`!E`'(`00!T`'0`<@!I`&(`=0!T`&4`5`!A`&(`;`!E`"``*`!)
+M`&0`(`!)`$X`5`!%`$<`10!2`"``4`!2`$D`30!!`%(`60`@`$L`10!9`"P`
+M(`!.`&$`;0!E`"``5`!%`%@`5``@`"D`#0````4#W0`#^0/R`^L#Y`/=````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M```````````````````````````````%!0,!`0(%!00#`0$"!`4#`P$!`@$%
+M`@,!`0$"!0$#`0$!`0T"7@`$`2L``F(#-0$K`?``````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````@4(&
+M!R%!00&"!70`80!B`&P`90!3`&4`=`!T`&D`;@!G`',`5`!A`&(`;`!E`%,`
+M90!T`'0`:0!N`&<`<P!4`&$`8@!L`&4`"4,`4@!%`$$`5`!%`"``5`!!`$(`
+M3`!%`"``4P!E`'0`=`!I`&X`9P!S`%0`80!B`&P`90`@`"@`2P!E`'D`(`!4
+M`$4`6`!4`"``4`!2`$D`30!!`%(`60`@`$L`10!9`"P`(`!6`&$`;`!U`&4`
+M(`!"`$P`3P!"`"``*0!L!P<A@0U!`0!I`&X`9`!E`'@`<P!Q`&P`:0!T`&4`
+M7P!A`'4`=`!O`&D`;@!D`&4`>`!?`%,`90!T`'0`:0!N`&<`<P!4`&$`8@!L
+M`&4`7P`Q`%,`90!T`'0`:0!N`&<`<P!4`&$`8@!L`&4`"@````2!4`0'(4E)
+M`8(1=`!A`&(`;`!E`$8`:0!L`'0`90!R`$X`80!M`&4`5`!A`&(`;`!E`$8`
+M:0!L`'0`90!R`$X`80!M`&4`5`!A`&(`;`!E``5#`%(`10!!`%0`10`@`%0`
+M00!"`$P`10`@`$8`:0!L`'0`90!R`$X`80!M`&4`5`!A`&(`;`!E`"``*`!)
+M`&0`(`!)`$X`5`!%`$<`10!2`"``4`!2`$D`30!!`%(`60`@`$L`10!9`"P`
+M(`!.`&$`;0!E`"``5`!%`%@`5``@`"D`@4@%!R$Y.0&"(70`80!B`&P`90!&
+M`&D`;`!T`&4`<@!4`&$`8@!L`&4`1@!I`&P`=`!E`'(`5`!A`&(`;`!E``=#
+M`%(`10!!`%0`10`@`%0`00!"`$P`10`@`$8`:0!L`'0`90!R`%0`80!B`&P`
+M90`@`"@`3@!A`&T`90!)`&0`(`!)`$X`5`!%`$<`10!2`"P`(`!&`&D`;`!T
+M`&4`<@!!`'0`=`!R`&D`8@!U`'0`90!)`&0`(`!)`$X`5`!%`$<`10!2`"``
+M*0`-``````0`````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````"@`````$````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+9````````````````````````````````````
+`
+end
diff --git a/debian/control b/debian/control
index f24d3b3..81c908c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,151 +3,438 @@ Section: libs
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Brian Nelson <pyro@debian.org>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Ana Beatriz Guerrero Lopez <ana@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), quilt, flex, sharutils,
+Build-Depends: cdbs, debhelper (>= 5), quilt, flex, sharutils, doxygen,
+ 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, libjpeg62-dev, libmng-dev, libmysqlclient15-dev, libpng12-dev,
- libpq-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, libxt-dev,
- x11proto-core-dev, zlib1g-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
 Standards-Version: 3.7.3
 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: libqtcore4
 Architecture: any
-Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends},
- libqt4-gui (= ${binary:Version}), libqt4-sql (= ${binary:Version}),
- libqt4-qt3support (= ${binary:Version}),
- libaudio-dev, libcupsys2-dev, libdbus-1-dev, libfreetype6-dev,
- libgl1-mesa-dev | libgl-dev, libglib2.0-dev, libglu1-mesa-dev | libglu-dev,
- libice-dev, libjpeg62-dev, libmng-dev, libmysqlclient15-dev, libpng12-dev,
- libpq-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, 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
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libqt4-core (<< 4.4.0~beta1-1)
+Description: Qt 4 core 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 header development files and development
- programs such as qmake used for building Qt4 applications.
+ The QtCore module contains core non-GUI functionality.
 
 Package: libqt4-core
-Architecture: any
+Architecture: all
 Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Qt 4 core non-GUI functionality runtime library
+Depends: libqtcore4 (>= ${source:Version}), libqt4-network (>= ${source:Version}), libqt4-script (>= ${source:Version}), libqt4-xml (>= ${source:Version}), libqt4-dbus (>= ${source:Version}), libqt4-test (>= ${source:Version})
+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.
  .
- This packages contains the core non-GUI shared library, and the Network
- and XML modules.
+ This is a dummy transitional package to enable installation of other Debian
+ packages linked against Qt 4.3 or earlier Qt 4 release previously shipped
+ in Debian.
 
 Package: libqt4-gui
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}, fontconfig
 Recommends: qt4-qtconfig
-Replaces: libqt4-core (<< 4.0.1-3), qt4-designer (<< 4.1.4), libqt4-designer
-Conflicts: libqt4-designer
-Description: Qt 4 core GUI functionality runtime library
- Qt is a cross-platform C++ application framework.  Qt's primary feature
+Conflicts: libqt4-designer (<< 4.4.0~beta1-1)
+Replaces: libqt4-core (<< 4.0.1-3), qt4-designer (<< 4.1.4), libqt4-designer (<< 4.4.0~beta1-1)
+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.
  .
- This packages contains the core GUI shared library and the OpenGL
- module.
+ The QtGui module extends QtCore with GUI functionality.
+
+Package: libqt4-network
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libqt4-core (<< 4.4.0~beta1-1)
+Description: Qt 4 network module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ The QtNetwork module offers classes that allow you to write TCP/IP clients and
+ servers. It provides classes to make network programming easier and portable.
+
+Package: libqt4-opengl
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libqt4-gui (<< 4.4.0~beta1-1)
+Replaces: libqt4-gui (<< 4.4.0~beta1-1)
+Description: Qt 4 OpenGL module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ The QtOpenGL module offers classes that make it easy to use OpenGL in Qt
+ applications.
+ .
+ OpenGL is a standard API for rendering 3D graphics. OpenGL only deals with 3D
+ rendering and provides little or no support for GUI programming issues.
+
+Package: libqt4-script
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libqt4-core (<< 4.4.0~beta1-1)
+Description: Qt 4 script module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ The QtScript module provides classes for making Qt applications scriptable.
 
 Package: libqt4-sql
 Architecture: any
 Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libqt4-sql-mysql | libqt4-sql-odbc | libqt4-sql-psql | libqt4-sql-sqlite | libqt4-sql-sqlite2 | libqt4-sql-ibase [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc]
+Suggests: libqt4-dev
+Description: Qt 4 SQL module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ The QtSql module helps you provide seamless database integration to your Qt
+ applications.
+ .
+ If you wish to to use the SQL module for development, you should install the
+ libqt4-dev package.
+
+Package: libqt4-sql-ibase
+Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc
+Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: libqt4-dev
-Description: Qt 4 SQL database module
- Qt is a cross-platform C++ application framework.  Qt's primary feature
+Description: Qt 4 InterBase/FireBird database driver
+ This package contains the InterBase/FireBird plugin for Qt 4.
+ .
+ Install it if you intend to use or write Qt programs that are to access an
+ InterBase/FireBird DB.
+
+Package: libqt4-sql-mysql
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: libqt4-dev
+Description: Qt 4 MySQL database driver
+ This package contains the MySQL plugin for Qt 4.
+ .
+ Install it if you intend to use or write Qt programs that are to access a
+ MySQL DB.
+
+Package: libqt4-sql-odbc
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: libqt4-dev
+Description: Qt 4 ODBC database driver
+ This package contains the ODBC plugin for Qt 4.
+ .
+ Install it if you intend to use or write Qt programs that are to access an
+ ODBC DB.
+
+Package: libqt4-sql-psql
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: libqt4-dev
+Description: Qt 4 PostgreSQL database driver
+ This package contains the PostgreSQL plugin for Qt 4.
+ .
+ Install it if you intend to use or write Qt programs that are to access a
+ PostgreSQL DB.
+
+Package: libqt4-sql-sqlite
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: libqt4-dev
+Description: Qt 4 SQLite 3 database driver
+ This package contains the SQLite 3 plugin for Qt 4.
+ .
+ Install it if you intend to use or write Qt programs that are to access an
+ SQLite 3 DB.
+
+Package: libqt4-sql-sqlite2
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: libqt4-dev
+Description: Qt 4 SQLite 2 database driver
+ This package contains the SQLite 2 plugin for Qt 4.
+ .
+ Install it if you intend to use or write Qt programs that are to access an
+ SQLite 2 DB.
+
+Package: libqt4-svg
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libqt4-gui (<< 4.4.0~beta1-1)
+Replaces: libqt4-gui (<< 4.4.0~beta1-1)
+Description: Qt 4 SVG module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ The QtSvg module provides classes for displaying the contents of SVG files.
+ .
+ Scalable Vector Graphics (SVG) is a language for describing two-dimensional
+ graphics and graphical applications in XML.
+
+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.
+ .
+ QtWebKit provides a Web browser engine that makes it easy to embed content
+ from the World Wide Web into your Qt application.
+
+Package: libqt4-xml
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libqt4-core (<< 4.4.0~beta1-1)
+Description: Qt 4 XML module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ The QtXml module provides a stream reader and writer for XML documents,
+ and C++ implementations of SAX and DOM.
+
+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.
+ .
+ QtXmlPatterns is a XQuery and XPath engine for XML and custom data models.
+
+Package: libqt4-dbus
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libqt4-core (<< 4.4.0~beta1-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 SQL module for Qt.  It includes support for
- PostgreSQL, MySQL, and SQLite databases.  If you wish to to use the SQL
- module for development, you should install the libqt4-dev package.
+ 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-qt3support
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libqt4-gui (<< 4.2.1-1)
+Replaces: libqt4-gui (<< 4.2.1-1), qt4-designer (<< 4.4.0~beta1-1)
 Description: Qt 3 compatibility library for Qt 4
- Qt is a cross-platform C++ application framework.  Qt's primary feature
+ 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.
+ The Qt3Support module provides classes that ease porting from Qt 3 to 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: qt4-designer
+Package: libqt4-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
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libqt4-gui (<< 4.4.0~beta1-1)
+Replaces: libqt4-gui (<< 4.4.0~beta1-1)
+Description: Qt 4 designer module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ The QtDesigner module provides classes that allow you to create your own
+ custom widget plugins for Qt Designer, and classes that enable you to access
+ Qt Designer's components.
+
+Package: libqt4-help
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc: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.
+ .
+ The QtHelp module provides classes for integrating online documentation in
+ applications.
+
+Package: libqt4-assistant
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libqt4-gui (<< 4.4.0~beta1-1)
+Replaces: libqt4-gui (<< 4.4.0~beta1-1)
+Description: 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.
+ .
+ The QtAssistant module provides a means of launching Qt Assistant to provide
+ online help.
+
+Package: libqt4-test
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libqt4-core (<< 4.4.0~beta1-1)
+Description: Qt 4 test module
+ 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.
+ The QtTest module provides classes for unit testing Qt applications and
+ libraries.
 
-Package: libqt4-debug
+Package: libqt4-dev
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libqt4-gui (= ${binary:Version}), libqt4-network (= ${binary:Version}),
+ libqt4-opengl (= ${binary:Version}), libqt4-script (= ${binary:Version}),
+ libqt4-sql (= ${binary:Version}), libqt4-sql-mysql (= ${binary:Version}),
+ libqt4-sql-odbc (= ${binary:Version}), libqt4-sql-psql (= ${binary:Version}),
+ libqt4-sql-sqlite (= ${binary:Version}), libqt4-sql-sqlite2 (= ${binary:Version}),
+ libqt4-svg (= ${binary:Version}), libqt4-webkit (= ${binary:Version}),
+ libqt4-xml (= ${binary:Version}), libqt4-xmlpatterns (= ${binary:Version}),
+ libqt4-dbus (= ${binary:Version}), libqt4-qt3support (= ${binary:Version}),
+ libqt4-designer (= ${binary:Version}), libqt4-help (= ${binary:Version}),
+ libqt4-assistant (= ${binary:Version}), libqt4-test (= ${binary:Version}),
+ libqt4-sql-ibase (= ${binary:Version}) [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc]
+ 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.
+ .
+ This packages contains the header development files and development programs
+ such as qmake used for building Qt4 applications.
+
+Package: libqt4-dbg
+Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-gui (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libqt4-gui (= ${binary:Version})
+Conflicts: libqt4-debug (<< 4.4.0~beta1-1)
+Replaces: libqt4-debug (<< 4.4.0~beta1-1)
 Description: Qt 4 library debugging symbols
- Qt is a cross-platform C++ application framework.  Qt's primary feature
+ 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 debugging symbols for the Qt 4 libraries.
 
+Package: libqt4-webkit-dbg
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libqt4-webkit (= ${binary:Version})
+Description: Qt 4 WebKit 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.
+ .
+ This packages contains the debugging symbols for the Qt 4 WebKit library.
+
+Package: libqt4-xmlpatterns-dbg
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libqt4-xmlpatterns (= ${binary:Version})
+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.
+ .
+ This packages contains the debugging symbols for the Qt 4 XML patterns
+ library.
+
+Package: qt4-designer
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libqt4-designer (<< 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)
+Recommends: libqt4-dev
+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
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-core (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: qt3-assistant (<= 3:3.3.4-7), qt3-designer (<= 3:3.3.4-7), qt3-linguist (<= 3:3.3.4-7)
+Replaces: libqt4-core (<< 4.4.0~beta1-1)
 Recommends: libqt4-dev, qt4-doc, qt4-designer
 Description: Qt 4 development tools
- Qt is a cross-platform C++ application framework.  Qt's primary feature
+ 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 tools used to assist in Qt 4 development,
- including the Qt Assistant, Linguist, D-Bus Viewer and Pixel Tool applications.
+ This packages contains tools used to assist in Qt 4 development, including
+ the Qt Assistant, Linguist, D-Bus Viewer and Pixel Tool applications.
 
 Package: qt4-qtconfig
 Architecture: any
 Section: x11
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libqt4-gui (<< 4.1.0)
 Conflicts: qt3-qtconfig (<= 3:3.3.4-7)
+Replaces: libqt4-gui (<< 4.1.0), libqt4-core (<< 4.4.0~beta1-1)
 Description: Qt 4 configuration tool
- Qt is a cross-platform C++ application framework.  Qt's primary feature
+ Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
  The Qt Configuration program allows endusers to configure the look and
  behavior of any Qt4 application.
 
+Package: qt4-demos
+Architecture: any
+Section: x11
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Qt 4 examples and demos
+ 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 Qt 4 examples and demos.
+
 Package: qt4-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
 Suggests: w3m | www-browser, libqt4-dev, qt4-dev-tools
 Description: Qt 4 API documentation
- Qt is a cross-platform C++ application framework.  Qt's primary feature
+ 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 complete Qt 4 API documentation.  The
- documentation is provided in HTML and manpage format; the HTML version
- can be viewed in conjunction with the Qt Assistant found in the
- qt4-dev-tools package.
+ This package contains the complete Qt 4 API documentation.
+ .
+ The documentation is provided in HTML and manpage format; the HTML version can
+ be viewed in conjunction with the Qt Assistant found in the qt4-dev-tools
+ package.
diff --git a/debian/libqt4-assistant.install b/debian/libqt4-assistant.install
new file mode 100644
index 0000000..f5b9e77
--- /dev/null
+++ b/debian/libqt4-assistant.install
@@ -0,0 +1,2 @@
+usr/lib/libQtAssistantClient.so.*
+
diff --git a/debian/libqt4-assistant.lintian b/debian/libqt4-assistant.lintian
new file mode 100644
index 0000000..5d3aeeb
--- /dev/null
+++ b/debian/libqt4-assistant.lintian
@@ -0,0 +1,2 @@
+libqt4-assistant: package-name-doesnt-match-sonames libQtAssistantClient4
+
diff --git a/debian/libqt4-core.install b/debian/libqt4-core.install
deleted file mode 100644
index e805597..0000000
--- a/debian/libqt4-core.install
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/lib/libQtCore.so.*
-usr/lib/libQtNetwork.so.*
-usr/lib/libQtXml.so.*
-usr/lib/libQtTest.so.*
-usr/lib/libQtDBus.so.*
-usr/lib/libQtScript.so.*
-usr/bin/qdbus
-usr/share/qt4/translations/*.qm
diff --git a/debian/libqt4-core.lintian b/debian/libqt4-core.lintian
deleted file mode 100644
index 659754d..0000000
--- a/debian/libqt4-core.lintian
+++ /dev/null
@@ -1 +0,0 @@
-libqt4-core: package-name-doesnt-match-sonames
diff --git a/debian/libqt4-debug-dev.install b/debian/libqt4-dbg-dev.install
index e9b4a19..e9b4a19 100644
--- a/debian/libqt4-debug-dev.install
+++ b/debian/libqt4-dbg-dev.install
diff --git a/debian/libqt4-dbg.install b/debian/libqt4-dbg.install
new file mode 100644
index 0000000..06e7517
--- /dev/null
+++ b/debian/libqt4-dbg.install
@@ -0,0 +1,35 @@
+usr/lib/libQt3Support.so.*.debug
+usr/lib/libQtAssistantClient.so.*.debug
+usr/lib/libQtCLucene.so.*.debug
+usr/lib/libQtCore.so.*.debug
+usr/lib/libQtDBus.so.*.debug
+usr/lib/libQtDesigner.so.*.debug
+usr/lib/libQtDesignerComponents.so.*.debug
+usr/lib/libQtGui.so.*.debug
+usr/lib/libQtHelp.so.*.debug
+usr/lib/libQtNetwork.so.*.debug
+usr/lib/libQtOpenGL.so.*.debug
+usr/lib/libQtScript.so.*.debug
+usr/lib/libQtSql.so.*.debug
+usr/lib/libQtSvg.so.*.debug
+usr/lib/libQtTest.so.*.debug
+usr/lib/libQtXml.so.*.debug
+
+usr/lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so.debug
+usr/lib/qt4/plugins/accessible/libqtaccessiblewidgets.so.debug
+usr/lib/qt4/plugins/codecs/libqcncodecs.so.debug
+usr/lib/qt4/plugins/codecs/libqjpcodecs.so.debug
+usr/lib/qt4/plugins/codecs/libqkrcodecs.so.debug
+usr/lib/qt4/plugins/codecs/libqtwcodecs.so.debug
+usr/lib/qt4/plugins/designer/libqt3supportwidgets.so.debug
+usr/lib/qt4/plugins/iconengines/libqsvgicon.so.debug
+usr/lib/qt4/plugins/imageformats/libqgif.so.debug
+usr/lib/qt4/plugins/imageformats/libqico.so.debug
+usr/lib/qt4/plugins/imageformats/libqjpeg.so.debug
+usr/lib/qt4/plugins/imageformats/libqmng.so.debug
+usr/lib/qt4/plugins/imageformats/libqsvg.so.debug
+usr/lib/qt4/plugins/imageformats/libqtiff.so.debug
+usr/lib/qt4/plugins/inputmethods/libqimsw-multi.so.debug
+usr/lib/qt4/plugins/script/libqtscriptdbus.so.debug
+usr/lib/qt4/plugins/sqldrivers/libqsql*.so.debug
+
diff --git a/debian/libqt4-dbg.lintian b/debian/libqt4-dbg.lintian
new file mode 100644
index 0000000..7366057
--- /dev/null
+++ b/debian/libqt4-dbg.lintian
@@ -0,0 +1,96 @@
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtCLucene.so.4.4.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtSql.so.4.4.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtTest.so.4.4.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtDBus.so.4.4.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtXml.so.4.4.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQt3Support.so.4.4.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtAssistantClient.so.4.4.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtNetwork.so.4.4.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtSvg.so.4.4.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtHelp.so.4.4.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtOpenGL.so.4.4.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtScript.so.4.4.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtGui.so.4.4.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtDesigner.so.4.4.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtCore.so.4.4.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtDesignerComponents.so.4.4.0.debug
+
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQt3Support.so.4.4.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtAssistantClient.so.4.4.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtCLucene.so.4.4.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtCore.so.4.4.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtDBus.so.4.4.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtDesigner.so.4.4.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtDesignerComponents.so.4.4.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtGui.so.4.4.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtHelp.so.4.4.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtNetwork.so.4.4.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtOpenGL.so.4.4.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtScript.so.4.4.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtSql.so.4.4.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtSvg.so.4.4.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtTest.so.4.4.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtXml.so.4.4.0.debug
+
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/accessible/libqtaccessiblewidgets.so.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/codecs/libqcncodecs.so.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/codecs/libqjpcodecs.so.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/codecs/libqkrcodecs.so.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/codecs/libqtwcodecs.so.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/designer/libqt3supportwidgets.so.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/iconengines/libqsvgicon.so.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/imageformats/libqgif.so.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/imageformats/libqico.so.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/imageformats/libqjpeg.so.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/imageformats/libqmng.so.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/imageformats/libqsvg.so.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/imageformats/libqtiff.so.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/inputmethods/libqimsw-multi.so.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/script/libqtscriptdbus.so.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/sqldrivers/libqsqlibase.so.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/sqldrivers/libqsqlite.so.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/sqldrivers/libqsqlite2.so.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/sqldrivers/libqsqlmysql.so.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/sqldrivers/libqsqlodbc.so.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/sqldrivers/libqsqlpsql.so.debug
+
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQt3Support.so.4.4.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtAssistantClient.so.4.4.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtCLucene.so.4.4.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtCore.so.4.4.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtDBus.so.4.4.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtDesigner.so.4.4.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtDesignerComponents.so.4.4.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtGui.so.4.4.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtHelp.so.4.4.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtNetwork.so.4.4.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtOpenGL.so.4.4.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtScript.so.4.4.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtSql.so.4.4.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtSvg.so.4.4.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtTest.so.4.4.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtXml.so.4.4.0.debug
+
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/accessible/libqtaccessiblewidgets.so.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/codecs/libqcncodecs.so.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/codecs/libqjpcodecs.so.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/codecs/libqkrcodecs.so.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/codecs/libqtwcodecs.so.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/designer/libqt3supportwidgets.so.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/iconengines/libqsvgicon.so.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/imageformats/libqgif.so.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/imageformats/libqico.so.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/imageformats/libqjpeg.so.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/imageformats/libqmng.so.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/imageformats/libqsvg.so.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/imageformats/libqtiff.so.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/inputmethods/libqimsw-multi.so.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/script/libqtscriptdbus.so.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/sqldrivers/libqsqlibase.so.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/sqldrivers/libqsqlite.so.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/sqldrivers/libqsqlite2.so.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/sqldrivers/libqsqlmysql.so.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/sqldrivers/libqsqlodbc.so.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/sqldrivers/libqsqlpsql.so.debug
diff --git a/debian/libqt4-dbus.install b/debian/libqt4-dbus.install
new file mode 100644
index 0000000..2242fb3
--- /dev/null
+++ b/debian/libqt4-dbus.install
@@ -0,0 +1,3 @@
+usr/lib/libQtDBus.so.*
+usr/bin/qdbus
+
diff --git a/debian/libqt4-dbus.lintian b/debian/libqt4-dbus.lintian
new file mode 100644
index 0000000..67884bb
--- /dev/null
+++ b/debian/libqt4-dbus.lintian
@@ -0,0 +1,2 @@
+libqt4-dbus: package-name-doesnt-match-sonames libQtDBus4
+
diff --git a/debian/libqt4-debug.install b/debian/libqt4-debug.install
deleted file mode 100644
index a4a4abf..0000000
--- a/debian/libqt4-debug.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*.debug
-usr/lib/qt4/plugins/*/*.debug
diff --git a/debian/libqt4-debug.lintian b/debian/libqt4-debug.lintian
deleted file mode 100644
index 8548cb6..0000000
--- a/debian/libqt4-debug.lintian
+++ /dev/null
@@ -1,74 +0,0 @@
-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: 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/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
-libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/codecs/libqjpcodecs.so.debug
-libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/codecs/libqkrcodecs.so.debug
-libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/codecs/libqtwcodecs.so.debug
-libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/designer/libqt3supportwidgets.so.debug
-libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/iconengines/libqsvg.so.debug
-libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/imageformats/libqgif.so.debug
-libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/imageformats/libqjpeg.so.debug
-libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/imageformats/libqmng.so.debug
-libqt4-debug: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/imageformats/libqsvg.so.debug
-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/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
-libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/codecs/libqjpcodecs.so.debug
-libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/codecs/libqkrcodecs.so.debug
-libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/codecs/libqtwcodecs.so.debug
-libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/designer/libqt3supportwidgets.so.debug
-libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/iconengines/libqsvg.so.debug
-libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/imageformats/libqgif.so.debug
-libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/imageformats/libqjpeg.so.debug
-libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/imageformats/libqmng.so.debug
-libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/imageformats/libqsvg.so.debug
-libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/imageformats/libqtiff.so.debug
-libqt4-debug: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/inputmethods/libqimsw-multi.so.debug
diff --git a/debian/libqt4-designer.install b/debian/libqt4-designer.install
new file mode 100644
index 0000000..2f3f965
--- /dev/null
+++ b/debian/libqt4-designer.install
@@ -0,0 +1,3 @@
+usr/lib/libQtDesigner.so.*
+usr/lib/libQtDesignerComponents.so.*
+
diff --git a/debian/libqt4-designer.lintian b/debian/libqt4-designer.lintian
new file mode 100644
index 0000000..5341630
--- /dev/null
+++ b/debian/libqt4-designer.lintian
@@ -0,0 +1,2 @@
+libqt4-designer: package-name-doesnt-match-sonames libQtDesigner4 libQtDesignerComponents4
+
diff --git a/debian/libqt4-dev.dirs b/debian/libqt4-dev.dirs
new file mode 100644
index 0000000..944cf06
--- /dev/null
+++ b/debian/libqt4-dev.dirs
@@ -0,0 +1 @@
+usr/share/qt4/doc/html
diff --git a/debian/libqt4-dev.lintian b/debian/libqt4-dev.lintian
index c8f5008..3e83aa2 100644
--- a/debian/libqt4-dev.lintian
+++ b/debian/libqt4-dev.lintian
@@ -1,4 +1 @@
-libqt4-dev: executable-not-elf-or-script ./usr/share/qt4/mkspecs/macx-pbuilder/Info.plist.app
-libqt4-dev: executable-not-elf-or-script ./usr/share/qt4/mkspecs/macx-xcode/Info.plist.app
-libqt4-dev: executable-not-elf-or-script ./usr/share/qt4/mkspecs/macx-xcode/qmake.conf
-libqt4-dev: executable-not-elf-or-script ./usr/share/qt4/mkspecs/macx-pbuilder/qmake.conf
+libqt4-dev: package-contains-empty-directory usr/share/qt4/doc/html/
diff --git a/debian/libqt4-gui.install b/debian/libqt4-gui.install
index 5d5eb6e..4526b22 100644
--- a/debian/libqt4-gui.install
+++ b/debian/libqt4-gui.install
@@ -1,11 +1,9 @@
 usr/lib/libQtGui.so.*
-usr/lib/libQtOpenGL.so.*
-usr/lib/libQtSvg.so.*
-usr/lib/libQtDesigner.so.*
-usr/lib/libQtDesignerComponents.so.*
-usr/lib/libQtAssistantClient.so.*
-usr/lib/qt4/plugins/imageformats/*.so
-usr/lib/qt4/plugins/iconengines/*.so
-usr/lib/qt4/plugins/inputmethods/*.so
 usr/lib/qt4/plugins/accessible/libqtaccessiblewidgets.so
-usr/lib/qt4/plugins/codecs/*.so
+usr/lib/qt4/plugins/imageformats/libqgif.so
+usr/lib/qt4/plugins/imageformats/libqico.so
+usr/lib/qt4/plugins/imageformats/libqjpeg.so
+usr/lib/qt4/plugins/imageformats/libqmng.so
+usr/lib/qt4/plugins/imageformats/libqtiff.so
+usr/lib/qt4/plugins/inputmethods/libqimsw-multi.so
+
diff --git a/debian/libqt4-gui.lintian b/debian/libqt4-gui.lintian
index 2bb209b..5e1e042 100644
--- a/debian/libqt4-gui.lintian
+++ b/debian/libqt4-gui.lintian
@@ -1 +1,2 @@
-libqt4-gui: package-name-doesnt-match-sonames libQtAssistantClient4 libQtDesigner4 libQtDesignerComponents4 libQtGui4 libQtOpenGL4 libQtSvg4
+libqt4-gui: package-name-doesnt-match-sonames libQtGui4
+
diff --git a/debian/libqt4-help.install b/debian/libqt4-help.install
new file mode 100644
index 0000000..d3c3203
--- /dev/null
+++ b/debian/libqt4-help.install
@@ -0,0 +1,4 @@
+usr/lib/libQtHelp.so.*
+usr/share/qt4/translations/qt_help_de.qm
+usr/share/qt4/translations/qt_help_pl.qm
+
diff --git a/debian/libqt4-help.lintian b/debian/libqt4-help.lintian
new file mode 100644
index 0000000..0e1306a
--- /dev/null
+++ b/debian/libqt4-help.lintian
@@ -0,0 +1,2 @@
+libqt4-help: package-name-doesnt-match-sonames libQtHelp4
+
diff --git a/debian/libqt4-network.install b/debian/libqt4-network.install
new file mode 100644
index 0000000..51b7a38
--- /dev/null
+++ b/debian/libqt4-network.install
@@ -0,0 +1,2 @@
+usr/lib/libQtNetwork.so.*
+
diff --git a/debian/libqt4-network.lintian b/debian/libqt4-network.lintian
new file mode 100644
index 0000000..037c48f
--- /dev/null
+++ b/debian/libqt4-network.lintian
@@ -0,0 +1,2 @@
+libqt4-network: package-name-doesnt-match-sonames libQtNetwork4
+
diff --git a/debian/libqt4-opengl.install b/debian/libqt4-opengl.install
new file mode 100644
index 0000000..7b4e92e
--- /dev/null
+++ b/debian/libqt4-opengl.install
@@ -0,0 +1 @@
+usr/lib/libQtOpenGL.so.*
diff --git a/debian/libqt4-opengl.lintian b/debian/libqt4-opengl.lintian
new file mode 100644
index 0000000..1e132e7
--- /dev/null
+++ b/debian/libqt4-opengl.lintian
@@ -0,0 +1,2 @@
+libqt4-opengl: package-name-doesnt-match-sonames libQtOpenGL4
+
diff --git a/debian/libqt4-qt3support.install b/debian/libqt4-qt3support.install
index 1d932b8..6c60c5d 100644
--- a/debian/libqt4-qt3support.install
+++ b/debian/libqt4-qt3support.install
@@ -1,2 +1,4 @@
 usr/lib/libQt3Support.so.*
 usr/lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so
+usr/lib/qt4/plugins/designer/libqt3supportwidgets.so
+
diff --git a/debian/libqt4-qt3support.lintian b/debian/libqt4-qt3support.lintian
index ae46e12..fb2daa8 100644
--- a/debian/libqt4-qt3support.lintian
+++ b/debian/libqt4-qt3support.lintian
@@ -1 +1,2 @@
 libqt4-qt3support: package-name-doesnt-match-sonames libQt3Support4
+
diff --git a/debian/libqt4-script.install b/debian/libqt4-script.install
new file mode 100644
index 0000000..53d05ca
--- /dev/null
+++ b/debian/libqt4-script.install
@@ -0,0 +1,2 @@
+usr/lib/libQtScript.so.*
+usr/lib/qt4/plugins/script/libqtscriptdbus.so
diff --git a/debian/libqt4-script.lintian b/debian/libqt4-script.lintian
new file mode 100644
index 0000000..d7a68f4
--- /dev/null
+++ b/debian/libqt4-script.lintian
@@ -0,0 +1,2 @@
+libqt4-script: package-name-doesnt-match-sonames libQtScript4
+
diff --git a/debian/libqt4-sql-ibase.install b/debian/libqt4-sql-ibase.install
new file mode 100644
index 0000000..e2df901
--- /dev/null
+++ b/debian/libqt4-sql-ibase.install
@@ -0,0 +1,2 @@
+usr/lib/qt4/plugins/sqldrivers/libqsqlibase.so
+
diff --git a/debian/libqt4-sql-mysql.install b/debian/libqt4-sql-mysql.install
new file mode 100644
index 0000000..75e1627
--- /dev/null
+++ b/debian/libqt4-sql-mysql.install
@@ -0,0 +1,2 @@
+usr/lib/qt4/plugins/sqldrivers/libqsqlmysql.so
+
diff --git a/debian/libqt4-sql-odbc.install b/debian/libqt4-sql-odbc.install
new file mode 100644
index 0000000..1d00149
--- /dev/null
+++ b/debian/libqt4-sql-odbc.install
@@ -0,0 +1,2 @@
+usr/lib/qt4/plugins/sqldrivers/libqsqlodbc.so
+
diff --git a/debian/libqt4-sql-psql.install b/debian/libqt4-sql-psql.install
new file mode 100644
index 0000000..b4f989c
--- /dev/null
+++ b/debian/libqt4-sql-psql.install
@@ -0,0 +1,2 @@
+usr/lib/qt4/plugins/sqldrivers/libqsqlpsql.so
+
diff --git a/debian/libqt4-sql-sqlite.install b/debian/libqt4-sql-sqlite.install
new file mode 100644
index 0000000..6590079
--- /dev/null
+++ b/debian/libqt4-sql-sqlite.install
@@ -0,0 +1,2 @@
+usr/lib/qt4/plugins/sqldrivers/libqsqlite.so
+
diff --git a/debian/libqt4-sql-sqlite2.install b/debian/libqt4-sql-sqlite2.install
new file mode 100644
index 0000000..44e331d
--- /dev/null
+++ b/debian/libqt4-sql-sqlite2.install
@@ -0,0 +1,2 @@
+usr/lib/qt4/plugins/sqldrivers/libqsqlite2.so
+
diff --git a/debian/libqt4-sql.install b/debian/libqt4-sql.install
index 04783f7..5ff4a1f 100644
--- a/debian/libqt4-sql.install
+++ b/debian/libqt4-sql.install
@@ -1 +1,2 @@
 usr/lib/libQtSql.so.*
+
diff --git a/debian/libqt4-sql.lintian b/debian/libqt4-sql.lintian
index b3d38e7..9fae8ca 100644
--- a/debian/libqt4-sql.lintian
+++ b/debian/libqt4-sql.lintian
@@ -1 +1,2 @@
 libqt4-sql: package-name-doesnt-match-sonames libQtSql4
+
diff --git a/debian/libqt4-svg.install b/debian/libqt4-svg.install
new file mode 100644
index 0000000..21289f8
--- /dev/null
+++ b/debian/libqt4-svg.install
@@ -0,0 +1,4 @@
+usr/lib/libQtSvg.so.*
+usr/lib/qt4/plugins/iconengines/libqsvgicon.so
+usr/lib/qt4/plugins/imageformats/libqsvg.so
+
diff --git a/debian/libqt4-svg.lintian b/debian/libqt4-svg.lintian
new file mode 100644
index 0000000..dd91efc
--- /dev/null
+++ b/debian/libqt4-svg.lintian
@@ -0,0 +1,2 @@
+libqt4-svg: package-name-doesnt-match-sonames libQtSvg4
+
diff --git a/debian/libqt4-test.install b/debian/libqt4-test.install
new file mode 100644
index 0000000..7883dee
--- /dev/null
+++ b/debian/libqt4-test.install
@@ -0,0 +1,2 @@
+usr/lib/libQtTest.so.*
+
diff --git a/debian/libqt4-test.lintian b/debian/libqt4-test.lintian
new file mode 100644
index 0000000..e387467
--- /dev/null
+++ b/debian/libqt4-test.lintian
@@ -0,0 +1,2 @@
+libqt4-test: package-name-doesnt-match-sonames libQtTest4
+
diff --git a/debian/libqt4-webkit-dbg.install b/debian/libqt4-webkit-dbg.install
new file mode 100644
index 0000000..572e3bf
--- /dev/null
+++ b/debian/libqt4-webkit-dbg.install
@@ -0,0 +1,3 @@
+usr/lib/libQtWebKit.so.*.debug
+usr/lib/qt4/plugins/designer/libqwebview.so.debug
+
diff --git a/debian/libqt4-webkit-dbg.lintian b/debian/libqt4-webkit-dbg.lintian
new file mode 100644
index 0000000..8fac276
--- /dev/null
+++ b/debian/libqt4-webkit-dbg.lintian
@@ -0,0 +1,6 @@
+libqt4-webkit-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtWebKit.so.4.4.0.debug
+libqt4-webkit-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtWebKit.so.4.4.0.debug
+libqt4-webkit-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/designer/libqwebview.so.debug
+libqt4-webkit-dbg: shared-lib-without-dependency-information ./usr/lib/libQtWebKit.so.4.4.0.debug
+libqt4-webkit-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/designer/libqwebview.so.debug
+
diff --git a/debian/libqt4-webkit.install b/debian/libqt4-webkit.install
new file mode 100644
index 0000000..7b12c8f
--- /dev/null
+++ b/debian/libqt4-webkit.install
@@ -0,0 +1,3 @@
+usr/lib/libQtWebKit.so.*
+usr/lib/qt4/plugins/designer/libqwebview.so
+
diff --git a/debian/libqt4-webkit.lintian b/debian/libqt4-webkit.lintian
new file mode 100644
index 0000000..c515d64
--- /dev/null
+++ b/debian/libqt4-webkit.lintian
@@ -0,0 +1,2 @@
+libqt4-webkit: package-name-doesnt-match-sonames libQtWebKit4
+
diff --git a/debian/libqt4-xml.install b/debian/libqt4-xml.install
new file mode 100644
index 0000000..6366cb3
--- /dev/null
+++ b/debian/libqt4-xml.install
@@ -0,0 +1 @@
+usr/lib/libQtXml.so.*
diff --git a/debian/libqt4-xml.lintian b/debian/libqt4-xml.lintian
new file mode 100644
index 0000000..7ff0291
--- /dev/null
+++ b/debian/libqt4-xml.lintian
@@ -0,0 +1,2 @@
+libqt4-xml: package-name-doesnt-match-sonames libQtXml4
+
diff --git a/debian/libqt4-xmlpatterns-dbg.install b/debian/libqt4-xmlpatterns-dbg.install
new file mode 100644
index 0000000..9d3a8f6
--- /dev/null
+++ b/debian/libqt4-xmlpatterns-dbg.install
@@ -0,0 +1,2 @@
+usr/lib/libQtXmlPatterns.so.*.debug
+
diff --git a/debian/libqt4-xmlpatterns-dbg.lintian b/debian/libqt4-xmlpatterns-dbg.lintian
new file mode 100644
index 0000000..2a99df3
--- /dev/null
+++ b/debian/libqt4-xmlpatterns-dbg.lintian
@@ -0,0 +1,4 @@
+libqt4-xmlpatterns-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtXmlPatterns.so.4.4.0.debug
+libqt4-xmlpatterns-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtXmlPatterns.so.4.4.0.debug
+libqt4-xmlpatterns-dbg: shared-lib-without-dependency-information ./usr/lib/libQtXmlPatterns.so.4.4.0.debug
+
diff --git a/debian/libqt4-xmlpatterns.install b/debian/libqt4-xmlpatterns.install
new file mode 100644
index 0000000..0aa5ec4
--- /dev/null
+++ b/debian/libqt4-xmlpatterns.install
@@ -0,0 +1,2 @@
+usr/lib/libQtXmlPatterns.so.*
+
diff --git a/debian/libqt4-xmlpatterns.lintian b/debian/libqt4-xmlpatterns.lintian
new file mode 100644
index 0000000..bb9cf98
--- /dev/null
+++ b/debian/libqt4-xmlpatterns.lintian
@@ -0,0 +1,2 @@
+libqt4-xmlpatterns: package-name-doesnt-match-sonames libQtXmlPatterns4
+
diff --git a/debian/libqtcore4.install b/debian/libqtcore4.install
new file mode 100644
index 0000000..f89ed41
--- /dev/null
+++ b/debian/libqtcore4.install
@@ -0,0 +1,20 @@
+usr/lib/libQtCore.so.*
+usr/lib/libQtCLucene.so.*
+usr/lib/qt4/plugins/codecs/*.so
+usr/share/qt4/translations/qt_ar.qm
+usr/share/qt4/translations/qt_ca.qm
+usr/share/qt4/translations/qt_de.qm
+usr/share/qt4/translations/qt_es.qm
+usr/share/qt4/translations/qt_fr.qm
+usr/share/qt4/translations/qt_iw.qm
+usr/share/qt4/translations/qt_ja_jp.qm
+usr/share/qt4/translations/qt_pl.qm
+usr/share/qt4/translations/qt_pt.qm
+usr/share/qt4/translations/qt_ru.qm
+usr/share/qt4/translations/qt_sk.qm
+usr/share/qt4/translations/qt_sv.qm
+usr/share/qt4/translations/qt_uk.qm
+usr/share/qt4/translations/qt_zh_CN.qm
+usr/share/qt4/translations/qt_zh_TW.qm
+
+
diff --git a/debian/libqtcore4.lintian b/debian/libqtcore4.lintian
new file mode 100644
index 0000000..da3b3d2
--- /dev/null
+++ b/debian/libqtcore4.lintian
@@ -0,0 +1 @@
+libqtcore4: package-name-doesnt-match-sonames libQtCLucene4 libQtCore4
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 0000000..1f5cafe
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,19 @@
+usr/share/qt4/translations/qvfb_pl.qm
+usr/share/qt4/translations/qvfb_zh_TW.qm
+usr/share/qt4/translations/qvfb_zh_CN.qm
+usr/lib/libQtSvg.la
+usr/lib/libQtXml.la
+usr/lib/libQtSql.la
+usr/lib/libQtWebKit.la
+usr/lib/libQtOpenGL.la
+usr/lib/libQtNetwork.la
+usr/lib/libQtGui.la
+usr/lib/libQt3Support.la
+usr/lib/libQtTest.la
+usr/lib/libQtCLucene.la
+usr/lib/libQtScript.la
+usr/lib/libQtXmlPatterns.la
+usr/lib/libQtHelp.la
+usr/lib/libQtCore.la
+usr/lib/libQtDBus.la
+
diff --git a/debian/patches/0167-fix-group-reading.diff b/debian/patches/0167-fix-group-reading.diff
index df3b6df..c7080d5 100644
--- a/debian/patches/0167-fix-group-reading.diff
+++ b/debian/patches/0167-fix-group-reading.diff
@@ -9,7 +9,7 @@ Try a bit harder.
 
 --- a/src/corelib/io/qfsfileengine_unix.cpp
 +++ b/src/corelib/io/qfsfileengine_unix.cpp
-@@ -850,9 +850,16 @@
+@@ -829,9 +829,16 @@
      } else if (own == OwnerGroup) {
          struct group *gr = 0;
  #if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
diff --git a/debian/patches/0172-prefer-xrandr-over-xinerama.diff b/debian/patches/0172-prefer-xrandr-over-xinerama.diff
deleted file mode 100644
index 18dfba8..0000000
--- a/debian/patches/0172-prefer-xrandr-over-xinerama.diff
+++ /dev/null
@@ -1,108 +0,0 @@
-qt-bugs@ issue :  N198137
-Trolltech task ID : none
-bugs.kde.org number :
-applied: no
-author: Dirk Mueller <mueller@kde.org>
-
-only trust libxinerama if its not the emulated information
-coming from xrandr 1.2. xrandr 1.2 is merged fb and libxinerama
-presents then virtual screens in clone mode, which qt (and KDE)
-can't deal with.
-
-proper fix would be to detect crtcs as virtual screens, but
-given that qt can't deal with dynamically changing number of screens,
-this is for "when I have time".
-
-also includes a race fix that can cause the whole KDE session to crash
-when you resize the screen.
-
-it also includes a fix for a bug that causes the whole KDE session to crash
-when you remove a CRTc.
-
-
---- a/src/gui/kernel/qdesktopwidget_x11.cpp
-+++ b/src/gui/kernel/qdesktopwidget_x11.cpp
-@@ -124,30 +124,35 @@
- void QDesktopWidgetPrivate::init()
- {
-     // get the screen count
-+    int newScreenCount;
- #ifndef QT_NO_XINERAMA
-     XineramaScreenInfo *xinerama_screeninfo = 0;
-     int unused;
-     use_xinerama = (XineramaQueryExtension(X11->display, &unused, &unused) && XineramaIsActive(X11->display));
- 
--    if (use_xinerama) {
-+    if (use_xinerama)
-         xinerama_screeninfo =
--            XineramaQueryScreens(X11->display, &screenCount);
-+            XineramaQueryScreens(X11->display, &newScreenCount);
-+
-+    if (use_xinerama && xinerama_screeninfo) {
-         defaultScreen = 0;
-     } else
- #endif // QT_NO_XINERAMA
-     {
-+        use_xinerama = false;
-         defaultScreen = DefaultScreen(X11->display);
--        screenCount = ScreenCount(X11->display);
-+        newScreenCount = ScreenCount(X11->display);
-+        use_xinerama = false;
-     }
- 
-     delete [] rects;
--    rects     = new QRect[screenCount];
-+    rects     = new QRect[newScreenCount];
-     delete [] workareas;
--    workareas = new QRect[screenCount];
-+    workareas = new QRect[newScreenCount];
- 
-     // get the geometry of each screen
--    int i, x, y, w, h;
--    for (i = 0; i < screenCount; i++) {
-+    int i, j, x, y, w, h;
-+    for (i = 0, j = 0; i < newScreenCount; i++, j++) {
- 
- #ifndef QT_NO_XINERAMA
-         if (use_xinerama) {
-@@ -164,11 +169,29 @@
-                 h = HeightOfScreen(ScreenOfDisplay(X11->display, i));
-             }
- 
--        rects[i].setRect(x, y, w, h);
-+        rects[j].setRect(x, y, w, h);
-+        if (j > 0 && rects[j-1].intersects(rects[j]) &&
-+                (rects[j].width()*rects[j].height()) >
-+                (rects[j-1].width()*rects[j-1].height())) {
-+            rects[j-1] = rects[j];
-+           j--;
-+        }
-         workareas[i] = QRect();
-     }
- 
-+    if (screens) {
-+        // leaks QWidget* pointers on purpose, can't delete them as pointer escapes
-+        screens = (QWidget**) realloc(screens, j * sizeof(QWidget*));
-+        if (j > screenCount)
-+            memset(&screens[screenCount], 0, (j-screenCount) * sizeof(QWidget*));
-+    }
-+
-+    screenCount = j;
-+
- #ifndef QT_NO_XINERAMA
-+    if (use_xinerama && screenCount == 1)
-+        use_xinerama = false;
-+
-     if (xinerama_screeninfo)
-         XFree(xinerama_screeninfo);
- #endif // QT_NO_XINERAMA
-@@ -216,8 +239,7 @@
-         screen = d->defaultScreen;
- 
-     if (! d->screens) {
--        d->screens = new QWidget*[d->screenCount];
--        memset(d->screens, 0, d->screenCount * sizeof(QWidget *));
-+        d->screens = (QWidget**) calloc( d->screenCount, sizeof(QWidget*));
-         d->screens[d->defaultScreen] = this;
-     }
- 
diff --git a/debian/patches/0175-fix-s390-qatomic.diff b/debian/patches/0175-fix-s390-qatomic.diff
deleted file mode 100644
index d70dced..0000000
--- a/debian/patches/0175-fix-s390-qatomic.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-qt-bugs@ issue :  none
-Trolltech task ID : none
-bugs.kde.org number :
-applied: no
-author: Dirk Mueller
-
-fix s390(x) build
-
---- a/src/corelib/arch/qatomic_s390.h
-+++ b/src/corelib/arch/qatomic_s390.h
-@@ -202,10 +202,20 @@
- #endif
- }
- 
--#error "fetch-and-add not implemented"
--// int q_atomic_fetch_and_add_int(volatile int *ptr, int value);
--// int q_atomic_fetch_and_add_acquire_int(volatile int *ptr, int value);
--// int q_atomic_fetch_and_add_release_int(volatile int *ptr, int value);
-+inline int q_atomic_fetch_and_add_int(volatile int *ptr, int value)
-+{
-+    return __sync_fetch_and_add(ptr, value);
-+}
-+
-+inline int q_atomic_fetch_and_add_acquire_int(volatile int *ptr, int value)
-+{
-+    return __sync_fetch_and_add(ptr, value);
-+}
-+
-+inline int q_atomic_fetch_and_add_release_int(volatile int *ptr, int value)
-+{
-+    return __sync_fetch_and_add(ptr, value);
-+}
- 
- QT_END_HEADER
- 
diff --git a/debian/patches/0176-coverity-fixes.diff b/debian/patches/0176-coverity-fixes.diff
deleted file mode 100644
index 6f645d9..0000000
--- a/debian/patches/0176-coverity-fixes.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-qt-bugs@ issue :  none
-Trolltech task ID : none
-bugs.kde.org number :
-applied: no
-author: Dirk Mueller
-
-fix various obvious memory leaks etc
-
---- a/src/gui/painting/qimagescale.cpp
-+++ b/src/gui/painting/qimagescale.cpp
-@@ -1031,6 +1031,7 @@
-     buffer = QImage(dw, dh, src.format());
-     if (buffer.isNull()) {
-         qWarning("QImage: out of memory, returning null");
-+        qimageFreeScaleInfo(scaleinfo);
-         return QImage();
-     }
- 
---- a/src/svg/qsvghandler.cpp
-+++ b/src/svg/qsvghandler.cpp
-@@ -1149,15 +1149,9 @@
-         if (!size.isEmpty()) {
-             QSvgHandler::LengthType type;
-             qreal len = parseLength(size, type, handler);
--            //len = convertToPixels(len, false, type);
-             // ### org_module.svg shows that font size
-             // seems to be always in px...
--            type  = QSvgHandler::PX;
--            if (type == QSvgHandler::PX ||
--                type == QSvgHandler::OTHER)
--                font.setPixelSize(int(len));
--            else
--                font.setPointSizeF(len);
-+            font.setPixelSize(int(len));
-         }
-         if (!style.isEmpty()) {
-             if (style == QLatin1String("normal")) {
diff --git a/debian/patches/0178-transparency-window-types.diff b/debian/patches/0178-transparency-window-types.diff
deleted file mode 100644
index 67a2fd7..0000000
--- a/debian/patches/0178-transparency-window-types.diff
+++ /dev/null
@@ -1,337 +0,0 @@
-qt-bugs@ issue : none yet
-Trolltech task ID : none
-bugs.kde.org number : none
-applied: no
-author: Lubos Lunak <l.lunak@kde.org>
-
-This patch adds Qt support for new window types used for compositing.
-
-
---- a/src/gui/kernel/qwidget.h
-+++ b/src/gui/kernel/qwidget.h
-@@ -359,6 +359,19 @@
- 
-     void setWindowOpacity(qreal level);
-     qreal windowOpacity() const;
-+#if defined(Q_WS_X11)
-+    enum X11WindowType {
-+        X11WindowTypeSelect,
-+        X11WindowTypeCombo,
-+        X11WindowTypeDND,
-+        X11WindowTypeTooltip,
-+        X11WindowTypeMenu, // torn-off
-+        X11WindowTypeDropdown,
-+        X11WindowTypePopup
-+    };
-+    void x11SetWindowType( X11WindowType type = X11WindowTypeSelect );
-+    void x11SetWindowTransient( QWidget* parent );
-+#endif
- 
-     bool isWindowModified() const;
- #ifndef QT_NO_TOOLTIP
---- a/src/gui/kernel/qdnd_x11.cpp
-+++ b/src/gui/kernel/qdnd_x11.cpp
-@@ -275,6 +275,7 @@
-         QWidget(QApplication::desktop()->screen(screen),
-                 Qt::Tool | Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint)
-     {
-+    x11SetWindowType( X11WindowTypeDND );
-     }
- 
-     void setPixmap(const QPixmap &pm)
-@@ -1443,6 +1444,7 @@
-         // recreate the pixmap on the new screen...
-         delete xdnd_data.deco;
-         xdnd_data.deco = new QShapedPixmapWidget(screen);
-+        xdnd_data.deco->x11SetWindowTransient( object->source()->topLevelWidget());
-         if (!QWidget::mouseGrabber()) {
-             updatePixmap();
-             xdnd_data.deco->grabMouse();
-@@ -1904,6 +1906,7 @@
-     object = o;
-     object->d_func()->target = 0;
-     xdnd_data.deco = new QShapedPixmapWidget();
-+    xdnd_data.deco->x11SetWindowTransient( object->source()->topLevelWidget());
- 
-     willDrop = false;
- 
---- a/src/gui/kernel/qt_x11_p.h
-+++ b/src/gui/kernel/qt_x11_p.h
-@@ -535,6 +535,11 @@
-         _NET_WM_WINDOW_TYPE_SPLASH,
-         _NET_WM_WINDOW_TYPE_TOOLBAR,
-         _NET_WM_WINDOW_TYPE_UTILITY,
-+        _NET_WM_WINDOW_TYPE_DROPDOWN_MENU,
-+        _NET_WM_WINDOW_TYPE_POPUP_MENU,
-+        _NET_WM_WINDOW_TYPE_COMBO,
-+        _NET_WM_WINDOW_TYPE_DND,
-+        _NET_WM_WINDOW_TYPE_TOOLTIP,
- 
-         _KDE_NET_WM_FRAME_STRUT,
- 
---- a/src/gui/kernel/qtooltip.cpp
-+++ b/src/gui/kernel/qtooltip.cpp
-@@ -154,6 +154,9 @@
-     setMouseTracking(true);
-     fadingOut = false;
-     reuseTip(text);
-+#ifdef Q_WS_X11
-+    x11SetWindowType( X11WindowTypeTooltip );
-+#endif
- }
- 
- void QTipLabel::restartHideTimer()
-@@ -374,6 +377,10 @@
-             // that is showing (removes flickering)
-             if (QTipLabel::instance->tipChanged(pos, text, w)){
-                 QTipLabel::instance->reuseTip(text);
-+#ifdef Q_WS_X11
-+                if (w)
-+                    QTipLabel::instance->x11SetWindowTransient( w->topLevelWidget());
-+#endif
-                 QTipLabel::instance->setTipRect(w, rect);
-                 QTipLabel::instance->placeTip(pos, w);
-             }
-@@ -383,6 +390,10 @@
- 
-     if (!text.isEmpty()){ // no tip can be reused, create new tip:
-         new QTipLabel(pos, text, w); // sets QTipLabel::instance to itself
-+#ifdef Q_WS_X11
-+        if (w)
-+            QTipLabel::instance->x11SetWindowTransient( w->topLevelWidget());
-+#endif
-         QTipLabel::instance->setTipRect(w, rect);
-         QTipLabel::instance->placeTip(pos, w);
-         QTipLabel::instance->setObjectName(QLatin1String("qtooltip_label"));
---- a/src/gui/kernel/qapplication_x11.cpp
-+++ b/src/gui/kernel/qapplication_x11.cpp
-@@ -219,6 +219,11 @@
-     "_NET_WM_WINDOW_TYPE_SPLASH\0"
-     "_NET_WM_WINDOW_TYPE_TOOLBAR\0"
-     "_NET_WM_WINDOW_TYPE_UTILITY\0"
-+    "_NET_WM_WINDOW_TYPE_DROPDOWN_MENU\0"
-+    "_NET_WM_WINDOW_TYPE_POPUP_MENU\0"
-+    "_NET_WM_WINDOW_TYPE_COMBO\0"
-+    "_NET_WM_WINDOW_TYPE_DND\0"
-+    "_NET_WM_WINDOW_TYPE_TOOLTIP\0"
- 
-     "_KDE_NET_WM_FRAME_STRUT\0"
- 
---- a/src/gui/kernel/qwidget_x11.cpp
-+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -567,10 +567,6 @@
-     }
- #endif // QT_NO_XRENDER
- 
--    // NET window types
--    long net_wintypes[7] = { 0, 0, 0, 0, 0, 0, 0 };
--    int curr_wintype = 0;
--
-     QtMWMHints mwmhints;
-     mwmhints.flags = 0L;
-     mwmhints.functions = MWM_FUNC_ALL;
-@@ -581,15 +577,11 @@
-     if (topLevel) {
-         ulong wsa_mask = 0;
-         if (type == Qt::SplashScreen) {
--            net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_SPLASH);
-         } else { //       if (customize) {
-             mwmhints.decorations = 0L;
-             mwmhints.flags |= MWM_HINTS_DECORATIONS;
- 
--            if (flags & Qt::FramelessWindowHint) {
--                // override netwm type - quick and easy for KDE noborder
--                net_wintypes[curr_wintype++] = ATOM(_KDE_NET_WM_WINDOW_TYPE_OVERRIDE);
--            } else {
-+            if ((flags & Qt::FramelessWindowHint) == 0 ) {
-                 mwmhints.decorations |= MWM_DECOR_BORDER;
-                 mwmhints.decorations |= MWM_DECOR_RESIZEH;
- 
-@@ -611,22 +603,6 @@
-             wsa.save_under = True;
-             wsa_mask |= CWSaveUnder;
-         }
--        // ### need a better way to do this
--        if (q->inherits("QMenu")) {
--            // menu netwm type
--            net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_MENU);
--        } else if (q->inherits("QToolBar")) {
--            // toolbar netwm type
--            net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_TOOLBAR);
--        } else if (type == Qt::Tool || type == Qt::Drawer) {
--            // utility netwm type
--            net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_UTILITY);
--        }
--
--        if (dialog) // dialog netwm type
--            net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_DIALOG);
--        // normal netwm type - default
--        net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_NORMAL);
- 
-         if (flags & Qt::X11BypassWindowManagerHint) {
-             wsa.override_redirect = True;
-@@ -645,6 +621,7 @@
-         wsa.save_under = True;
-         XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
-                                 &wsa);
-+        q->x11SetWindowType();
-     } else if (topLevel && !desktop) {        // top-level widget
-         if (!X11->wm_client_leader)
-             create_wm_client_leader();
-@@ -689,12 +666,7 @@
-         // set mwm hints
-         SetMWMHints(dpy, id, mwmhints);
- 
--        // set _NET_WM_WINDOW_TYPE
--        if (curr_wintype > 0)
--            XChangeProperty(dpy, id, ATOM(_NET_WM_WINDOW_TYPE), XA_ATOM, 32, PropModeReplace,
--                            (unsigned char *) net_wintypes, curr_wintype);
--        else
--            XDeleteProperty(dpy, id, ATOM(_NET_WM_WINDOW_TYPE));
-+        q->x11SetWindowType(); // set _NET_WM_WINDOW_TYPE
- 
-         // set _NET_WM_PID
-         long curr_pid = getpid();
-@@ -790,6 +762,63 @@
-         q->setAttribute(Qt::WA_OutsideWSRange, true);
- }
- 
-+// Sets the EWMH (netwm) window type. Needed as a separate function
-+// because create() may be too soon in some cases.
-+void QWidget::x11SetWindowType( X11WindowType type )
-+{
-+    Display* dpy = X11->display;
-+    // NET window types
-+    long net_wintypes[7] = { 0, 0, 0, 0, 0, 0, 0 };
-+    int curr_wintype = 0;
-+    if( type == X11WindowTypeSelect ) {
-+        if ( windowType() == Qt::SplashScreen ) {
-+            net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_SPLASH);
-+        } else if (inherits("QToolBar")) {
-+	    // toolbar netwm type
-+	    net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_TOOLBAR);
-+        } else if (windowType() == Qt::Tool || windowType() == Qt::Drawer) {
-+	    // utility netwm type
-+	    net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_UTILITY);
-+        } else if (windowType() == Qt::Dialog || windowType() == Qt::Sheet
-+            || (windowFlags() & Qt::MSWindowsFixedSizeDialogHint)) {
-+            // dialog netwm type
-+            net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_DIALOG);
-+        }
-+    } else if( type == X11WindowTypeCombo ) {
-+        // combo netwm type
-+	net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_COMBO);
-+    } else if( type == X11WindowTypeDND ) {
-+        // dnd netwm type
-+    	net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_DND);
-+    } else if( type == X11WindowTypeDropdown ) {
-+        // dropdown netwm type
-+    	net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_DROPDOWN_MENU);
-+    } else if( type == X11WindowTypePopup ) {
-+        // popup netwm type
-+    	net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_POPUP_MENU);
-+    } else if( type == X11WindowTypeMenu ) {
-+        // menu netwm type
-+	net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_MENU);
-+    } else if( type == X11WindowTypeTooltip ) {
-+        // tooltip netwm type
-+    	net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_TOOLTIP);
-+    }
-+
-+    // normal netwm type - default
-+    net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_NORMAL);
-+    // set _NET_WM_WINDOW_TYPE
-+    if (curr_wintype > 0)
-+        XChangeProperty(dpy, winId(), ATOM(_NET_WM_WINDOW_TYPE), XA_ATOM, 32, PropModeReplace,
-+			(unsigned char *) net_wintypes, curr_wintype);
-+    else
-+        XDeleteProperty(dpy, winId(), ATOM(_NET_WM_WINDOW_TYPE));
-+}
-+
-+void QWidget::x11SetWindowTransient( QWidget* parent )
-+{
-+    XSetTransientForHint( X11->display, winId(), parent->window()->winId());
-+}
-+
- /*!
-     Frees up window system resources. Destroys the widget window if \a
-     destroyWindow is true.
---- a/src/gui/widgets/qcombobox.cpp
-+++ b/src/gui/widgets/qcombobox.cpp
-@@ -339,6 +339,10 @@
-             combo->update();
-         }
-     }
-+#ifdef Q_WS_X11
-+    x11SetWindowType( X11WindowTypeCombo );
-+    x11SetWindowTransient( combo->topLevelWidget());
-+#endif
- }
- 
- void QComboBoxPrivateContainer::resizeEvent(QResizeEvent *e)
---- a/src/gui/widgets/qmenu.cpp
-+++ b/src/gui/widgets/qmenu.cpp
-@@ -104,6 +104,9 @@
-     QTornOffMenu(QMenu *p) : QMenu(*(new QTornOffMenuPrivate(p)))
-     {
-         setParent(p, Qt::Window | Qt::Tool);
-+#ifdef Q_WS_X11
-+        x11SetWindowType( X11WindowTypeMenu );
-+#endif
- 	setAttribute(Qt::WA_DeleteOnClose, true);
-         setWindowTitle(p->windowTitle());
-         setEnabled(p->isEnabled());
-@@ -150,6 +153,9 @@
-     }
-     defaultMenuAction = menuAction = new QAction(q);
-     menuAction->d_func()->menu = q;
-+#ifdef Q_WS_X11
-+    q->x11SetWindowType( QWidget::X11WindowTypePopup );
-+#endif
- }
- 
- //Windows and KDE allows menus to cover the taskbar, while GNOME and Mac don't
-@@ -1685,6 +1691,33 @@
-         }
-     }
-     setGeometry(QRect(pos, size));
-+
-+#ifdef Q_WS_X11
-+    QWidget* top = this;
-+    for(;;) {
-+        if( QMenu* m = qobject_cast< QMenu* >( top )) {
-+            if( m->d_func()->causedPopup.widget == NULL )
-+                break; // --->
-+            top = m->d_func()->causedPopup.widget;
-+        } else
-+            break; // -->
-+    }
-+    if( QMenu* m = qobject_cast< QMenu* >( top ))
-+        x11SetWindowType( X11WindowTypePopup );
-+    else
-+        x11SetWindowType( X11WindowTypeDropdown );
-+    // hackish ... try to find the main window related to this popup
-+    QWidget* parent = d_func()->causedPopup.widget;
-+    if( parent == NULL )
-+        parent = parentWidget() ? parentWidget()->topLevelWidget() : NULL;
-+    if( parent == NULL )
-+        parent = QApplication::widgetAt( pos );
-+    if( parent == NULL )
-+        parent = qApp->activeWindow();
-+    if( parent != NULL )
-+        x11SetWindowTransient( parent );
-+#endif
-+
- #ifndef QT_NO_EFFECTS
-     int hGuess = qApp->layoutDirection() == Qt::RightToLeft ? QEffects::LeftScroll : QEffects::RightScroll;
-     int vGuess = QEffects::DownScroll;
-@@ -1881,6 +1914,9 @@
-     if (QMenuBar *mb = qobject_cast<QMenuBar*>(d->causedPopup.widget))
-         mb->d_func()->setCurrentAction(0);
- #endif
-+#ifdef Q_WS_X11
-+    x11SetWindowType( X11WindowTypePopup ); // reset
-+#endif
-     d->mouseDown = 0;
-     d->hasHadMouse = false;
-     d->causedPopup.widget = 0;
diff --git a/debian/patches/0179-transient-hack.diff b/debian/patches/0179-transient-hack.diff
deleted file mode 100644
index 37c7b7c..0000000
--- a/debian/patches/0179-transient-hack.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-qt-bugs@ issue : 166027
-Trolltech task ID : none
-bugs.kde.org number : none
-applied: no
-author: Lubos Lunak <l.lunak@kde.org>
-
-This patch is just a hackish workaround that makes setting of WM_TRANSIENT_FOR
-work with some window types (needed basically by the #0178 qt-copy patch).
-It is not a proper solution, waiting for TT to come up with something.
-
---- a/src/gui/kernel/qwidget_x11.cpp
-+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -1655,7 +1655,7 @@
-         do_size_hints(q, extra);
- 
-         // udpate WM_TRANSIENT_FOR
--        if (isTransient(q)) {
-+        if (isTransient(q) && !( q->windowFlags() & Qt::X11BypassWindowManagerHint)) {
-             QWidget *p = q->parentWidget();
-             if (p)
-                 p = p->window();
diff --git a/debian/patches/0180-window-role.diff b/debian/patches/0180-window-role.diff
index dceb41a..bbd2900 100644
--- a/debian/patches/0180-window-role.diff
+++ b/debian/patches/0180-window-role.diff
@@ -1,44 +1,20 @@
 qt-bugs@ issue : 167704
-Trolltech task ID : 168283
+Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refused)
 bugs.kde.org number : none
 applied: no
 author: Lubos Lunak <l.lunak@kde.org>
 
 NOTE: It is suggested to apply patch #0209 as well when this patch is used.
 
- Hello,
+This patch uses object name as a fallback for window role if no window role
+is set explicitly using setWindowRole(). Since Qt3 always used the object
+name as the window role and most Qt3/KDE3 code is ported to call setObjectName(),
+this makes the window role set in many cases (which KWin uses for window identifying).
 
- there are several problems with Qt's support for the WM_WINDOW_ROLE property:
-
-- plain "QWidget w; w.setWindowRole( "test" );" aborts with 
-Qt::WA_WState_Created not being set
-
-- while QWidgetPrivate::create_sys() uses QObject object name for initial 
-setting of WM_WINDOW_ROLE, later calls to QObject::setObjectName() have no 
-effect on it
-
-- Qt3 used the QObject object name for setting the window role, however Qt4 
-uses some strange mix of object name and what's set manually with 
-setWindowRole().
-
- The result is that that Qt3 and KDE3 apps that had WM_WINDOW_ROLE set don't 
-in their Qt4 and KDE4 versions. I suggest using the attached patch which 
-fixed all of the above problems:
-
-- set explicit window role is used when actually set, otherwise the object 
-name is used. This e.g. takes care of apps ported using setObjectName() from 
-their Qt3/KDE3 versions (including e.g. Qt Designer) and generally makes it 
-somewhat less demanding to actually set a usable window role (I can't quite 
-see how many developers would be bothered to explicitly call 
-setWindowRole()).
-
-- calls to QObject::setObjectName() update the WM_WINDOW_ROLE property. Since 
-QObjectPrivate already has a virtual dtor I think adding another virtual for 
-handling the QWidget-related functionality from QtCore is fine.
 
 --- a/src/corelib/kernel/qobject.cpp
 +++ b/src/corelib/kernel/qobject.cpp
-@@ -1013,9 +1013,18 @@
+@@ -1016,9 +1016,18 @@
  {
      Q_D(QObject);
      d->objectName = name;
@@ -59,59 +35,65 @@ handling the QWidget-related functionality from QtCore is fine.
      QObject::child is compat but needs to call itself recursively,
 --- a/src/corelib/kernel/qobject_p.h
 +++ b/src/corelib/kernel/qobject_p.h
-@@ -144,6 +144,9 @@
+@@ -146,6 +146,9 @@
      mutable quint32 connectedSignals;
  
      QString objectName;
 +#if defined(Q_WS_X11)
 +    virtual void checkWindowRole();
 +#endif
- };
  
- class QSemaphore;
+     // Note: you must hold the signalSlotLock() before accessing the lists below or calling the functions
+     struct Connection
 --- a/src/gui/kernel/qwidget_p.h
 +++ b/src/gui/kernel/qwidget_p.h
-@@ -314,6 +314,7 @@
+@@ -328,6 +328,7 @@
  
  #if defined(Q_WS_X11)
-     void setWindowRole(const char *role);
+     void setWindowRole();
 +    virtual void checkWindowRole();
      void sendStartupMessage(const char *message) const;
+     void setNetWmWindowTypes();
  #endif
- 
 --- a/src/gui/kernel/qwidget_x11.cpp
 +++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -676,11 +676,8 @@
-         // when we create a toplevel widget, the frame strut should be dirty
+@@ -714,13 +714,17 @@
          data.fstrut_dirty = 1;
  
--        // declare the widget's object name as window role
--        QByteArray objName = q->objectName().toLocal8Bit();
--        XChangeProperty(dpy, id,
--                        ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
--                        (unsigned char *)objName.constData(), objName.length());
-+        // declare the widget's object name as window role if not set
-+        setWindowRole( !q->windowRole().isEmpty() ? q->windowRole().toUtf8() : q->objectName().toUtf8());
+         // declare the widget's window role
++        QByteArray windowRole;
+         if (QTLWExtra *topData = maybeTopData()) {
+-            if (!topData->role.isEmpty()) {
+-                QByteArray windowRole = topData->role.toUtf8();
+-                XChangeProperty(dpy, id,
+-                                ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
+-                                (unsigned char *)windowRole.constData(), windowRole.length());
+-            }
++            if (!topData->role.isEmpty())
++                windowRole = topData->role.toUtf8();
++        }
++        if (windowRole.isEmpty()) // use object name as a fallback
++            windowRole = objectName.toUtf8();
++        if (!windowRole.isEmpty()) {
++            XChangeProperty(dpy, id,
++                            ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
++                            (unsigned char *)windowRole.constData(), windowRole.length());
+         }
  
          // set client leader property
-         XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
-@@ -2676,12 +2673,20 @@
- void QWidgetPrivate::setWindowRole(const char *role)
- {
-     Q_Q(QWidget);
--    Q_ASSERT(q->testAttribute(Qt::WA_WState_Created));
-+    if( !q->testAttribute(Qt::WA_WState_Created))
-+        return;
-     XChangeProperty(X11->display, q->internalWinId(),
-                     ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
-                     (unsigned char *)role, qstrlen(role));
+@@ -2857,6 +2861,17 @@
+                     (unsigned char *)windowRole.constData(), windowRole.length());
  }
  
 +void QWidgetPrivate::checkWindowRole()
 +{
 +    Q_Q(QWidget);
-+    if( q->windowRole().isEmpty())
-+        setWindowRole( objectName.toUtf8());
++    if( !q->windowRole().isEmpty() || !q->internalWinId())
++        return;
++    QByteArray windowRole = objectName.toUtf8(); // use as a fallback
++    XChangeProperty(X11->display, q->internalWinId(),
++                    ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
++                    (unsigned char *)windowRole.constData(), windowRole.length());
 +}
 +
  Q_GLOBAL_STATIC(QX11PaintEngine, qt_widget_paintengine)
diff --git a/debian/patches/0187-fix-font-fixed-pitch.diff b/debian/patches/0187-fix-font-fixed-pitch.diff
deleted file mode 100644
index fa22d97..0000000
--- a/debian/patches/0187-fix-font-fixed-pitch.diff
+++ /dev/null
@@ -1,56 +0,0 @@
-qt-bugs@ issue : 173297
-Trolltech task ID : 175024 (status: pending for Qt 4.4.0)
-applied: no
-author: Matthew Woehlke <mw_triad@users.sourceforge.net>
-
-This patch works around broken QFontInfo::fixedPitch by always using a
-glyph metrics comparison test to guess the information. This has the
-property of both ignoring (bad) and not relying on (good) any information
-that might be provided by the OS's font facility.
-
-On further conversation with TT (at which point they were finally able
-to reproduce the problem), it seems fixedPitch() only breaks if one has
-called setFixedPitch(true) on the QFont, and the selected font is not
-fixed pitch.
-
-This patch should be considered temporary until TT has a better fix.
-
---- a/src/gui/text/qfont.cpp
-+++ b/src/gui/text/qfont.cpp
-@@ -2098,7 +2098,6 @@
- {
-     QFontEngine *engine = d->engineForScript(QUnicodeTables::Common);
-     Q_ASSERT(engine != 0);
--#ifdef Q_OS_MAC
-     if (!engine->fontDef.fixedPitchComputed) {
-         QChar ch[2] = { QLatin1Char('i'), QLatin1Char('m') };
-         QGlyphLayout g[2];
-@@ -2107,7 +2106,6 @@
-         engine->fontDef.fixedPitch = g[0].advance.x == g[1].advance.x;
-         engine->fontDef.fixedPitchComputed = true;
-     }
--#endif
-     return engine->fontDef.fixedPitch;
- }
- 
---- a/src/gui/text/qfont_p.h
-+++ b/src/gui/text/qfont_p.h
-@@ -71,9 +71,7 @@
-           styleStrategy(QFont::PreferDefault), styleHint(QFont::AnyStyle),
-           weight(50), fixedPitch(false), style(QFont::StyleNormal), stretch(100),
-           ignorePitch(true)
--#ifdef Q_WS_MAC
-           ,fixedPitchComputed(false)
--#endif
-     {
-     }
- 
-@@ -95,7 +93,7 @@
-     uint stretch    : 12; // 0-400
- 
-     uint ignorePitch : 1;
--    uint fixedPitchComputed : 1; // for Mac OS X only
-+    uint fixedPitchComputed : 1;
-     uint reserved   : 16; // for future extensions
- 
-     bool exactMatch(const QFontDef &other) const;
diff --git a/debian/patches/0191-listview-alternate-row-colors.diff b/debian/patches/0191-listview-alternate-row-colors.diff
index e3e31d8..051066a 100644
--- a/debian/patches/0191-listview-alternate-row-colors.diff
+++ b/debian/patches/0191-listview-alternate-row-colors.diff
@@ -11,7 +11,7 @@ the only culprit. (QTreeView was fixed by TT already.)
 
 --- a/src/gui/itemviews/qlistview.cpp
 +++ b/src/gui/itemviews/qlistview.cpp
-@@ -1078,7 +1078,7 @@
+@@ -1097,7 +1097,7 @@
                  option.state &= ~QStyle::State_Enabled;
                  cg = QPalette::Disabled;
              } else {
diff --git a/debian/patches/0192-itemdelegate-palette-state.diff b/debian/patches/0192-itemdelegate-palette-state.diff
index 966f8e4..79bf079 100644
--- a/debian/patches/0192-itemdelegate-palette-state.diff
+++ b/debian/patches/0192-itemdelegate-palette-state.diff
@@ -9,7 +9,7 @@ in active windows.
 
 --- a/src/gui/itemviews/qitemdelegate.cpp
 +++ b/src/gui/itemviews/qitemdelegate.cpp
-@@ -640,10 +640,10 @@
+@@ -653,10 +653,10 @@
  
      QPen pen = painter->pen();
      QPalette::ColorGroup cg = option.state & QStyle::State_Enabled
diff --git a/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff b/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff
deleted file mode 100644
index 509f2ab..0000000
--- a/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-qt-bugs@ issue : 181399
-Trolltech task ID : 181413 (status: fixed for Qt 4.4.0)
-applied: no
-author: Matthias Kretz <kretz@kde.org>
-
-Allows drag and drop to work without pressing the shift key for itemviews that use InternalMove.
-
---- a/src/gui/itemviews/qlistview.cpp
-+++ b/src/gui/itemviews/qlistview.cpp
-@@ -999,7 +999,7 @@
-         }
-         QDrag *drag = new QDrag(this);
-         drag->setMimeData(d->model->mimeData(indexes));
--        Qt::DropAction action = drag->start(supportedActions);
-+        Qt::DropAction action = drag->exec(supportedActions);
-         d->dynamicListView->draggedItems.clear();
-         if (action == Qt::MoveAction)
-             d->clearOrRemove();
---- a/src/gui/itemviews/qabstractitemview.cpp
-+++ b/src/gui/itemviews/qabstractitemview.cpp
-@@ -2973,7 +2973,7 @@
- 
- #ifndef QT_NO_DRAGANDDROP
- /*!
--    Starts a drag by calling drag->start() using the given \a supportedActions.
-+    Starts a drag by calling drag->exec() using the given \a supportedActions.
- */
- void QAbstractItemView::startDrag(Qt::DropActions supportedActions)
- {
-@@ -2990,7 +2990,7 @@
-         drag->setPixmap(pixmap);
-         drag->setMimeData(data);
-         drag->setHotSpot(d->pressedPosition - rect.topLeft());
--        if (drag->start(supportedActions) == Qt::MoveAction)
-+        if (drag->exec(supportedActions) == Qt::MoveAction)
-             d->clearOrRemove();
-     }
- }
diff --git a/debian/patches/0195-compositing-properties.diff b/debian/patches/0195-compositing-properties.diff
index 307d6f0..3e9c2be 100644
--- a/debian/patches/0195-compositing-properties.diff
+++ b/debian/patches/0195-compositing-properties.diff
@@ -9,11 +9,10 @@ so they can be used when compositing.
 
 --- a/src/gui/kernel/qwidget_x11.cpp
 +++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -621,7 +621,11 @@
-         wsa.save_under = True;
+@@ -657,6 +657,11 @@
+         Q_ASSERT(id);
          XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
                                  &wsa);
--        q->x11SetWindowType();
 +        XClassHint class_hint;
 +        QByteArray appName = qAppName().toLatin1();
 +        class_hint.res_name = appName.data(); // application name
@@ -22,52 +21,38 @@ so they can be used when compositing.
      } else if (topLevel && !desktop) {        // top-level widget
          if (!X11->wm_client_leader)
              create_wm_client_leader();
-@@ -666,29 +670,34 @@
-         // set mwm hints
-         SetMWMHints(dpy, id, mwmhints);
+@@ -705,13 +710,21 @@
+         // set EWMH window types
+         setNetWmWindowTypes();
  
--        q->x11SetWindowType(); // set _NET_WM_WINDOW_TYPE
--
--        // set _NET_WM_PID
--        long curr_pid = getpid();
--        XChangeProperty(dpy, id, ATOM(_NET_WM_PID), XA_CARDINAL, 32, PropModeReplace,
--                        (unsigned char *) &curr_pid, 1);
--
-         // when we create a toplevel widget, the frame strut should be dirty
-         data.fstrut_dirty = 1;
- 
--        // declare the widget's object name as window role if not set
--        setWindowRole( !q->windowRole().isEmpty() ? q->windowRole().toUtf8() : q->objectName().toUtf8());
--
--        // set client leader property
--        XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
--                        XA_WINDOW, 32, PropModeReplace,
--                        (unsigned char *)&X11->wm_client_leader, 1);
-     } else {
-         // non-toplevel widgets don't have a frame, so no need to
-         // update the strut
-         data.fstrut_dirty = 0;
-     }
- 
-+    if (initializeWindow && (popup || (topLevel && !desktop))) { // properties set on all toplevel windows
-+        q->x11SetWindowType(); // set _NET_WM_WINDOW_TYPE
-+
-+        // set _NET_WM_PID
-+        long curr_pid = getpid(); 
-+        XChangeProperty(dpy, id, ATOM(_NET_WM_PID), XA_CARDINAL, 32, PropModeReplace, 
-+                        (unsigned char *) &curr_pid, 1); 
-+
-+        // declare the widget's object name as window role if not set
-+        setWindowRole( !q->windowRole().isEmpty() ? q->windowRole().toUtf8() : q->objectName().toUtf8()); 
++        // when we create a toplevel widget, the frame strut should be dirty
++        data.fstrut_dirty = 1;
 +
-+        // set client leader property
-+        if (!X11->wm_client_leader)
-+            create_wm_client_leader();
-+        XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER), 
-+                        XA_WINDOW, 32, PropModeReplace, 
-+                        (unsigned char *)&X11->wm_client_leader, 1); 
++    } else {
++        // non-toplevel widgets don't have a frame, so no need to
++        // update the strut
++        data.fstrut_dirty = 0;
 +    }
 +
-     if (initializeWindow) {
-         // don't erase when resizing
-         wsa.bit_gravity = QApplication::isRightToLeft() ? NorthEastGravity : NorthWestGravity;
++    if (initializeWindow && (popup || (topLevel && !desktop))) { // properties set on all toplevel windows
+         // set _NET_WM_PID
+         long curr_pid = getpid();
+         XChangeProperty(dpy, id, ATOM(_NET_WM_PID), XA_CARDINAL, 32, PropModeReplace,
+                         (unsigned char *) &curr_pid, 1);
+ 
+-        // when we create a toplevel widget, the frame strut should be dirty
+-        data.fstrut_dirty = 1;
+ 
+         // declare the widget's window role
+         QByteArray windowRole;
+@@ -731,10 +744,6 @@
+         XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
+                         XA_WINDOW, 32, PropModeReplace,
+                         (unsigned char *)&X11->wm_client_leader, 1);
+-    } else {
+-        // non-toplevel widgets don't have a frame, so no need to
+-        // update the strut
+-        data.fstrut_dirty = 0;
+     }
+ 
+     if (initializeWindow && q->internalWinId()) {
diff --git a/debian/patches/01_qmake_for_debian.diff b/debian/patches/01_qmake_for_debian.diff
index 60aedbe..d03f635 100644
--- a/debian/patches/01_qmake_for_debian.diff
+++ b/debian/patches/01_qmake_for_debian.diff
@@ -14,4 +14,4 @@ Ensures qmake generates Makefiles that use the -qt4 tools.
 +QMAKE_UIC             = $$[QT_INSTALL_BINS]/uic-qt4
  
  QMAKE_AR              = ar cqs
- QMAKE_RANLIB          =
+ QMAKE_OBJCOPY         = objcopy
diff --git a/debian/patches/0200-fix-qsslsocket-waitfor.diff b/debian/patches/0200-fix-qsslsocket-waitfor.diff
deleted file mode 100644
index c59ccb0..0000000
--- a/debian/patches/0200-fix-qsslsocket-waitfor.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-qt-bugs@ issue : N188142
-Trolltech task ID : 188329 (status: fixed for Qt 4.4.0)
-bugs.kde.org number : None
-applied: no
-author: Andreas Hartmetz <ahartmetz@gmail.com>
-
-This patch fixes that some QSslSocket::waitFor$X methods, when passed -1 as the
-argument, behave as if they were passed 0. -1 is supposed to mean "wait indefi-
-nitely" while 0 means "don't wait".
-
-
---- a/src/network/qsslsocket.cpp
-+++ b/src/network/qsslsocket.cpp
-@@ -257,6 +257,19 @@
- #include <QtNetwork/qhostaddress.h>
- #include <QtNetwork/qhostinfo.h>
- 
-+/*
-+   Returns the difference between msecs and elapsed. If msecs is -1,
-+   however, -1 is returned.
-+*/
-+static int qt_timeout_value(int msecs, int elapsed)
-+{
-+    if (msecs == -1)
-+        return -1;
-+
-+    int timeout = msecs - elapsed;
-+    return timeout < 0 ? 0 : timeout;
-+}
-+
- class QSslSocketGlobalData
- {
- public:
-@@ -1116,7 +1129,7 @@
-             startClientEncryption();
-         // Loop, waiting until the connection has been encrypted or an error
-         // occurs.
--        if (!d->plainSocket->waitForReadyRead(qBound(0, msecs - stopWatch.elapsed(), msecs)))
-+        if (!d->plainSocket->waitForReadyRead(qt_timeout_value(msecs, stopWatch.elapsed())))
-             return false;
-     }
-     return d->connectionEncrypted;
-@@ -1144,7 +1157,7 @@
-             return false;
-     }
- 
--    while (d->plainSocket->waitForReadyRead(qBound(0, msecs - stopWatch.elapsed(), msecs))) {
-+    while (d->plainSocket->waitForReadyRead(qt_timeout_value(msecs, stopWatch.elapsed()))) {
-         if (d->readBuffer.size() != oldReadBufferSize) {
-             // If the read buffer has grown, readyRead() must have been emitted.
-             return true;
-@@ -1173,7 +1186,7 @@
-             return false;
-     }
- 
--    return d->plainSocket->waitForBytesWritten(qBound(0, msecs - stopWatch.elapsed(), msecs));
-+    return d->plainSocket->waitForBytesWritten(qt_timeout_value(msecs, stopWatch.elapsed()));
- }
- 
- /*!
diff --git a/debian/patches/0203-qtexthtmlparser-link-color.diff b/debian/patches/0203-qtexthtmlparser-link-color.diff
index 07af6b0..4584160 100644
--- a/debian/patches/0203-qtexthtmlparser-link-color.diff
+++ b/debian/patches/0203-qtexthtmlparser-link-color.diff
@@ -1,13 +1,13 @@
 qt-bugs@ issue : N190509
 Trolltech task ID : 190904
-applied: yes
+applied: no
 author: Rafael Fernández López <ereslibre@kde.org>
 
 Links are assigned a foreground color according to the system current color scheme.
 
 --- a/src/gui/text/qtexthtmlparser.cpp
 +++ b/src/gui/text/qtexthtmlparser.cpp
-@@ -1038,7 +1038,7 @@
+@@ -1053,7 +1053,7 @@
                      && !attributes.at(i + 1).isEmpty()) {
                      hasHref = true;
                      charFormat.setUnderlineStyle(QTextCharFormat::SingleUnderline);
diff --git a/debian/patches/0205-fast-qpixmap-fill.diff b/debian/patches/0205-fast-qpixmap-fill.diff
deleted file mode 100644
index 96aefcf..0000000
--- a/debian/patches/0205-fast-qpixmap-fill.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-Trolltech task ID : None
-bugs.kde.org number : None
-applied: yes
-author: Fredrik Höglund <fredrik@kde.org>
-os: unix
-
-Since there's no way to specify that a QPixmap should have an alpha channel
-when it's created, it's quite common to call pixmap.fill(Qt::transparent)
-immediately after creating it, to force Qt to recreate it with an alpha
-channel. Unfortunately QPixmap::fill() does this by creating a QImage,
-filling it with the specified color, and then converting it to a QPixmap.
-
-This patch avoids the expensive image->pixmap conversion by simply discarding
-the old pixmap, creating a new one with the correct format, and doing the
-fill server side.
-
---- a/src/gui/image/qpixmap_x11.cpp
-+++ b/src/gui/image/qpixmap_x11.cpp
-@@ -447,8 +447,28 @@
-         return;
-     if (fillColor.alpha() != 255) {
- #ifndef QT_NO_XRENDER
--        if (data->picture && data->d == 32) {
-+        if (X11->use_xrender) {
-             detach();
-+            if (!data->picture || data->d != 32) {
-+                if (data->picture)
-+                    XRenderFreePicture(X11->display, data->picture);
-+                if (data->mask_picture)
-+                    XRenderFreePicture(X11->display, data->mask_picture);
-+                if (data->x11_mask)
-+                    XFreePixmap(X11->display, data->x11_mask);
-+                if (data->hd)
-+                     XFreePixmap(X11->display, data->hd);
-+                if (data->hd2)
-+                    XFreePixmap(X11->display, data->hd2);
-+                XRenderPictFormat *format = XRenderFindStandardFormat(X11->display, PictStandardARGB32);
-+                data->hd = XCreatePixmap(X11->display, RootWindow(X11->display, data->xinfo.screen()),
-+                                         width(), height(), 32);
-+                data->picture = XRenderCreatePicture(X11->display, data->hd, format, 0, 0);
-+                data->mask_picture = 0;
-+                data->x11_mask = 0;
-+                data->hd2 = 0;
-+                data->d = 32;
-+            }
-             ::Picture src  = X11->getSolidFill(data->xinfo.screen(), fillColor);
-             XRenderComposite(X11->display, PictOpSrc, src, 0, data->picture,
-                              0, 0, width(), height(),
diff --git a/debian/patches/0209-prevent-qt-mixing.diff b/debian/patches/0209-prevent-qt-mixing.diff
index 00a1918..e16793c 100644
--- a/debian/patches/0209-prevent-qt-mixing.diff
+++ b/debian/patches/0209-prevent-qt-mixing.diff
@@ -1,7 +1,7 @@
 qt-bugs@ issue : none
 Trolltech task ID : none
 bugs.kde.org number : none
-applied: no
+applied: yes
 author: Lubos Lunak <l.lunak@kde.org>
 
 This patch changes QObjectPrivateVersion, thus preventing mixing
@@ -15,7 +15,7 @@ It only further enforces using the same sources for the whole Qt build.
 
 --- a/src/corelib/kernel/qobject_p.h
 +++ b/src/corelib/kernel/qobject_p.h
-@@ -82,7 +82,9 @@
+@@ -85,7 +85,9 @@
  
  inline QObjectData::~QObjectData() {}
  
diff --git a/debian/patches/0210-fix-crash-q3stylesheet-font-size.diff b/debian/patches/0210-fix-crash-q3stylesheet-font-size.diff
index f930194..338478b 100644
--- a/debian/patches/0210-fix-crash-q3stylesheet-font-size.diff
+++ b/debian/patches/0210-fix-crash-q3stylesheet-font-size.diff
@@ -1,7 +1,7 @@
 qt-bugs@ issue : 197621
 Trolltech task ID : 197836
 bugs.kde.org number : none
-applied: yes
+applied: no
 author: Montel Laurent <montel@kde.org>
 
 This patch fixes crashs in q3stylesheet (it was possible to
@@ -10,7 +10,7 @@ Bug reported to TT with this patch.
 
 --- a/src/qt3support/text/q3stylesheet.cpp
 +++ b/src/qt3support/text/q3stylesheet.cpp
-@@ -1461,9 +1461,9 @@
+@@ -1463,9 +1463,9 @@
          s = baseSize;
      }
      if (pixel)
@@ -21,4 +21,4 @@ Bug reported to TT with this patch.
 +        font.setPointSize(qMax(1,s));
  }
  
- #endif // QT_NO_RICHTEXT
+ QT_END_NAMESPACE
diff --git a/debian/patches/0211-q3action-crash.diff b/debian/patches/0211-q3action-crash.diff
deleted file mode 100644
index 116154b..0000000
--- a/debian/patches/0211-q3action-crash.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-qt-bugs@ issue : 193866
-Trolltech task ID : 193338
-bugs.kde.org number : none
-applied: yes
-author: Montel Laurent <montel@kde.org>
-
-During porting qt3to4 port QGroupAction to Q3GroupAction
-but not QAction to Q3Action (which is logical)
-But it crashs when it's not a q3action.
-Patch from TT.
-
---- a/src/qt3support/widgets/q3action.cpp
-+++ b/src/qt3support/widgets/q3action.cpp
-@@ -1671,7 +1671,7 @@
-         if (d->dropdown) {
-             if (!d->exclusive) {
-                 QList<Q3Action*>::Iterator it(d->actions.begin());
--                if (!(*it))
-+                if (it == d->actions.end() || !(*it))
-                     return true;
- 
-                 Q3Action *defAction = *it;
diff --git a/debian/patches/02_launch_assistant-qt4.diff b/debian/patches/02_launch_assistant-qt4.diff
index ae5eb83..aeb1c33 100644
--- a/debian/patches/02_launch_assistant-qt4.diff
+++ b/debian/patches/02_launch_assistant-qt4.diff
@@ -1,18 +1,22 @@
-author: Brian Nelson <pyro@debian.org>
-
---- a/tools/assistant/lib/qassistantclient.cpp
-+++ b/tools/assistant/lib/qassistantclient.cpp
-@@ -192,11 +192,11 @@
-     : QObject( parent ), host ( QLatin1String("localhost") )
+--- a/demos/qtdemo/menumanager.cpp
++++ b/demos/qtdemo/menumanager.cpp
+@@ -291,7 +291,7 @@
+     if (this->assistantProcess.state() != QProcess::Running){
+         QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator();
+ #if !defined(Q_OS_MAC)
+-        app += QLatin1String("assistant");
++        app += QLatin1String("assistant-qt4");
+ #else
+         app += QLatin1String("Assistant.app/Contents/MacOS/Assistant");
+ #endif
+--- a/tools/designer/src/designer/assistantclient.cpp
++++ b/tools/designer/src/designer/assistantclient.cpp
+@@ -115,7 +115,7 @@
  {
-     if ( path.isEmpty() )
--        assistantCommand = QLatin1String("assistant");
-+        assistantCommand = QLatin1String("assistant-qt4");
-     else {
-         QFileInfo fi( path );
-         if ( fi.isDir() )
--            assistantCommand = path + QLatin1String("/assistant");
-+            assistantCommand = path + QLatin1String("/assistant-qt4");
-         else
-             assistantCommand = path;
-     }
+     QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator();
+ #if !defined(Q_OS_MAC)
+-    app += QLatin1String("assistant");
++    app += QLatin1String("assistant-qt4");
+ #else
+     app += QLatin1String("Assistant.app/Contents/MacOS/Assistant");    
+ #endif
diff --git a/debian/patches/03_launch_moc-qt4.diff b/debian/patches/03_launch_moc-qt4.diff
index a655a45..b3a354a 100644
--- a/debian/patches/03_launch_moc-qt4.diff
+++ b/debian/patches/03_launch_moc-qt4.diff
@@ -2,9 +2,9 @@ author: Brian Nelson <pyro@debian.org>
 
 Ensure the Qt4 version of moc is launched.
 
---- a/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
-+++ b/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
-@@ -396,7 +396,7 @@
+--- a/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp
++++ b/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp
+@@ -398,7 +398,7 @@
          else {
              // run moc on this file
              QProcess proc;
diff --git a/debian/patches/04_launch_uic-qt4.diff b/debian/patches/04_launch_uic-qt4.diff
index da80c9b..70e5595 100644
--- a/debian/patches/04_launch_uic-qt4.diff
+++ b/debian/patches/04_launch_uic-qt4.diff
@@ -1,8 +1,8 @@
-author: Fathi Boudra <fboudra@free.fr>
+author: Fathi Boudra <fabo@debian.org>
 
 --- a/tools/designer/src/lib/shared/qdesigner_utils.cpp
 +++ b/tools/designer/src/lib/shared/qdesigner_utils.cpp
-@@ -138,7 +138,7 @@
+@@ -488,7 +488,7 @@
          binary += QDir::separator();
          switch (mode) {
          case UIC_GenerateCode:
diff --git a/debian/patches/05_append_qt4_target.diff b/debian/patches/05_append_qt4_target.diff
index 5df005d..66e4d5c 100644
--- a/debian/patches/05_append_qt4_target.diff
+++ b/debian/patches/05_append_qt4_target.diff
@@ -1,4 +1,4 @@
-author: Fathi Boudra <fboudra@free.fr>
+author: Fathi Boudra <fabo@debian.org>
 
 --- a/config.tests/unix/compile.test
 +++ b/config.tests/unix/compile.test
@@ -32,7 +32,7 @@ author: Fathi Boudra <fboudra@free.fr>
 +"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/endian/endiantest.pro" -o "$OUTDIR/config.tests/unix/endian/Makefile" >/dev/null 2>&1
  cd "$OUTDIR/config.tests/unix/endian"
  
- ENDIAN="UNKNOWN"
+ 
 --- a/config.tests/unix/ptrsize.test
 +++ b/config.tests/unix/ptrsize.test
 @@ -10,7 +10,7 @@
@@ -57,7 +57,7 @@ author: Fathi Boudra <fboudra@free.fr>
      if [ "$VERBOSE" = "yes" ]; then
 --- a/configure
 +++ b/configure
-@@ -3523,7 +3523,7 @@
+@@ -3799,7 +3799,7 @@
  }
  
  # build qmake
@@ -66,7 +66,7 @@ author: Fathi Boudra <fboudra@free.fr>
      echo "Creating qmake. Please wait..."
  
      OLD_QCONFIG_H=
-@@ -5444,8 +5444,8 @@
+@@ -5999,8 +5999,8 @@
  QMAKE_MOC_SRC    = \$\$QT_BUILD_TREE/src/moc
  
  #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
@@ -77,7 +77,7 @@ author: Fathi Boudra <fboudra@free.fr>
  QMAKE_UIC3       = \$\$QT_BUILD_TREE/bin/uic3
  QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
  QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
-@@ -5709,11 +5709,11 @@
+@@ -6300,11 +6300,11 @@
  #-------------------------------------------------------------------------------
  
  echo "Finding project files. Please wait..."
@@ -91,7 +91,7 @@ author: Fathi Boudra <fboudra@free.fr>
  fi
  
  # .projects      -> projects to process
-@@ -5886,7 +5886,7 @@
+@@ -6477,7 +6477,7 @@
              echo "  for $a\c"
          fi
  
@@ -102,7 +102,7 @@ author: Fathi Boudra <fboudra@free.fr>
              if echo '\c' | grep '\c' >/dev/null; then
 --- a/projects.pro
 +++ b/projects.pro
-@@ -118,7 +118,7 @@
+@@ -114,7 +114,7 @@
  win32 {
     qmake.files=$$QT_BUILD_TREE/bin/qmake.exe
  } else {
@@ -113,7 +113,7 @@ author: Fathi Boudra <fboudra@free.fr>
  
 --- a/qmake/Makefile.unix
 +++ b/qmake/Makefile.unix
-@@ -90,17 +90,17 @@
+@@ -98,17 +98,17 @@
  
  CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS)
  
@@ -135,6 +135,28 @@ author: Fathi Boudra <fboudra@free.fr>
  
  depend:
  	makedepend -D__MAKEDEPEND__ $(CPPFLAGS) $(DEPEND_SRC)
+--- a/tools/linguist/lrelease/lrelease.pro
++++ b/tools/linguist/lrelease/lrelease.pro
+@@ -29,7 +29,7 @@
+ SOURCES += $$PROPARSERPATH/proitems.cpp \
+         $$PROPARSERPATH/proreader.cpp
+ 
+-TARGET          = lrelease
++TARGET          = lrelease-qt4
+ INCLUDEPATH     += ../shared
+ DESTDIR         = ../../../bin
+ 
+--- a/tools/linguist/lupdate/lupdate.pro
++++ b/tools/linguist/lupdate/lupdate.pro
+@@ -42,7 +42,7 @@
+         $$PROPARSERPATH/proreader.cpp
+ 
+ 
+-TARGET          = lupdate
++TARGET          = lupdate-qt4
+ INCLUDEPATH     += ../shared
+ DESTDIR          = ../../../bin
+ 
 --- a/src/tools/moc/moc.pro
 +++ b/src/tools/moc/moc.pro
 @@ -1,5 +1,5 @@
@@ -155,8 +177,8 @@ author: Fathi Boudra <fboudra@free.fr>
  DESTDIR = ../../../bin
  
  DEFINES	       += QT_BOOTSTRAPPED QT_UIC QT_LITE_UNICODE QT_NO_DATASTREAM \
---- a/tools/assistant/assistant.pro
-+++ b/tools/assistant/assistant.pro
+--- a/tools/assistant/tools/assistant/assistant.pro
++++ b/tools/assistant/tools/assistant/assistant.pro
 @@ -2,7 +2,7 @@
  
  TEMPLATE = app
@@ -164,11 +186,11 @@ author: Fathi Boudra <fboudra@free.fr>
 -TARGET = assistant
 +TARGET = assistant-qt4
  
- CONFIG += qt warn_on
+ DEFINES += QT_CLUCENE_SUPPORT
  
 --- a/tools/designer/src/designer/designer.pro
 +++ b/tools/designer/src/designer/designer.pro
-@@ -25,7 +25,7 @@
+@@ -24,7 +24,7 @@
      DEFINES += QT_DESIGNER_STATIC
  }
  
@@ -176,43 +198,21 @@ author: Fathi Boudra <fboudra@free.fr>
 +TARGET = designer-qt4
  
  include($$QT_SOURCE_TREE/tools/shared/fontpanel/fontpanel.pri)
- 
+ include($$QT_SOURCE_TREE/tools/shared/qttoolbardialog/qttoolbardialog.pri)
 --- a/tools/linguist/linguist/linguist.pro
 +++ b/tools/linguist/linguist/linguist.pro
-@@ -50,7 +50,7 @@
- DEFINES        += QT_KEYWORDS
- 
- DESTDIR                = ../../../bin
--TARGET                = linguist
-+TARGET                = linguist-qt4
- 
- win32:RC_FILE        = linguist.rc
- 
---- a/tools/linguist/lrelease/lrelease.pro
-+++ b/tools/linguist/lrelease/lrelease.pro
-@@ -29,7 +29,7 @@
- SOURCES += $$PROPARSERPATH/proitems.cpp \
-         $$PROPARSERPATH/proreader.cpp
- 
--TARGET          = lrelease
-+TARGET          = lrelease-qt4
- INCLUDEPATH     += ../shared
- DESTDIR         = ../../../bin
- 
---- a/tools/linguist/lupdate/lupdate.pro
-+++ b/tools/linguist/lupdate/lupdate.pro
-@@ -39,7 +39,7 @@
-         $$PROPARSERPATH/proreader.cpp
- 
- 
--TARGET          = lupdate
-+TARGET          = lupdate-qt4
- INCLUDEPATH     += ../shared
- DESTDIR          = ../../../bin
- 
+@@ -67,7 +67,7 @@
+ contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE
+ DEFINES += QT_KEYWORDS
+ DESTDIR = ../../../bin
+-TARGET = linguist
++TARGET = linguist-qt4
+ win32:RC_FILE = linguist.rc
+ mac { 
+     static:CONFIG -= global_init_link_order
 --- a/tools/qtconfig/qtconfig.pro
 +++ b/tools/qtconfig/qtconfig.pro
-@@ -16,7 +16,7 @@
+@@ -19,7 +19,7 @@
  RESOURCES    = qtconfig.qrc
  
  PROJECTNAME        = Qt Configuration
diff --git a/debian/patches/06_qtdemo_destdir.diff b/debian/patches/06_qtdemo_destdir.diff
deleted file mode 100644
index 98ddb76..0000000
--- a/debian/patches/06_qtdemo_destdir.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-author: Fathi Boudra <fboudra@free.fr>
-
-Fix qtdemo destdir.
-
---- a/demos/arthurplugin/arthurplugin.pro
-+++ b/demos/arthurplugin/arthurplugin.pro
-@@ -3,7 +3,7 @@
- 
- CONFIG      += designer plugin debug_and_release
- TEMPLATE    = lib
--QTDIR_build:DESTDIR     = $$QT_BUILD_TREE/plugins/designer
-+QTDIR_build:DESTDIR     = plugins/designer
- 
- contains(QT_CONFIG, opengl) {
- 	DEFINES += QT_OPENGL_SUPPORT
---- a/demos/qtdemo/qtdemo.pro
-+++ b/demos/qtdemo/qtdemo.pro
-@@ -1,6 +1,6 @@
- CONFIG += assistant x11inc
- TARGET = qtdemo
--DESTDIR = $$QT_BUILD_TREE/bin
-+DESTDIR = bin
- OBJECTS_DIR = .obj
- MOC_DIR = .moc
- INSTALLS += target sources
diff --git a/debian/patches/08_load_ssl.diff b/debian/patches/08_load_ssl.diff
deleted file mode 100644
index 91147d6..0000000
--- a/debian/patches/08_load_ssl.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/network/qsslsocket_openssl_symbols.cpp
-+++ b/src/network/qsslsocket_openssl_symbols.cpp
-@@ -254,7 +254,7 @@
-         return false;
-     }
- #else
--    QLibrary libssl(QLatin1String("ssl"));
-+    QLibrary libssl(QLatin1String("ssl.so.0.9.8"));
-     if (!libssl.load()) {
-         // Cannot find libssl
-         qWarning("QSslSocket: cannot find ssl library: %s.",
-@@ -262,7 +262,7 @@
-         return false;
-     }
- 
--    QLibrary libcrypto(QLatin1String("crypto"));
-+    QLibrary libcrypto(QLatin1String("crypto.so.0.9.8"));
-     if (!libcrypto.load()) {
-         // Cannot find libcrypto
-         qWarning("QSslSocket: cannot find crypto library: %s.",
diff --git a/debian/patches/10_config_tests_fixes.diff b/debian/patches/10_config_tests_fixes.diff
index 623c11e..eafb8d3 100644
--- a/debian/patches/10_config_tests_fixes.diff
+++ b/debian/patches/10_config_tests_fixes.diff
@@ -1,7 +1,3 @@
-author: Fathi Boudra <fabo@debian.org>
-
-Configuration test fixes for Interbase/Firebird and ODBC sql drivers.
-
 --- a/config.tests/unix/ibase/ibase.pro
 +++ b/config.tests/unix/ibase/ibase.pro
 @@ -1,4 +1,4 @@
@@ -15,7 +11,7 @@ Configuration test fixes for Interbase/Firebird and ODBC sql drivers.
 @@ -1,4 +1,4 @@
  SOURCES = odbc.cpp
  CONFIG -= qt dylib
- CONFIG -= app_bundle
+ mac:CONFIG -= app_bundle
 -LIBS += -lodbc
 +LIBS += -liodbc
 --- a/src/plugins/sqldrivers/odbc/odbc.pro
diff --git a/debian/patches/21_assume_no_fpu_for_embedded_devices.diff b/debian/patches/21_assume_no_fpu_for_embedded_devices.diff
deleted file mode 100644
index 72e80b3..0000000
--- a/debian/patches/21_assume_no_fpu_for_embedded_devices.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-status: fixed for Qt 4.4.0
-
---- a/src/corelib/global/qglobal.h
-+++ b/src/corelib/global/qglobal.h
-@@ -834,13 +834,13 @@
- 
- typedef int QNoImplicitBoolCast;
- 
--#if defined(QT_ARCH_ARM) || (defined(QT_ARCH_MIPS) && !defined(Q_OS_IRIX))
-+#if defined(QT_ARCH_ARM) || (defined(QT_ARCH_MIPS) && (defined(Q_WS_QWS) || defined(Q_OS_WINCE)))
- #define QT_NO_FPU
- #endif
- 
- #if defined(QT_COORD_TYPE)
- typedef QT_COORD_TYPE qreal;
--#elif defined(QT_NO_FPU)
-+#elif defined(QT_NO_FPU) || defined(QT_ARCH_ARM) || defined(QT_ARCH_WINDOWSCE)
- typedef float qreal;
- #else
- typedef double qreal;
diff --git a/debian/patches/30_arm_ftbfs_fixes.diff b/debian/patches/30_arm_ftbfs_fixes.diff
deleted file mode 100644
index e4b783f..0000000
--- a/debian/patches/30_arm_ftbfs_fixes.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-author: Fathi Boudra <fboudra@free.fr>
-
-Fix arm FTBFS.
-
---- a/tools/qtestlib/src/qtestcase.h
-+++ b/tools/qtestlib/src/qtestcase.h
-@@ -215,7 +215,7 @@
-     template <typename T1, typename T2>
-     bool qCompare(T1 const &, T2 const &, const char *, const char *, const char *, int);
- 
--#if defined(QT_COORD_TYPE) || defined(__arm__)
-+#if defined(QT_COORD_TYPE) || defined(QT_ARCH_ARM)
-     template <>
-     inline bool qCompare<qreal, double>(qreal const &t1, double const &t2, const char *actual,
-                                  const char *expected, const char *file, int line)
diff --git a/debian/patches/31_arm_eabi_fix.diff b/debian/patches/31_arm_eabi_fix.diff
deleted file mode 100644
index 10f63ac..0000000
--- a/debian/patches/31_arm_eabi_fix.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-author: Lennert Buytenhek <buytenh@wantstofly.org>
-
-Add support for EABI ARM platforms to Qt.
-
---- a/src/corelib/global/qglobal.h
-+++ b/src/corelib/global/qglobal.h
-@@ -336,7 +336,7 @@
- #  if defined(Q_OS_DARWIN) && __GNUC__ == 3 && (__GNUC_MINOR__ >= 1 && __GNUC_MINOR__ < 3)
- #    define Q_BROKEN_DEBUG_STREAM
- #  endif
--#  if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP)
-+#  if (defined(__arm__) || defined(__ARMEL__)) && !defined(__ARM_EABI__) && !defined(QT_MOC_CPP)
- #    define Q_PACKED __attribute__ ((__packed__))
- #    define Q_NO_PACKED_REFERENCE
- #  endif
diff --git a/debian/patches/40_alpha_ice.diff b/debian/patches/40_alpha_ice.diff
index 17bb04e..524ae33 100644
--- a/debian/patches/40_alpha_ice.diff
+++ b/debian/patches/40_alpha_ice.diff
@@ -1,6 +1,6 @@
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -74,14 +74,7 @@
+@@ -78,14 +78,7 @@
  {
  public:
      static QSettings *findConfiguration();
@@ -16,7 +16,7 @@
      static QSettings *configuration()
      {
  #ifdef QT_NO_THREAD
-@@ -100,6 +93,15 @@
+@@ -104,6 +97,15 @@
      }
  };
  
@@ -34,7 +34,7 @@
      settings = QLibraryInfoPrivate::findConfiguration();
 --- a/src/corelib/tools/qhash.h
 +++ b/src/corelib/tools/qhash.h
-@@ -486,7 +486,7 @@
+@@ -499,7 +499,7 @@
  }
  
  template <class Key, class T>
diff --git a/debian/patches/41_disable_opengl_visibility.diff b/debian/patches/41_disable_opengl_visibility.diff
index e2c597a..f27b26e 100644
--- a/debian/patches/41_disable_opengl_visibility.diff
+++ b/debian/patches/41_disable_opengl_visibility.diff
@@ -2,7 +2,7 @@ temporary fix because of alpha, has to be dropped as soon as gcc's bug is fixed.
 
 --- a/src/opengl/opengl.pro
 +++ b/src/opengl/opengl.pro
-@@ -5,6 +5,7 @@
+@@ -6,6 +6,7 @@
  win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x63000000
  solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
  
diff --git a/debian/patches/50_kfreebsd_build_fix.diff b/debian/patches/50_kfreebsd_build_fix.diff
index 94430a1..84736f6 100644
--- a/debian/patches/50_kfreebsd_build_fix.diff
+++ b/debian/patches/50_kfreebsd_build_fix.diff
@@ -4,7 +4,7 @@ Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC.
 
 --- a/src/corelib/global/qglobal.h
 +++ b/src/corelib/global/qglobal.h
-@@ -130,6 +130,12 @@
+@@ -210,6 +210,12 @@
  #  define Q_OS_RELIANT
  #elif defined(__linux__) || defined(__linux)
  #  define Q_OS_LINUX
@@ -17,7 +17,7 @@ Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC.
  #elif defined(__FreeBSD__) || defined(__DragonFly__)
  #  define Q_OS_FREEBSD
  #  define Q_OS_BSD4
-@@ -150,8 +156,6 @@
+@@ -230,8 +236,6 @@
  #  define Q_OS_AIX
  #elif defined(__Lynx__)
  #  define Q_OS_LYNX
@@ -28,15 +28,17 @@ Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC.
  #elif defined(__QNXNTO__)
 --- a/src/corelib/plugin/qlibrary.cpp
 +++ b/src/corelib/plugin/qlibrary.cpp
-@@ -298,11 +298,11 @@
+@@ -288,13 +288,13 @@
  
  #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
  
 -#if defined(Q_OS_FREEBSD) || defined(Q_OS_LINUX)
 +#if defined(Q_OS_FREEBSD) || defined(Q_OS_GLIBC)
  #  define USE_MMAP
+ QT_BEGIN_INCLUDE_NAMESPACE
  #  include <sys/types.h>
  #  include <sys/mman.h>
+ QT_END_INCLUDE_NAMESPACE
 -#endif // Q_OS_FREEBSD || Q_OS_LINUX
 +#endif // Q_OS_FREEBSD || Q_OS_GLIBC
  
@@ -44,7 +46,7 @@ Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC.
                               const char *pattern, ulong p_len)
 --- a/src/corelib/tools/qlocale.cpp
 +++ b/src/corelib/tools/qlocale.cpp
-@@ -68,7 +68,7 @@
+@@ -80,7 +80,7 @@
  #include <qdebug.h>
  #include <time.h>
  
@@ -53,7 +55,7 @@ Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC.
  #    include <fenv.h>
  #endif
  
-@@ -5934,7 +5934,7 @@
+@@ -6256,7 +6256,7 @@
      _control87(MCW_EM, MCW_EM);
  #endif
  
@@ -62,7 +64,7 @@ Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC.
      fenv_t envp;
      feholdexcept(&envp);
  #endif
-@@ -5950,7 +5950,7 @@
+@@ -6272,7 +6272,7 @@
  #endif //_M_X64
  #endif //Q_OS_WIN
  
diff --git a/debian/patches/60_m68k_inotify_fix.diff b/debian/patches/60_m68k_inotify_fix.diff
index 232a62d..aac297a 100644
--- a/debian/patches/60_m68k_inotify_fix.diff
+++ b/debian/patches/60_m68k_inotify_fix.diff
@@ -5,14 +5,14 @@ m68k tree, they should appear like this soon also in the upstream source.
 
 --- a/src/corelib/io/qfilesystemwatcher_inotify.cpp
 +++ b/src/corelib/io/qfilesystemwatcher_inotify.cpp
-@@ -108,6 +108,10 @@
- # define __NR_inotify_init      269
- # define __NR_inotify_add_watch 270
- # define __NR_inotify_rm_watch  271
+@@ -112,6 +112,10 @@
+ # define __NR_inotify_init	240
+ # define __NR_inotify_add_watch	241
+ # define __NR_inotify_rm_watch	242
 +#elif defined (__mc68000__)
-+# define __NR_inotify_init      284
-+# define __NR_inotify_add_watch 285
-+# define __NR_inotify_rm_watch  286
++# define __NR_inotify_init	284
++# define __NR_inotify_add_watch	285
++# define __NR_inotify_rm_watch	286
  #else
  # error "This architecture is not supported. Please talk to qt-bugs@trolltech.com"
  #endif
diff --git a/debian/patches/80_hurd_max_path.diff b/debian/patches/80_hurd_max_path.diff
index 263b061..bda822e 100644
--- a/debian/patches/80_hurd_max_path.diff
+++ b/debian/patches/80_hurd_max_path.diff
@@ -2,9 +2,9 @@ author: Brian Nelson <pyro@debian.org>
 
 --- a/src/corelib/io/qfsfileengine_unix.cpp
 +++ b/src/corelib/io/qfsfileengine_unix.cpp
-@@ -60,6 +60,10 @@
- # include <private/qcore_mac_p.h>
- #endif
+@@ -66,6 +66,10 @@
+ 
+ QT_BEGIN_NAMESPACE
  
 +#ifndef PATH_MAX
 +#define PATH_MAX 4096
diff --git a/debian/patches/91_qmake_lflags_no-undefined.diff b/debian/patches/91_qmake_lflags_no-undefined.diff
deleted file mode 100644
index f29b85b..0000000
--- a/debian/patches/91_qmake_lflags_no-undefined.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mkspecs/common/g++.conf
-+++ b/mkspecs/common/g++.conf
-@@ -32,7 +32,7 @@
- 
- QMAKE_LINK		= g++
- QMAKE_LINK_SHLIB	= g++
--QMAKE_LFLAGS		+=
-+QMAKE_LFLAGS		+= -Wl,--no-undefined
- QMAKE_LFLAGS_RELEASE	+=
- QMAKE_LFLAGS_DEBUG	+=
- QMAKE_LFLAGS_APP	+=
diff --git a/debian/patches/series b/debian/patches/series
index 7dff4ff..eafeb6c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,22 +1,15 @@
 # qt-copy patches
 0167-fix-group-reading.diff
-0172-prefer-xrandr-over-xinerama.diff
-0175-fix-s390-qatomic.diff
-0176-coverity-fixes.diff
-0178-transparency-window-types.diff
-0179-transient-hack.diff
 0180-window-role.diff
-0187-fix-font-fixed-pitch.diff
 0191-listview-alternate-row-colors.diff
 0192-itemdelegate-palette-state.diff
-0194-fix-moveonly-dnd-in-itemviews.diff
 0195-compositing-properties.diff
-0200-fix-qsslsocket-waitfor.diff
 0203-qtexthtmlparser-link-color.diff
-0205-fast-qpixmap-fill.diff
 0209-prevent-qt-mixing.diff
 0210-fix-crash-q3stylesheet-font-size.diff
-0211-q3action-crash.diff
+0214-fix-qgraphicsproxywidget-tab-crash.diff
+0216-allow-isystem-for-headers.diff
+0220-no-x-recursion-in-xerrhandler.diff
 
 # debian patches
 01_qmake_for_debian.diff
@@ -24,19 +17,16 @@
 03_launch_moc-qt4.diff
 04_launch_uic-qt4.diff
 05_append_qt4_target.diff
-06_qtdemo_destdir.diff
 07_trust_dpkg-arch_over_uname-m.diff
-08_load_ssl.diff
 09_qmake_lflags_as-needed.diff
 10_config_tests_fixes.diff
+11_qdbus_to_dbus_fix.diff
 20_mips_atomic_ops.diff
-#21_assume_no_fpu_for_embedded_devices.diff
-30_arm_ftbfs_fixes.diff
-31_arm_eabi_fix.diff
 40_alpha_ice.diff
 41_disable_opengl_visibility.diff
 50_kfreebsd_build_fix.diff
 60_m68k_inotify_fix.diff
 70_hppa_ldcw_fix.diff
+71_hppa_unaligned_access_fix_458133.diff
 80_hurd_max_path.diff
-91_qmake_lflags_no-undefined.diff
+90_gcc43.diff
diff --git a/debian/qt4-demos.install b/debian/qt4-demos.install
new file mode 100644
index 0000000..def0229
--- /dev/null
+++ b/debian/qt4-demos.install
@@ -0,0 +1,9 @@
+usr/bin/qtdemo
+usr/lib/qt4/demos
+usr/lib/qt4/examples
+usr/lib/qt4/plugins/designer/libarthurplugin.so
+usr/lib/qt4/plugins/designer/libcontainerextension.so
+usr/lib/qt4/plugins/designer/libcustomwidgetplugin.so
+usr/lib/qt4/plugins/designer/libtaskmenuextension.so
+usr/lib/qt4/plugins/designer/libworldtimeclockplugin.so
+
diff --git a/debian/qt4-demos.lintian b/debian/qt4-demos.lintian
new file mode 100644
index 0000000..a2bf63b
--- /dev/null
+++ b/debian/qt4-demos.lintian
@@ -0,0 +1,383 @@
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/affine/bg1.jpg
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/arthurplugin/bg1.jpg
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/arthurplugin/flower.jpg
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/arthurplugin/flower_alpha.jpg
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/books/images/star.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/browser/images/addtab.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/browser/images/closetab.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/browser/images/history.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/chip/fileprint.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/chip/qt4logo.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/chip/rotateleft.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/chip/rotateright.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/chip/zoomin.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/chip/zoomout.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/interview/images/folder.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/interview/images/interview.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/interview/images/services.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/mainwindow/qt.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/qtdemo/images/demobg.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/qtdemo/images/qtlogo_small.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/qtdemo/images/trolltech-logo.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/bg_pattern.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/button_normal_cap_left.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/button_normal_cap_right.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/button_normal_stretch.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/button_pressed_cap_left.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/button_pressed_cap_right.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/button_pressed_stretch.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/curve_thing_edit-6.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/frame_bottom.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/frame_bottomleft.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/frame_bottomright.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/frame_left.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/frame_right.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/frame_top.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/frame_topleft.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/frame_topright.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/groupframe_bottom_left.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/groupframe_bottom_right.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/groupframe_bottom_stretch.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/groupframe_left_stretch.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/groupframe_right_stretch.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/groupframe_top_stretch.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/groupframe_topleft.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/groupframe_topright.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/line_dash_dot.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/line_dash_dot_dot.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/line_dashed.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/line_dotted.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/line_solid.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/radiobutton-off.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/radiobutton-on.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/radiobutton_off.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/radiobutton_on.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/slider_bar.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/slider_thumb_off.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/slider_thumb_on.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/title_cap_left.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/title_cap_right.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/shared/images/title_stretch.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/spreadsheet/images/interview.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/logo32.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/mac/editcopy.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/mac/editcut.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/mac/editpaste.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/mac/editredo.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/mac/editundo.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/mac/exportpdf.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/mac/filenew.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/mac/fileopen.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/mac/fileprint.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/mac/filesave.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/mac/textbold.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/mac/textcenter.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/mac/textitalic.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/mac/textjustify.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/mac/textleft.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/mac/textright.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/mac/textunder.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/mac/zoomin.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/mac/zoomout.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/win/editcopy.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/win/editcut.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/win/editpaste.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/win/editredo.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/win/editundo.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/win/exportpdf.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/win/filenew.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/win/fileopen.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/win/fileprint.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/win/filesave.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/win/textbold.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/win/textcenter.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/win/textitalic.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/win/textjustify.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/win/textleft.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/win/textright.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/win/textunder.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/win/zoomin.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/textedit/images/win/zoomout.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/assistant/simpletextviewer/documentation/images/browse.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/assistant/simpletextviewer/documentation/images/fadedfilemenu.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/assistant/simpletextviewer/documentation/images/filedialog.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/assistant/simpletextviewer/documentation/images/handbook.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/assistant/simpletextviewer/documentation/images/icon.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/assistant/simpletextviewer/documentation/images/mainwindow.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/assistant/simpletextviewer/documentation/images/open.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/assistant/simpletextviewer/documentation/images/wildcard.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/dialogs/configdialog/images/config.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/dialogs/configdialog/images/query.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/dialogs/configdialog/images/update.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/draganddrop/draggableicons/images/boat.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/draganddrop/draggableicons/images/car.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/draganddrop/draggableicons/images/house.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/draganddrop/puzzle/example.jpg
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/collidingmice/images/cheese.jpg
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/diagramscene/images/background1.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/diagramscene/images/background2.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/diagramscene/images/background3.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/diagramscene/images/background4.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/diagramscene/images/bold.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/diagramscene/images/bringtofront.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/diagramscene/images/delete.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/diagramscene/images/floodfill.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/diagramscene/images/italic.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/diagramscene/images/linecolor.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/diagramscene/images/linepointer.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/diagramscene/images/pointer.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/diagramscene/images/sendtoback.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/diagramscene/images/textpointer.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/diagramscene/images/underline.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/dragdroprobot/images/head.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/padnavigator/images/artsfftscope.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/padnavigator/images/blue_angle_swirl.jpg
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/padnavigator/images/kontact_contacts.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/padnavigator/images/kontact_journal.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/padnavigator/images/kontact_mail.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/padnavigator/images/kontact_notes.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/padnavigator/images/kopeteavailable.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/padnavigator/images/metacontact_online.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/padnavigator/images/minitools.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/bg.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/bits/bits0000.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/bits/bits0001.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/bits/bits0002.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/bits/bits0003.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/bits/bits0004.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/bits/bits0005.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/bits/bits0006.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/bits/bits0007.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/bits/bits0008.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/bits/bits0009.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/bits/bits0010.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/bits/bits0011.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/bits/bits0012.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/bits/bits0013.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/bits/bits0014.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/bits/bits0015.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/exhaust/exhaust.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/missile/missile.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/powerups/brake.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/powerups/energy.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/powerups/shield.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/powerups/shoot.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/powerups/teleport.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10000.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10001.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10002.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10003.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10004.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10005.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10006.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10007.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10008.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10009.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10010.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10011.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10012.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10013.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10014.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10015.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10016.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10017.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10018.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10019.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10020.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10021.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10022.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10023.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10024.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10025.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10026.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10027.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10028.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10029.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10030.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock1/rock10031.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20000.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20001.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20002.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20003.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20004.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20005.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20006.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20007.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20008.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20009.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20010.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20011.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20012.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20013.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20014.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20015.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20016.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20017.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20018.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20019.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20020.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20021.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20022.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20023.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20024.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20025.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20026.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20027.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20028.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20029.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20030.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock2/rock20031.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30000.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30001.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30002.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30003.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30004.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30005.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30006.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30007.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30008.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30009.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30010.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30011.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30012.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30013.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30014.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30015.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30016.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30017.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30018.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30019.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30020.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30021.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30022.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30023.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30024.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30025.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30026.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30027.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30028.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30029.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30030.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/rock3/rock30031.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/shield/shield0000.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/shield/shield0001.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/shield/shield0002.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/shield/shield0003.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/shield/shield0004.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/shield/shield0005.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/shield/shield0006.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0000.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0001.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0002.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0003.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0004.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0005.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0006.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0007.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0008.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0009.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0010.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0011.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0012.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0013.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0014.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0015.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0016.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0017.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0018.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0019.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0020.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0021.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0022.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0023.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0024.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0025.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0026.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0027.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0028.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0029.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0030.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroids/sprites/ship/ship0031.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedcanvas/butterfly.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedcanvas/qt-trans.xpm
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedcanvas/qtlogo.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/ipc/sharedmemory/qt.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/itemviews/pixelator/images/qt.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/itemviews/puzzle/example.jpg
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/application/images/copy.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/application/images/cut.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/application/images/new.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/application/images/open.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/application/images/paste.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/application/images/save.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/dockwidgets/images/new.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/dockwidgets/images/print.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/dockwidgets/images/save.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/dockwidgets/images/undo.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/mdi/images/copy.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/mdi/images/cut.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/mdi/images/new.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/mdi/images/open.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/mdi/images/paste.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/mdi/images/save.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/sdi/images/copy.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/sdi/images/cut.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/sdi/images/new.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/sdi/images/open.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/sdi/images/paste.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/sdi/images/save.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/ftp/images/cdtoparent.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/ftp/images/dir.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/ftp/images/file.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/torrent/icons/1downarrow.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/torrent/icons/1uparrow.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/torrent/icons/bottom.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/torrent/icons/edit_add.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/torrent/icons/edit_remove.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/torrent/icons/exit.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/torrent/icons/peertopeer.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/torrent/icons/player_pause.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/torrent/icons/player_play.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/torrent/icons/player_stop.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/torrent/icons/stop.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/opengl/framebufferobject/qt4-logo.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/opengl/framebufferobject2/cubelogo.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/opengl/pbuffers/cubelogo.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/opengl/pbuffers2/qt4-logo.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/opengl/textures/images/side1.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/opengl/textures/images/side2.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/opengl/textures/images/side3.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/opengl/textures/images/side4.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/opengl/textures/images/side5.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/opengl/textures/images/side6.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/painting/basicdrawing/images/brick.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/painting/basicdrawing/images/qt-logo.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/painting/imagecomposition/images/background.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/painting/imagecomposition/images/blackrectangle.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/painting/imagecomposition/images/butterfly.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/painting/imagecomposition/images/checker.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/icons/images/designer.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/icons/images/find_disabled.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/icons/images/find_normal.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/icons/images/monkey_off_128x128.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/icons/images/monkey_off_16x16.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/icons/images/monkey_off_32x32.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/icons/images/monkey_off_64x64.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/icons/images/monkey_on_128x128.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/icons/images/monkey_on_16x16.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/icons/images/monkey_on_32x32.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/icons/images/monkey_on_64x64.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/icons/images/qtopia_16x16.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/icons/images/qtopia_32x32.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/icons/images/qtopia_48x48.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/movie/images/open.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/movie/images/pause.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/movie/images/play.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/movie/images/quit.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/movie/images/stop.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/styles/images/woodbackground.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/styles/images/woodbutton.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/tooltips/images/circle.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/tooltips/images/square.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/tooltips/images/triangle.png
+
diff --git a/debian/qt4-designer.install b/debian/qt4-designer.install
index 22719a5..1c860e0 100644
--- a/debian/qt4-designer.install
+++ b/debian/qt4-designer.install
@@ -1,2 +1,6 @@
 usr/bin/designer-qt4
-usr/lib/qt4/plugins/designer/*.so
+usr/share/qt4/translations/designer_de.qm
+usr/share/qt4/translations/designer_ja.qm
+usr/share/qt4/translations/designer_pl.qm
+usr/share/qt4/translations/designer_zh_CN.qm
+usr/share/qt4/translations/designer_zh_TW.qm
diff --git a/debian/qt4-designer.lintian b/debian/qt4-designer.lintian
deleted file mode 100644
index eacdf83..0000000
--- a/debian/qt4-designer.lintian
+++ /dev/null
@@ -1 +0,0 @@
-qt4-designer: package-name-doesnt-match-sonames libQtDesignerComponents4 libQtDesigner4
diff --git a/debian/qt4-dev-tools.install b/debian/qt4-dev-tools.install
index cc8d7c1..f44fb5a 100644
--- a/debian/qt4-dev-tools.install
+++ b/debian/qt4-dev-tools.install
@@ -2,4 +2,21 @@ usr/bin/assistant-qt4
 usr/bin/linguist-qt4
 usr/bin/qdbusviewer
 usr/bin/pixeltool
+usr/bin/assistant_adp
+usr/bin/qcollectiongenerator
+usr/bin/qhelpconverter
+usr/bin/qhelpgenerator
+usr/bin/xmlpatterns
 usr/share/qt4/phrasebooks/*
+usr/share/qt4/translations/assistant_adp_de.qm
+usr/share/qt4/translations/assistant_adp_ja.qm
+usr/share/qt4/translations/assistant_adp_pl.qm
+usr/share/qt4/translations/assistant_adp_zh_CN.qm
+usr/share/qt4/translations/assistant_adp_zh_TW.qm
+usr/share/qt4/translations/assistant_de.qm
+usr/share/qt4/translations/assistant_pl.qm
+usr/share/qt4/translations/linguist_de.qm
+usr/share/qt4/translations/linguist_ja.qm
+usr/share/qt4/translations/linguist_pl.qm
+usr/share/qt4/translations/linguist_zh_CN.qm
+usr/share/qt4/translations/linguist_zh_TW.qm
diff --git a/debian/qt4-doc.doc-base b/debian/qt4-doc.doc-base
index eaac3e8..edb398d 100644
--- a/debian/qt4-doc.doc-base
+++ b/debian/qt4-doc.doc-base
@@ -4,7 +4,7 @@ Author: Trolltech AS
 Abstract: Qt is a cross-platform C++ application framework.  Qt's
  primary feature is its rich set of widgets that provide standard GUI
  functionality.
-Section: Apps/Programming
+Section: Apps/programming
 
 Format: HTML
 Index: /usr/share/doc/qt4-doc/html/index.html
diff --git a/debian/qt4-qtconfig.install b/debian/qt4-qtconfig.install
index d846702..e52db85 100644
--- a/debian/qt4-qtconfig.install
+++ b/debian/qt4-qtconfig.install
@@ -1 +1,5 @@
 usr/bin/qtconfig-qt4
+usr/share/qt4/translations/qtconfig_pl.qm
+usr/share/qt4/translations/qtconfig_zh_CN.qm
+usr/share/qt4/translations/qtconfig_zh_TW.qm
+
diff --git a/debian/rules b/debian/rules
index 4223e12..032e824 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 export QTDIR := $(shell pwd)
 export PATH := $(QTDIR)/bin:$(PATH)
-# workaround to use lrelease. fixed in Qt >= 4.4.x
+# workaround to use lrelease.
 export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH)
 
 QTVERSION := $(shell ls changes-* | cut -f2 -d '-')
@@ -18,21 +18,28 @@ DEB_MAKE_BUILD_TARGET := sub-src sub-tools
 DEB_MAKE_INSTALL_TARGET := INSTALL_ROOT=$(DEB_DESTDIR) install
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 
-# Ensure the *.debug files aren't included in any package other than
-# libqt4-debug.
+# Ensure the *.debug files aren't included in any package other than libqt4-dbg
 DEB_DH_INSTALL_ARGS := --exclude=.debug
 
 DEB_MAKE_CLEAN_TARGET := confclean distclean
 DEB_DH_MAKESHLIBS_ARGS_ALL := -V
 
-DEB_DH_STRIP_ARGS_libqt4-debug := --exclude=.debug
+DEB_DH_STRIP_ARGS_libqt4-dbg := --exclude=.debug
 
 DEB_DH_SHLIBDEPS_ARGS_ALL := --exclude=.debug
 
-DEB_INSTALL_CHANGELOGS_ALL := changes-$(QTVERSION)
+# Qt4.4.0-beta1 does not contain changes file
+#DEB_INSTALL_CHANGELOGS_ALL := changes-$(QTVERSION)
 
 DEB_INSTALL_DOCS_ALL := GPL_EXCEPTION_ADDENDUM.TXT
 
+ibase_architectures := i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(ibase_architectures)))
+	EXTRA_CONFIGURE_OPTS += -plugin-sql-ibase
+else
+	EXTRA_CONFIGURE_OPTS += -no-sql-ibase
+endif
+
 ifeq ($(DEB_HOST_ARCH),arm)
 	EXTRA_CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT
 endif
@@ -43,7 +50,10 @@ else
         PLATFORM_ARG = glibc-g++
 endif
 
-common-configure-arch::
+common-configure-arch:: config.status
+
+config.status:
+	# Test broken hppa kernel with glibc >= 2.5
 ifeq ($(DEB_HOST_ARCH),hppa)
 	mkdir -p debian/hppa-tmp
 	echo "Testing whether getdents kernel bug is present on this buildd - see #433768"
@@ -73,6 +83,8 @@ endif
 	            -plugindir "/usr/lib/qt4/plugins" \
 	            -translationdir "/usr/share/qt4/translations" \
 	            -sysconfdir "/etc/xdg" \
+	            -demosdir "/usr/lib/qt4/demos" \
+	            -examplesdir "/usr/lib/qt4/examples" \
 	            -platform $(PLATFORM_ARG) \
 	            -fast \
 	            -no-rpath \
@@ -82,52 +94,88 @@ endif
 	            -system-libjpeg \
 	            -system-nas-sound \
 	            -qt-gif \
-	            -qt-sql-psql \
-	            -qt-sql-mysql \
-	            -qt-sql-sqlite \
+	            -plugin-sql-mysql \
+	            -plugin-sql-odbc \
+	            -plugin-sql-psql \
+	            -plugin-sql-sqlite \
+	            -plugin-sql-sqlite2 \
 	            -system-sqlite \
-	            -qt-sql-sqlite2 \
 	            -I/usr/include/freetype2 \
 	            -lfontconfig \
 	            -cups \
-	            -no-exceptions \
-	            -qdbus \
+	            -exceptions \
+	            -dbus \
 	            -pch \
-	            -nomake examples \
-	            -nomake demos \
+	            -no-phonon \
+	            -svg \
+	            -webkit \
+	            -xmlpatterns \
 	            $(EXTRA_CONFIGURE_OPTS)
 
 clean::
 # Extra stuff missed by confclean/distclean
-	rm -f Makefile \
-	      bin/qmake-qt4 \
-	      mkspecs/default \
-	      src/corelib/global/arch \
-	      examples/tools/plugandpaint/plugins/*.so \
-	      config.status \
-	      demos/shared/libdemo_shared.prl \
-	      mkspecs/qconfig.pri \
-	      src/corelib/global/qconfig.* \
-	      tools/qtestlib/updater/updater \
-	      tools/qtestlib/updater/updater.debug \
-	      examples/tools/plugandpaint/plugins/libpnp_basictools.a \
-	      examples/qdbus/complexpingpong/Makefile* \
-	      examples/qdbus/pingpong/Makefile*
-
-	rm -rf lib/ plugins/ mkspecs/glibc-g++
-
-	# clean up after hppa tests
+	
+	# Misc. files
+	rm -f \
+	  config.status \
+	  config.tests/.qmake.cache \
+	  examples/dbus/*/Makefile.* \
+	  mkspecs/qconfig.pri \
+	  src/corelib/global/qconfig.* \
+	;
+	
+	# Misc. directories
+	rm -rf \
+	  examples/tools/plugandpaint/plugins/ \
+	  examples/tools/styleplugin/styles/ \
+	  lib/ \
+	  mkspecs/glibc-g++/ \
+	  plugins/ \
+	;
+	
+	# hppa test directory
 	rm -rf debian/hppa-tmp
 
-	find bin/ config.tests/ qmake/ -exec file {} \; | grep ELF | sed 's/:.*//'  | xargs rm -f
-
-	find include/ -type l -print0 | xargs -0r rm -f
-	find . -mindepth 2 -name Makefile -print0 \
-	                -o -name Makefile.Debug -print0 \
-	                -o -name Makefile.Release -print0 \
-	                | xargs -0r rm -f
-
-	# generate on build
+	# Leftover dirs
+	find -depth -type d \( -false \
+	  -o -name debug-shared \
+	  -o -name debug-static \
+	  -o -name \*.gch \
+	  -o -name .moc\* \
+	  -o -name .obj\* \
+	  -o -name .pch \
+	  -o -name pkgconfig \
+	  -o -name .rcc \
+	  -o -name release-shared \
+	  -o -name release-static \
+	  -o -name .uic \
+	\) -print0 | xargs -0 rm -rf
+		
+	# Leftover files and all symlinks
+	find \( -false \
+	  -o -name \*.a \
+	  -o -name Makefile.Debug \
+	  -o -name Makefile.Release \
+	  -o -name \*.o \
+	  -o -name \*.prl \
+	  -o -name \*.so \
+	  -o -name \*.so.debug \
+	  -o -type l \
+	\) -delete
+	
+	# Delete all Makefiles, excluding some from src/3rdparty
+	find $(CURDIR) -name Makefile \
+	  ! -path $(CURDIR)/src/3rdparty/Makefile \
+	  ! -path $(CURDIR)/src/3rdparty/freetype/\* \
+	  ! -path $(CURDIR)/src/3rdparty/zlib/\* \
+	-delete
+	
+	# Any remaining executables
+	find $(CURDIR) -type f -exec file -i '{}' \; | grep \
+	  -e application/x-executable \
+	| cut -d ':' -f 1 | xargs rm -f
+
+	# Generated on build
 	rm -f debian/shlibs.local
 
 common-install-arch::
@@ -140,51 +188,55 @@ common-install-arch::
 	find $(DEB_DESTDIR)/usr/lib -type f -name '*.prl' \
 		-exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \;
 
-install/libqt4-core::
+install/libqtcore4::
 	$(CURDIR)/bin/lrelease-qt4 debian/translations/qt_ca.ts \
 		-qm $(DEB_DESTDIR)/usr/share/qt4/translations/qt_ca.qm
 
+install/qt4-demos::
+	mkdir -p debian/$(cdbs_curpkg)/usr/lib/qt4/demos/qtdemo
+	uudecode -o debian/$(cdbs_curpkg)/usr/lib/qt4/demos/qtdemo/qtdemo.qhc \
+		debian/collection/qtdemo.qhc.uu
+
 install/qt4-designer::
 	install -D -p -m0644 debian/desktop/designer-qt4.desktop \
-		debian/qt4-designer/usr/share/applications/designer-qt4.desktop
-	mkdir -p debian/qt4-designer/usr/share/pixmaps
-	uudecode -o debian/qt4-designer/usr/share/pixmaps/designer.png \
+		debian/$(cdbs_curpkg)/usr/share/applications/designer-qt4.desktop
+	mkdir -p debian/$(cdbs_curpkg)/usr/share/pixmaps
+	uudecode -o debian/$(cdbs_curpkg)/usr/share/pixmaps/designer.png \
 		debian/desktop/designer.png.uu
 
 install/qt4-dev-tools::
 	install -D -p -m0644 debian/desktop/assistant-qt4.desktop \
-		debian/qt4-dev-tools/usr/share/applications/assistant-qt4.desktop
+		debian/$(cdbs_curpkg)/usr/share/applications/assistant-qt4.desktop
 	install -D -p -m0644 debian/desktop/linguist-qt4.desktop \
-		debian/qt4-dev-tools/usr/share/applications/linguist-qt4.desktop
-	mkdir -p debian/qt4-dev-tools/usr/share/pixmaps
-	uudecode -o debian/qt4-dev-tools/usr/share/pixmaps/assistant.png \
+		debian/$(cdbs_curpkg)/usr/share/applications/linguist-qt4.desktop
+	mkdir -p debian/$(cdbs_curpkg)/usr/share/pixmaps
+	uudecode -o debian/$(cdbs_curpkg)/usr/share/pixmaps/assistant.png \
 		debian/desktop/assistant.png.uu
-	uudecode -o debian/qt4-dev-tools/usr/share/pixmaps/linguist.png \
+	uudecode -o debian/$(cdbs_curpkg)/usr/share/pixmaps/linguist.png \
 		debian/desktop/linguist.png.uu
 
 install/qt4-qtconfig::
 	install -D -p -m0644 debian/desktop/qt4config.desktop \
-		debian/qt4-qtconfig/usr/share/applications/qt4config.desktop
-	mkdir -p debian/qt4-qtconfig/usr/share/pixmaps
-	uudecode -o debian/qt4-qtconfig/usr/share/pixmaps/qtconfig.png \
+		debian/$(cdbs_curpkg)/usr/share/applications/qt4config.desktop
+	mkdir -p debian/$(cdbs_curpkg)/usr/share/pixmaps
+	uudecode -o debian/$(cdbs_curpkg)/usr/share/pixmaps/qtconfig.png \
 		debian/desktop/qtconfig.png.uu
 
-binary-install/qt4-doc::
-# Tar up the examples to include them in qt4-doc
-	[ ! -f examples/Makefile ] || $(MAKE) -k -C examples distclean
-	find examples/ -name '*.debug' -print0 | xargs -0r rm -f
-	tar -cv examples/ | \
-	gzip -9 > debian/qt4-doc/usr/share/doc/qt4-doc/qt4-examples.tar.gz
-
-	[ ! -f demos/Makefile ] || $(MAKE) -k -C demos distclean
-	find demos/ -name '*.debug' -print0 | xargs -0r rm -f
-	tar -cv demos/ | \
-	gzip -9 > debian/qt4-doc/usr/share/doc/qt4-doc/qt4-demos.tar.gz
-
-binary-install/libqt4-debug::
-# Run dh_install without the default DEB_DH_INSTALL_ARGS to install the
-# *.debug files.
-	dh_install -plibqt4-debug --sourcedir=$(DEB_DH_INSTALL_SOURCEDIR)
+binary-install/libqt4-dbg::
+# Run dh_install without the default DEB_DH_INSTALL_ARGS to install the *.debug files
+	dh_install -plibqt4-dbg --sourcedir=$(DEB_DH_INSTALL_SOURCEDIR)
+
+binary-install/libqt4-webkit-dbg::
+# Run dh_install without the default DEB_DH_INSTALL_ARGS to install the *.debug files
+	dh_install -plibqt4-webkit-dbg --sourcedir=$(DEB_DH_INSTALL_SOURCEDIR)
+
+binary-install/libqt4-xmlpatterns-dbg::
+# Run dh_install without the default DEB_DH_INSTALL_ARGS to install the *.debug files
+	dh_install -plibqt4-xmlpatterns-dbg --sourcedir=$(DEB_DH_INSTALL_SOURCEDIR)
+
+binary-post-install/libqt4-dev::
+	doxytag -t debian/$(cdbs_curpkg)/usr/share/qt4/doc/qt4.tag \
+		$(DEB_DESTDIR)/usr/share/qt4/doc/html
 
 # Automatically install lintian overrides, stolen from debian-qt-kde.mk
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: