rev 10097 - in trunk/packages/qt4-x11/debian: . collection patches
Fathi Boudra
fabo at alioth.debian.org
Thu Apr 10 07:04:24 UTC 2008
Author: fabo
Date: 2008-04-10 07:04:23 +0000 (Thu, 10 Apr 2008)
New Revision: 10097
Added:
trunk/packages/qt4-x11/debian/collection/
trunk/packages/qt4-x11/debian/collection/qtdemo.qhc.uu
trunk/packages/qt4-x11/debian/libqt4-assistant.install
trunk/packages/qt4-x11/debian/libqt4-assistant.lintian
trunk/packages/qt4-x11/debian/libqt4-dbg-dev.install
trunk/packages/qt4-x11/debian/libqt4-dbg.install
trunk/packages/qt4-x11/debian/libqt4-dbg.lintian
trunk/packages/qt4-x11/debian/libqt4-dbus.install
trunk/packages/qt4-x11/debian/libqt4-dbus.lintian
trunk/packages/qt4-x11/debian/libqt4-designer.install
trunk/packages/qt4-x11/debian/libqt4-designer.lintian
trunk/packages/qt4-x11/debian/libqt4-dev.dirs
trunk/packages/qt4-x11/debian/libqt4-help.install
trunk/packages/qt4-x11/debian/libqt4-help.lintian
trunk/packages/qt4-x11/debian/libqt4-network.install
trunk/packages/qt4-x11/debian/libqt4-network.lintian
trunk/packages/qt4-x11/debian/libqt4-opengl.install
trunk/packages/qt4-x11/debian/libqt4-opengl.lintian
trunk/packages/qt4-x11/debian/libqt4-script.install
trunk/packages/qt4-x11/debian/libqt4-script.lintian
trunk/packages/qt4-x11/debian/libqt4-sql-ibase.install
trunk/packages/qt4-x11/debian/libqt4-sql-mysql.install
trunk/packages/qt4-x11/debian/libqt4-sql-odbc.install
trunk/packages/qt4-x11/debian/libqt4-sql-psql.install
trunk/packages/qt4-x11/debian/libqt4-sql-sqlite.install
trunk/packages/qt4-x11/debian/libqt4-sql-sqlite2.install
trunk/packages/qt4-x11/debian/libqt4-svg.install
trunk/packages/qt4-x11/debian/libqt4-svg.lintian
trunk/packages/qt4-x11/debian/libqt4-test.install
trunk/packages/qt4-x11/debian/libqt4-test.lintian
trunk/packages/qt4-x11/debian/libqt4-webkit-dbg.install
trunk/packages/qt4-x11/debian/libqt4-webkit-dbg.lintian
trunk/packages/qt4-x11/debian/libqt4-webkit.install
trunk/packages/qt4-x11/debian/libqt4-webkit.lintian
trunk/packages/qt4-x11/debian/libqt4-xml.install
trunk/packages/qt4-x11/debian/libqt4-xml.lintian
trunk/packages/qt4-x11/debian/libqt4-xmlpatterns-dbg.install
trunk/packages/qt4-x11/debian/libqt4-xmlpatterns-dbg.lintian
trunk/packages/qt4-x11/debian/libqt4-xmlpatterns.install
trunk/packages/qt4-x11/debian/libqt4-xmlpatterns.lintian
trunk/packages/qt4-x11/debian/libqtcore4.install
trunk/packages/qt4-x11/debian/libqtcore4.lintian
trunk/packages/qt4-x11/debian/not-installed
trunk/packages/qt4-x11/debian/qt4-demos.install
trunk/packages/qt4-x11/debian/qt4-demos.lintian
Removed:
trunk/packages/qt4-x11/debian/libqt4-core.install
trunk/packages/qt4-x11/debian/libqt4-core.lintian
trunk/packages/qt4-x11/debian/libqt4-debug-dev.install
trunk/packages/qt4-x11/debian/libqt4-debug.install
trunk/packages/qt4-x11/debian/libqt4-debug.lintian
trunk/packages/qt4-x11/debian/patches/0172-prefer-xrandr-over-xinerama.diff
trunk/packages/qt4-x11/debian/patches/0175-fix-s390-qatomic.diff
trunk/packages/qt4-x11/debian/patches/0176-coverity-fixes.diff
trunk/packages/qt4-x11/debian/patches/0178-transparency-window-types.diff
trunk/packages/qt4-x11/debian/patches/0179-transient-hack.diff
trunk/packages/qt4-x11/debian/patches/0187-fix-font-fixed-pitch.diff
trunk/packages/qt4-x11/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff
trunk/packages/qt4-x11/debian/patches/0200-fix-qsslsocket-waitfor.diff
trunk/packages/qt4-x11/debian/patches/0205-fast-qpixmap-fill.diff
trunk/packages/qt4-x11/debian/patches/0211-q3action-crash.diff
trunk/packages/qt4-x11/debian/patches/06_qtdemo_destdir.diff
trunk/packages/qt4-x11/debian/patches/08_load_ssl.diff
trunk/packages/qt4-x11/debian/patches/21_assume_no_fpu_for_embedded_devices.diff
trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.diff
trunk/packages/qt4-x11/debian/patches/31_arm_eabi_fix.diff
trunk/packages/qt4-x11/debian/patches/91_qmake_lflags_no-undefined.diff
trunk/packages/qt4-x11/debian/qt4-designer.lintian
Modified:
trunk/packages/qt4-x11/debian/changelog
trunk/packages/qt4-x11/debian/control
trunk/packages/qt4-x11/debian/libqt4-dev.lintian
trunk/packages/qt4-x11/debian/libqt4-gui.install
trunk/packages/qt4-x11/debian/libqt4-gui.lintian
trunk/packages/qt4-x11/debian/libqt4-qt3support.install
trunk/packages/qt4-x11/debian/libqt4-qt3support.lintian
trunk/packages/qt4-x11/debian/libqt4-sql.install
trunk/packages/qt4-x11/debian/libqt4-sql.lintian
trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff
trunk/packages/qt4-x11/debian/patches/0180-window-role.diff
trunk/packages/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff
trunk/packages/qt4-x11/debian/patches/0192-itemdelegate-palette-state.diff
trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff
trunk/packages/qt4-x11/debian/patches/01_qmake_for_debian.diff
trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff
trunk/packages/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff
trunk/packages/qt4-x11/debian/patches/0210-fix-crash-q3stylesheet-font-size.diff
trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff
trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff
trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff
trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff
trunk/packages/qt4-x11/debian/patches/10_config_tests_fixes.diff
trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff
trunk/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.diff
trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff
trunk/packages/qt4-x11/debian/patches/60_m68k_inotify_fix.diff
trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff
trunk/packages/qt4-x11/debian/patches/series
trunk/packages/qt4-x11/debian/qt4-designer.install
trunk/packages/qt4-x11/debian/qt4-dev-tools.install
trunk/packages/qt4-x11/debian/qt4-doc.doc-base
trunk/packages/qt4-x11/debian/qt4-qtconfig.install
trunk/packages/qt4-x11/debian/rules
Log:
Merge Qt4 branch with trunk.
Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/changelog 2008-04-10 07:04:23 UTC (rev 10097)
@@ -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 at 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 at 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 at debian.org> Thu, 13 Mar 2008 22:34:45 +0100
+
qt4-x11 (4.3.4-2) unstable; urgency=low
* Add patches:
Added: trunk/packages/qt4-x11/debian/collection/qtdemo.qhc.uu
===================================================================
--- trunk/packages/qt4-x11/debian/collection/qtdemo.qhc.uu (rev 0)
+++ trunk/packages/qt4-x11/debian/collection/qtdemo.qhc.uu 2008-04-10 07:04:23 UTC (rev 10097)
@@ -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 at 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
Modified: trunk/packages/qt4-x11/debian/control
===================================================================
--- trunk/packages/qt4-x11/debian/control 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/control 2008-04-10 07:04:23 UTC (rev 10097)
@@ -3,151 +3,438 @@
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Brian Nelson <pyro at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Ana Beatriz Guerrero Lopez <ana at 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.
.
- 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 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.
+ .
+ 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.
.
- Qt Designer is a tool for designing and building graphical user
- interfaces (GUIs) from Qt components.
+ 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-debug
+Package: libqt4-help
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-gui (= ${binary:Version})
+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.
+ .
+ The QtTest module provides classes for unit testing Qt applications and
+ libraries.
+
+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})
+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.
Added: trunk/packages/qt4-x11/debian/libqt4-assistant.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-assistant.install (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-assistant.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,2 @@
+usr/lib/libQtAssistantClient.so.*
+
Added: trunk/packages/qt4-x11/debian/libqt4-assistant.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-assistant.lintian (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-assistant.lintian 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,2 @@
+libqt4-assistant: package-name-doesnt-match-sonames libQtAssistantClient4
+
Deleted: trunk/packages/qt4-x11/debian/libqt4-core.install
Deleted: trunk/packages/qt4-x11/debian/libqt4-core.lintian
Added: trunk/packages/qt4-x11/debian/libqt4-dbg-dev.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-dbg-dev.install (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-dbg-dev.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,4 @@
+usr/lib/*_debug.so
+usr/lib/*_debug.prl
+usr/lib/*_debug.pc usr/lib/pkgconfig/
+usr/lib/*_debug.a
Added: trunk/packages/qt4-x11/debian/libqt4-dbg.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-dbg.install (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-dbg.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -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
+
Added: trunk/packages/qt4-x11/debian/libqt4-dbg.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-dbg.lintian (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-dbg.lintian 2008-04-10 07:04:23 UTC (rev 10097)
@@ -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
Added: trunk/packages/qt4-x11/debian/libqt4-dbus.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-dbus.install (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-dbus.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,3 @@
+usr/lib/libQtDBus.so.*
+usr/bin/qdbus
+
Added: trunk/packages/qt4-x11/debian/libqt4-dbus.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-dbus.lintian (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-dbus.lintian 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,2 @@
+libqt4-dbus: package-name-doesnt-match-sonames libQtDBus4
+
Deleted: trunk/packages/qt4-x11/debian/libqt4-debug-dev.install
Deleted: trunk/packages/qt4-x11/debian/libqt4-debug.install
Deleted: trunk/packages/qt4-x11/debian/libqt4-debug.lintian
Added: trunk/packages/qt4-x11/debian/libqt4-designer.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-designer.install (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-designer.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,3 @@
+usr/lib/libQtDesigner.so.*
+usr/lib/libQtDesignerComponents.so.*
+
Added: trunk/packages/qt4-x11/debian/libqt4-designer.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-designer.lintian (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-designer.lintian 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,2 @@
+libqt4-designer: package-name-doesnt-match-sonames libQtDesigner4 libQtDesignerComponents4
+
Added: trunk/packages/qt4-x11/debian/libqt4-dev.dirs
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-dev.dirs (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-dev.dirs 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1 @@
+usr/share/qt4/doc/html
Modified: trunk/packages/qt4-x11/debian/libqt4-dev.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-dev.lintian 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/libqt4-dev.lintian 2008-04-10 07:04:23 UTC (rev 10097)
@@ -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/
Modified: trunk/packages/qt4-x11/debian/libqt4-gui.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-gui.install 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/libqt4-gui.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -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
+
Modified: trunk/packages/qt4-x11/debian/libqt4-gui.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-gui.lintian 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/libqt4-gui.lintian 2008-04-10 07:04:23 UTC (rev 10097)
@@ -1 +1,2 @@
-libqt4-gui: package-name-doesnt-match-sonames libQtAssistantClient4 libQtDesigner4 libQtDesignerComponents4 libQtGui4 libQtOpenGL4 libQtSvg4
+libqt4-gui: package-name-doesnt-match-sonames libQtGui4
+
Added: trunk/packages/qt4-x11/debian/libqt4-help.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-help.install (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-help.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,4 @@
+usr/lib/libQtHelp.so.*
+usr/share/qt4/translations/qt_help_de.qm
+usr/share/qt4/translations/qt_help_pl.qm
+
Added: trunk/packages/qt4-x11/debian/libqt4-help.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-help.lintian (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-help.lintian 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,2 @@
+libqt4-help: package-name-doesnt-match-sonames libQtHelp4
+
Added: trunk/packages/qt4-x11/debian/libqt4-network.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-network.install (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-network.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,2 @@
+usr/lib/libQtNetwork.so.*
+
Added: trunk/packages/qt4-x11/debian/libqt4-network.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-network.lintian (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-network.lintian 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,2 @@
+libqt4-network: package-name-doesnt-match-sonames libQtNetwork4
+
Added: trunk/packages/qt4-x11/debian/libqt4-opengl.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-opengl.install (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-opengl.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1 @@
+usr/lib/libQtOpenGL.so.*
Added: trunk/packages/qt4-x11/debian/libqt4-opengl.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-opengl.lintian (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-opengl.lintian 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,2 @@
+libqt4-opengl: package-name-doesnt-match-sonames libQtOpenGL4
+
Modified: trunk/packages/qt4-x11/debian/libqt4-qt3support.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-qt3support.install 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/libqt4-qt3support.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -1,2 +1,4 @@
usr/lib/libQt3Support.so.*
usr/lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so
+usr/lib/qt4/plugins/designer/libqt3supportwidgets.so
+
Modified: trunk/packages/qt4-x11/debian/libqt4-qt3support.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-qt3support.lintian 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/libqt4-qt3support.lintian 2008-04-10 07:04:23 UTC (rev 10097)
@@ -1 +1,2 @@
libqt4-qt3support: package-name-doesnt-match-sonames libQt3Support4
+
Added: trunk/packages/qt4-x11/debian/libqt4-script.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-script.install (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-script.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,2 @@
+usr/lib/libQtScript.so.*
+usr/lib/qt4/plugins/script/libqtscriptdbus.so
Added: trunk/packages/qt4-x11/debian/libqt4-script.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-script.lintian (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-script.lintian 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,2 @@
+libqt4-script: package-name-doesnt-match-sonames libQtScript4
+
Added: trunk/packages/qt4-x11/debian/libqt4-sql-ibase.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-sql-ibase.install (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-sql-ibase.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,2 @@
+usr/lib/qt4/plugins/sqldrivers/libqsqlibase.so
+
Added: trunk/packages/qt4-x11/debian/libqt4-sql-mysql.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-sql-mysql.install (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-sql-mysql.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,2 @@
+usr/lib/qt4/plugins/sqldrivers/libqsqlmysql.so
+
Added: trunk/packages/qt4-x11/debian/libqt4-sql-odbc.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-sql-odbc.install (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-sql-odbc.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,2 @@
+usr/lib/qt4/plugins/sqldrivers/libqsqlodbc.so
+
Added: trunk/packages/qt4-x11/debian/libqt4-sql-psql.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-sql-psql.install (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-sql-psql.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,2 @@
+usr/lib/qt4/plugins/sqldrivers/libqsqlpsql.so
+
Added: trunk/packages/qt4-x11/debian/libqt4-sql-sqlite.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-sql-sqlite.install (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-sql-sqlite.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,2 @@
+usr/lib/qt4/plugins/sqldrivers/libqsqlite.so
+
Added: trunk/packages/qt4-x11/debian/libqt4-sql-sqlite2.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-sql-sqlite2.install (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-sql-sqlite2.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,2 @@
+usr/lib/qt4/plugins/sqldrivers/libqsqlite2.so
+
Modified: trunk/packages/qt4-x11/debian/libqt4-sql.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-sql.install 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/libqt4-sql.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -1 +1,2 @@
usr/lib/libQtSql.so.*
+
Modified: trunk/packages/qt4-x11/debian/libqt4-sql.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-sql.lintian 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/libqt4-sql.lintian 2008-04-10 07:04:23 UTC (rev 10097)
@@ -1 +1,2 @@
libqt4-sql: package-name-doesnt-match-sonames libQtSql4
+
Added: trunk/packages/qt4-x11/debian/libqt4-svg.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-svg.install (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-svg.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,4 @@
+usr/lib/libQtSvg.so.*
+usr/lib/qt4/plugins/iconengines/libqsvgicon.so
+usr/lib/qt4/plugins/imageformats/libqsvg.so
+
Added: trunk/packages/qt4-x11/debian/libqt4-svg.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-svg.lintian (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-svg.lintian 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,2 @@
+libqt4-svg: package-name-doesnt-match-sonames libQtSvg4
+
Added: trunk/packages/qt4-x11/debian/libqt4-test.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-test.install (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-test.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,2 @@
+usr/lib/libQtTest.so.*
+
Added: trunk/packages/qt4-x11/debian/libqt4-test.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-test.lintian (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-test.lintian 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,2 @@
+libqt4-test: package-name-doesnt-match-sonames libQtTest4
+
Added: trunk/packages/qt4-x11/debian/libqt4-webkit-dbg.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-webkit-dbg.install (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-webkit-dbg.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,3 @@
+usr/lib/libQtWebKit.so.*.debug
+usr/lib/qt4/plugins/designer/libqwebview.so.debug
+
Added: trunk/packages/qt4-x11/debian/libqt4-webkit-dbg.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-webkit-dbg.lintian (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-webkit-dbg.lintian 2008-04-10 07:04:23 UTC (rev 10097)
@@ -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
+
Added: trunk/packages/qt4-x11/debian/libqt4-webkit.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-webkit.install (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-webkit.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,3 @@
+usr/lib/libQtWebKit.so.*
+usr/lib/qt4/plugins/designer/libqwebview.so
+
Added: trunk/packages/qt4-x11/debian/libqt4-webkit.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-webkit.lintian (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-webkit.lintian 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,2 @@
+libqt4-webkit: package-name-doesnt-match-sonames libQtWebKit4
+
Added: trunk/packages/qt4-x11/debian/libqt4-xml.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-xml.install (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-xml.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1 @@
+usr/lib/libQtXml.so.*
Added: trunk/packages/qt4-x11/debian/libqt4-xml.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-xml.lintian (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-xml.lintian 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,2 @@
+libqt4-xml: package-name-doesnt-match-sonames libQtXml4
+
Added: trunk/packages/qt4-x11/debian/libqt4-xmlpatterns-dbg.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-xmlpatterns-dbg.install (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-xmlpatterns-dbg.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,2 @@
+usr/lib/libQtXmlPatterns.so.*.debug
+
Added: trunk/packages/qt4-x11/debian/libqt4-xmlpatterns-dbg.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-xmlpatterns-dbg.lintian (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-xmlpatterns-dbg.lintian 2008-04-10 07:04:23 UTC (rev 10097)
@@ -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
+
Added: trunk/packages/qt4-x11/debian/libqt4-xmlpatterns.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-xmlpatterns.install (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-xmlpatterns.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,2 @@
+usr/lib/libQtXmlPatterns.so.*
+
Added: trunk/packages/qt4-x11/debian/libqt4-xmlpatterns.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-xmlpatterns.lintian (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-xmlpatterns.lintian 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1,2 @@
+libqt4-xmlpatterns: package-name-doesnt-match-sonames libQtXmlPatterns4
+
Added: trunk/packages/qt4-x11/debian/libqtcore4.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqtcore4.install (rev 0)
+++ trunk/packages/qt4-x11/debian/libqtcore4.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -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
+
+
Added: trunk/packages/qt4-x11/debian/libqtcore4.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqtcore4.lintian (rev 0)
+++ trunk/packages/qt4-x11/debian/libqtcore4.lintian 2008-04-10 07:04:23 UTC (rev 10097)
@@ -0,0 +1 @@
+libqtcore4: package-name-doesnt-match-sonames libQtCLucene4 libQtCore4
Added: trunk/packages/qt4-x11/debian/not-installed
===================================================================
--- trunk/packages/qt4-x11/debian/not-installed (rev 0)
+++ trunk/packages/qt4-x11/debian/not-installed 2008-04-10 07:04:23 UTC (rev 10097)
@@ -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
+
Modified: trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff 2008-04-10 07:04:23 UTC (rev 10097)
@@ -9,7 +9,7 @@
--- 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)
Deleted: trunk/packages/qt4-x11/debian/patches/0172-prefer-xrandr-over-xinerama.diff
Deleted: trunk/packages/qt4-x11/debian/patches/0175-fix-s390-qatomic.diff
Deleted: trunk/packages/qt4-x11/debian/patches/0176-coverity-fixes.diff
Deleted: trunk/packages/qt4-x11/debian/patches/0178-transparency-window-types.diff
Deleted: trunk/packages/qt4-x11/debian/patches/0179-transient-hack.diff
Modified: trunk/packages/qt4-x11/debian/patches/0180-window-role.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0180-window-role.diff 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/patches/0180-window-role.diff 2008-04-10 07:04:23 UTC (rev 10097)
@@ -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 at 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 @@
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)
Deleted: trunk/packages/qt4-x11/debian/patches/0187-fix-font-fixed-pitch.diff
Modified: trunk/packages/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff 2008-04-10 07:04:23 UTC (rev 10097)
@@ -11,7 +11,7 @@
--- 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 {
Modified: trunk/packages/qt4-x11/debian/patches/0192-itemdelegate-palette-state.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0192-itemdelegate-palette-state.diff 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/patches/0192-itemdelegate-palette-state.diff 2008-04-10 07:04:23 UTC (rev 10097)
@@ -9,7 +9,7 @@
--- 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
Deleted: trunk/packages/qt4-x11/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff
Modified: trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff 2008-04-10 07:04:23 UTC (rev 10097)
@@ -9,11 +9,10 @@
--- 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 @@
} 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
++ // when we create a toplevel widget, the frame strut should be dirty
++ data.fstrut_dirty = 1;
+
-+ // 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());
-+
-+ // 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()) {
Modified: trunk/packages/qt4-x11/debian/patches/01_qmake_for_debian.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/01_qmake_for_debian.diff 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/patches/01_qmake_for_debian.diff 2008-04-10 07:04:23 UTC (rev 10097)
@@ -14,4 +14,4 @@
+QMAKE_UIC = $$[QT_INSTALL_BINS]/uic-qt4
QMAKE_AR = ar cqs
- QMAKE_RANLIB =
+ QMAKE_OBJCOPY = objcopy
Deleted: trunk/packages/qt4-x11/debian/patches/0200-fix-qsslsocket-waitfor.diff
Modified: trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff 2008-04-10 07:04:23 UTC (rev 10097)
@@ -1,13 +1,13 @@
qt-bugs@ issue : N190509
Trolltech task ID : 190904
-applied: yes
+applied: no
author: Rafael Fernández López <ereslibre at 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);
Deleted: trunk/packages/qt4-x11/debian/patches/0205-fast-qpixmap-fill.diff
Modified: trunk/packages/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff 2008-04-10 07:04:23 UTC (rev 10097)
@@ -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 at kde.org>
This patch changes QObjectPrivateVersion, thus preventing mixing
@@ -15,7 +15,7 @@
--- 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() {}
Modified: trunk/packages/qt4-x11/debian/patches/0210-fix-crash-q3stylesheet-font-size.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0210-fix-crash-q3stylesheet-font-size.diff 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/patches/0210-fix-crash-q3stylesheet-font-size.diff 2008-04-10 07:04:23 UTC (rev 10097)
@@ -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 at kde.org>
This patch fixes crashs in q3stylesheet (it was possible to
@@ -10,7 +10,7 @@
--- 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 @@
+ font.setPointSize(qMax(1,s));
}
- #endif // QT_NO_RICHTEXT
+ QT_END_NAMESPACE
Deleted: trunk/packages/qt4-x11/debian/patches/0211-q3action-crash.diff
Modified: trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff 2008-04-10 07:04:23 UTC (rev 10097)
@@ -1,18 +1,22 @@
-author: Brian Nelson <pyro at 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
Modified: trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff 2008-04-10 07:04:23 UTC (rev 10097)
@@ -2,9 +2,9 @@
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;
Modified: trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff 2008-04-10 07:04:23 UTC (rev 10097)
@@ -1,8 +1,8 @@
-author: Fathi Boudra <fboudra at free.fr>
+author: Fathi Boudra <fabo at 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:
Modified: trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff 2008-04-10 07:04:23 UTC (rev 10097)
@@ -1,4 +1,4 @@
-author: Fathi Boudra <fboudra at free.fr>
+author: Fathi Boudra <fabo at debian.org>
--- a/config.tests/unix/compile.test
+++ b/config.tests/unix/compile.test
@@ -32,7 +32,7 @@
+"$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 @@
if [ "$VERBOSE" = "yes" ]; then
--- a/configure
+++ b/configure
-@@ -3523,7 +3523,7 @@
+@@ -3799,7 +3799,7 @@
}
# build qmake
@@ -66,7 +66,7 @@
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 @@
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 @@
fi
# .projects -> projects to process
-@@ -5886,7 +5886,7 @@
+@@ -6477,7 +6477,7 @@
echo " for $a\c"
fi
@@ -102,7 +102,7 @@
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 @@
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
-@@ -90,17 +90,17 @@
+@@ -98,17 +98,17 @@
CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS)
@@ -135,6 +135,28 @@
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 @@
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 @@
-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 @@
+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
Deleted: trunk/packages/qt4-x11/debian/patches/06_qtdemo_destdir.diff
Deleted: trunk/packages/qt4-x11/debian/patches/08_load_ssl.diff
Modified: trunk/packages/qt4-x11/debian/patches/10_config_tests_fixes.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/10_config_tests_fixes.diff 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/patches/10_config_tests_fixes.diff 2008-04-10 07:04:23 UTC (rev 10097)
@@ -1,7 +1,3 @@
-author: Fathi Boudra <fabo at 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 @@
@@ -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
Deleted: trunk/packages/qt4-x11/debian/patches/21_assume_no_fpu_for_embedded_devices.diff
Deleted: trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.diff
Deleted: trunk/packages/qt4-x11/debian/patches/31_arm_eabi_fix.diff
Modified: trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff 2008-04-10 07:04:23 UTC (rev 10097)
@@ -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>
Modified: trunk/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.diff 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.diff 2008-04-10 07:04:23 UTC (rev 10097)
@@ -2,7 +2,7 @@
--- 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
Modified: trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff 2008-04-10 07:04:23 UTC (rev 10097)
@@ -4,7 +4,7 @@
--- 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 @@
#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 @@
#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 @@
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 @@
# include <fenv.h>
#endif
-@@ -5934,7 +5934,7 @@
+@@ -6256,7 +6256,7 @@
_control87(MCW_EM, MCW_EM);
#endif
@@ -62,7 +64,7 @@
fenv_t envp;
feholdexcept(&envp);
#endif
-@@ -5950,7 +5950,7 @@
+@@ -6272,7 +6272,7 @@
#endif //_M_X64
#endif //Q_OS_WIN
Modified: trunk/packages/qt4-x11/debian/patches/60_m68k_inotify_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/60_m68k_inotify_fix.diff 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/patches/60_m68k_inotify_fix.diff 2008-04-10 07:04:23 UTC (rev 10097)
@@ -5,14 +5,14 @@
--- 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 at trolltech.com"
#endif
Modified: trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff 2008-04-10 07:04:23 UTC (rev 10097)
@@ -2,10 +2,10 @@
--- 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
+#endif
Deleted: trunk/packages/qt4-x11/debian/patches/91_qmake_lflags_no-undefined.diff
Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/patches/series 2008-04-10 07:04:23 UTC (rev 10097)
@@ -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
Added: trunk/packages/qt4-x11/debian/qt4-demos.install
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-demos.install (rev 0)
+++ trunk/packages/qt4-x11/debian/qt4-demos.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -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
+
Added: trunk/packages/qt4-x11/debian/qt4-demos.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-demos.lintian (rev 0)
+++ trunk/packages/qt4-x11/debian/qt4-demos.lintian 2008-04-10 07:04:23 UTC (rev 10097)
@@ -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
+
Modified: trunk/packages/qt4-x11/debian/qt4-designer.install
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-designer.install 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/qt4-designer.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -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
Deleted: trunk/packages/qt4-x11/debian/qt4-designer.lintian
Modified: trunk/packages/qt4-x11/debian/qt4-dev-tools.install
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-dev-tools.install 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/qt4-dev-tools.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -2,4 +2,21 @@
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
Modified: trunk/packages/qt4-x11/debian/qt4-doc.doc-base
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-doc.doc-base 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/qt4-doc.doc-base 2008-04-10 07:04:23 UTC (rev 10097)
@@ -4,7 +4,7 @@
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
Modified: trunk/packages/qt4-x11/debian/qt4-qtconfig.install
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-qtconfig.install 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/qt4-qtconfig.install 2008-04-10 07:04:23 UTC (rev 10097)
@@ -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
+
Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules 2008-04-10 06:56:48 UTC (rev 10096)
+++ trunk/packages/qt4-x11/debian/rules 2008-04-10 07:04:23 UTC (rev 10097)
@@ -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_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 @@
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 @@
-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 @@
-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
+ # 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
- 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
+ # Generated on build
rm -f debian/shlibs.local
common-install-arch::
@@ -140,52 +188,56 @@
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
+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)
- [ ! -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-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-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-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/%:
if test -e debian/$(cdbs_curpkg).lintian; then \
More information about the pkg-kde-commits
mailing list