rev 13852 - in trunk/packages/qt4-x11/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Fri Feb 20 20:24:26 UTC 2009
Author: fabo
Date: 2009-02-20 20:24:25 +0000 (Fri, 20 Feb 2009)
New Revision: 13852
Added:
trunk/packages/qt4-x11/debian/TODO.Debian
trunk/packages/qt4-x11/debian/libqt4-scripttools.install
trunk/packages/qt4-x11/debian/libqt4-scripttools.lintian
trunk/packages/qt4-x11/debian/patches/0273-odbc-64bit-compile.diff
trunk/packages/qt4-x11/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
trunk/packages/qt4-x11/debian/patches/19_install_qdoc3.diff
trunk/packages/qt4-x11/debian/patches/20_fix_ftbfs_callgrindChildExitCode.diff
trunk/packages/qt4-x11/debian/patches/21_fix_ppc_build.diff
trunk/packages/qt4-x11/debian/patches/22_fix_qiconvcodec.diff
Removed:
trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff
trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff
trunk/packages/qt4-x11/debian/patches/0224-fast-qpixmap-fill.diff
trunk/packages/qt4-x11/debian/patches/0226-qtreeview-column_resize_when_needed.diff
trunk/packages/qt4-x11/debian/patches/0238-fix-qt-qttabbar-size.diff
trunk/packages/qt4-x11/debian/patches/0248-fix-qwidget-scroll-slowness.diff
trunk/packages/qt4-x11/debian/patches/0249-webkit-stale-frame-pointer.diff
trunk/packages/qt4-x11/debian/patches/0254-fix-qgraphicsproxywidget-deletion-crash.diff
trunk/packages/qt4-x11/debian/patches/0256-fix-recursive-backingstore-sync-crash.diff
trunk/packages/qt4-x11/debian/patches/0257-qurl-validate-speedup.diff
trunk/packages/qt4-x11/debian/patches/0260-fix-qgraphicswidget-deletionclearFocus.diff
trunk/packages/qt4-x11/debian/patches/0261-sync-before-reset-errorhandler.patch
trunk/packages/qt4-x11/debian/patches/0262-fix-treeview-animation-crash.diff
trunk/packages/qt4-x11/debian/patches/12_fix_qmake_pkgconfig.diff
trunk/packages/qt4-x11/debian/patches/20_mips_atomic_ops.diff
Modified:
trunk/packages/qt4-x11/debian/changelog
trunk/packages/qt4-x11/debian/control
trunk/packages/qt4-x11/debian/libqt4-assistant.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-designer.install
trunk/packages/qt4-x11/debian/libqt4-dev.install
trunk/packages/qt4-x11/debian/libqt4-dev.links
trunk/packages/qt4-x11/debian/libqt4-help.install
trunk/packages/qt4-x11/debian/libqt4-network.install
trunk/packages/qt4-x11/debian/libqt4-opengl-dev.install
trunk/packages/qt4-x11/debian/libqt4-opengl.install
trunk/packages/qt4-x11/debian/libqt4-qt3support.install
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-sql.install
trunk/packages/qt4-x11/debian/libqt4-svg.install
trunk/packages/qt4-x11/debian/libqt4-test.install
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-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/libqtcore4.install
trunk/packages/qt4-x11/debian/libqtgui4.install
trunk/packages/qt4-x11/debian/not-installed
trunk/packages/qt4-x11/debian/patches/0180-window-role.diff
trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff
trunk/packages/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff
trunk/packages/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff
trunk/packages/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch
trunk/packages/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff
trunk/packages/qt4-x11/debian/patches/0245-fix-randr-changes-detecting.diff
trunk/packages/qt4-x11/debian/patches/0255-qtreeview-selection-columns-hidden.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/07_trust_dpkg-arch_over_uname-m.diff
trunk/packages/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff
trunk/packages/qt4-x11/debian/patches/14_add_libraries_to_gui_build_where_actually_needed.diff
trunk/packages/qt4-x11/debian/patches/15_fix_qmake_makefile_generation.diff
trunk/packages/qt4-x11/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
trunk/packages/qt4-x11/debian/patches/17_add_postgresql_8.3_support.diff
trunk/packages/qt4-x11/debian/patches/30_webkit_unaligned_access.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/71_hppa_unaligned_access_fix_458133.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-demos.install
trunk/packages/qt4-x11/debian/qt4-demos.lintian
trunk/packages/qt4-x11/debian/qt4-dev-tools.install
trunk/packages/qt4-x11/debian/qt4-doc-html.doc-base
trunk/packages/qt4-x11/debian/qt4-doc-html.install
trunk/packages/qt4-x11/debian/qt4-doc.install
trunk/packages/qt4-x11/debian/qt4-qmake.install
trunk/packages/qt4-x11/debian/qt4-qmake.links
trunk/packages/qt4-x11/debian/qt4-qtconfig.install
trunk/packages/qt4-x11/debian/rules
Log:
Merge Qt4 4.5 branch to trunk.
Added: trunk/packages/qt4-x11/debian/TODO.Debian
===================================================================
--- trunk/packages/qt4-x11/debian/TODO.Debian (rev 0)
+++ trunk/packages/qt4-x11/debian/TODO.Debian 2009-02-20 20:24:25 UTC (rev 13852)
@@ -0,0 +1,15 @@
+ +++ TODO:
+
+ * Review bug reports.
+ * Update debian/copyright.
+ * Use pkgkde-symbolshelper. Add pkg-kde-tools (>= 0.3.1) b-d.
+ * Merge Ubuntu changes ? (IMHO, no)
+ - Fix binary-post-install/libqt4-dev:: to install qt.tags to libqt4-dev
+ - Add missing depends to libqt4-dev based on Qt build dependencies
+ * what to do with phonon and webkit ?
+ - webkit links against phonon.
+ * TT changed the build key generation and added backwards compatibility.
+ We need to re-add 07_trust_dpkg-arch_over_uname-m.diff patch for our
+ backward compatibility *and* figure out what to do with the new build key
+ generation.
+
Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/changelog 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,3 +1,51 @@
+qt4-x11 (4.5.0~rc1-1) experimental; urgency=low
+
+ * New upstream release:
+ - QGtkStyle is part of Qt 4.5 release. (Closes: #507143)
+ - Fix useless warning flood when sockets > 1024. (Closes: #511700)
+ * Add libgtk2.0-dev build dependency to enable GTK theme support.
+ * Add package libqt4-scripttools: The QtScriptTools module provides
+ additional components for applications that use Qt Script.
+ * Clean up the prl postprocessing.
+ * Build documentations if current version is a snapshot.
+ * Update *.install and *.lintian files.
+ * Move mkspecs in qt4-qmake package to use qt4-qmake standalone.
+ * Add qdoc3 to qt4-dev-tools package.
+ * Add Debian patches:
+ - 18_enable_qt3support_qtwebkit_debug_info.diff
+ On Qt >= 4.5, debug info are disabled for Qt3Support and QtWebkit.
+ This patch enable them.
+ - 19_install_qdoc3.diff
+ Install qdoc3 binary. It is used by Qt Creator.
+ - 20_fix_ftbfs_callgrindChildExitCode.diff
+ Fix ftfbs on qtestcase.cpp. Stolen from snapshot 20090206.
+ * Remove Debian patches:
+ - 07_trust_dpkg-arch_over_uname-m.diff - Fixed upstream.
+ - 12_fix_qmake_pkgconfig.diff
+ - 20_mips_atomic_ops.diff - Fixed upstream.
+ In memory of Thiemo Seufer.
+ Thanks for his invaluable help on MIPS. He will be missed.
+ * Update Debian patches:
+ - 02, 03, 04, 05, 09, 14, 15, 16, 17, 30, 40, 41, 50, 71, 80.
+ * Remove qt-copy patches:
+ - 0167-fix-group-reading.diff - Merged upstream.
+ - 0203-qtexthtmlparser-link-color.diff - Merged upstream.
+ - 0224-fast-qpixmap-fill.diff - Fixed upstream.
+ - 0226-qtreeview-column_resize_when_needed.diff - Fixed upstream.
+ - 0238-fix-qt-qttabbar-size.diff - Merged upstream.
+ - 0248-fix-qwidget-scroll-slowness.diff - Fixed upstream.
+ - 0249-webkit-stale-frame-pointer.diff - Merged upstream.
+ - 0254-fix-qgraphicsproxywidget-deletion-crash.diff - Merged upstream.
+ - 0256-fix-recursive-backingstore-sync-crash.diff - Fixed upstream.
+ - 0257-qurl-validate-speedup.diff - Fixed upstream.
+ - 0260-fix-qgraphicswidget-deletionclearFocus.diff - Merged upstream.
+ - 0261-sync-before-reset-errorhandler.patch - Merged upstream.
+ - 0262-fix-treeview-animation-crash.diff - Merged upstream.
+ * Refresh qt-copy patches:
+ 0180, 0195, 0209, 0216, 0225, 0234, 0245, 0255.
+
+ -- Fathi Boudra <fabo at debian.org> Fri, 06 Feb 2009 10:03:16 +0100
+
qt4-x11 (4.4.3-2) unstable; urgency=low
+++ Changes by Armin Berres:
@@ -170,7 +218,7 @@
+++ Changes by Sune Vuorela:
* Fix generic atomic header. (Closes: #475767)
- This is enough to fix building of kdelibs, but there should be a proper
+ This is enough to fix building of kdelibs, but there should be a proper
hppa fix modelled over the other "real" archs.
+++ Changes by Fathi Boudra:
@@ -185,7 +233,7 @@
* Steal 73_from4.4.1_no_AAAA_when_ipv6_disabled.diff patch from 4.4.1
snapshot, which disables IPv6 DNS queries (AAAA) when IPv6 is disabled on
- the system.
+ the system.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 08 Jun 2008 13:17:02 +0300
@@ -355,7 +403,7 @@
* 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.
+ 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
@@ -868,7 +916,7 @@
qt4-x11 (4.2.1-1) unstable; urgency=high
- * New upstream release
+ * New upstream release
- Fixes integer overflow in pixmap handling [CVE-2006-4811]
(Closes: #394192)
@@ -905,7 +953,7 @@
- No longer includes "CONFIG = ... debug" in the mkspecs/qconfig.pri
(Closes: #357136)
- Fixes QFontDialog assert() failures (Closes: #380418)
-
+
* debian/control: made libqt4-gui conflict/replace libqt4-designer, to
ensure that old package is removed (Closes: #380253)
@@ -1111,7 +1159,7 @@
* New upstream release
- Fixes missing QBitArray operators (Closes: #341658)
- Fixes qmake problem with including bad build path (Closes: #327359)
-
+
* Added the new QTestLib unit testing framework to the libqt4-core
package
@@ -1200,11 +1248,11 @@
qmake.conf so that qmake generates Makefiles that use the -qt4 tools.
This way, it can cope with systems that have alternatives set to use
the -qt3 versions.
-
+
* Increased the conflicting Qt3 package versions to <= 3.3.4-7, since
the Qt3 packages still don't use the alternatives system as needed to
coexist with Qt4.
-
+
* debian/libqt4-core.install: added /usr/lib/qt4/plugins/codecs
* debian/patches/11_launch_assistant-qt4: new patch that modifies the
@@ -1233,7 +1281,7 @@
* New upstream release
* Install changes-4.0.1 as upstream changelog
-
+
* debian/manpages/assistant-qt4.1: new manpage written from scratch
based on the output of "assistant -help"
@@ -1277,7 +1325,7 @@
plugin (Closes: #321582)
* debian/libqt4-debug.install: added the libqjpeg_debug.so plugin
-
+
* debian/rules: don't hardcode the /usr/include/postgresql/8.0 path,
instead of the output of `pg_config --includedir`, stolen from Qt3
packages
Modified: trunk/packages/qt4-x11/debian/control
===================================================================
--- trunk/packages/qt4-x11/debian/control 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/control 2009-02-20 20:24:25 UTC (rev 13852)
@@ -7,12 +7,12 @@
firebird2.0-dev [i386 kfreebsd-i386 kfreebsd-amd64 amd64 sparc powerpc],
libaudio-dev, libcups2-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
+ libgtk2.0-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.8.0
Homepage: http://www.trolltech.com
Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/trunk/packages/qt4-x11
@@ -32,7 +32,7 @@
Package: libqt4-core
Architecture: any
Section: libs
-Depends: libqtcore4 (= ${binary:Version}), libqt4-network (= ${binary:Version}),
+Depends: ${misc:Depends}, libqtcore4 (= ${binary:Version}), libqt4-network (= ${binary:Version}),
libqt4-script (= ${binary:Version}), libqt4-xml (= ${binary:Version}),
libqt4-dbus (= ${binary:Version}), libqt4-test (= ${binary:Version})
Description: transitional package for Qt 4 core non-GUI runtime libraries
@@ -60,7 +60,7 @@
Package: libqt4-gui
Architecture: any
Section: libs
-Depends: libqtgui4 (= ${binary:Version}), libqt4-svg (= ${binary:Version}), libqt4-opengl (= ${binary:Version}),
+Depends: ${misc:Depends}, libqtgui4 (= ${binary:Version}), libqt4-svg (= ${binary:Version}), libqt4-opengl (= ${binary:Version}),
libqt4-designer (= ${binary:Version}), libqt4-assistant (= ${binary:Version})
Description: transitional package for Qt 4 GUI runtime libraries
Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -109,6 +109,20 @@
.
The QtScript module provides classes for making Qt applications scriptable.
+Package: libqt4-scripttools
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Qt 4 script tools module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ The QtScriptTools module provides additional components for applications that
+ use Qt Script.
+ .
+ This package contains the Qt Script debugger, a tool for debugging script
+ execution in Qt applications that use Qt Script.
+
Package: libqt4-sql
Architecture: any
Section: libs
@@ -328,10 +342,10 @@
libqtgui4 (= ${binary:Version}), libqt4-svg (= ${binary:Version}),
libqt4-webkit (= ${binary:Version}), libqt4-xml (= ${binary:Version}),
libqt4-sql (= ${binary:Version}), libqt4-script (= ${binary:Version}),
- libqt4-xmlpatterns (= ${binary:Version}), libqt4-qt3support (= ${binary:Version}),
- libqt4-designer (= ${binary:Version}), libqt4-help (= ${binary:Version}),
- libqt4-assistant (= ${binary:Version}), libqt4-test (= ${binary:Version}),
- qt4-qmake (= ${binary:Version})
+ libqt4-scripttools (= ${binary:Version}), libqt4-xmlpatterns (= ${binary:Version}),
+ libqt4-qt3support (= ${binary:Version}), libqt4-designer (= ${binary:Version}),
+ libqt4-help (= ${binary:Version}), libqt4-assistant (= ${binary:Version}),
+ libqt4-test (= ${binary:Version}), qt4-qmake (= ${binary:Version})
Recommends: libqt4-opengl-dev (= ${binary:Version})
Conflicts: qt3-dev-tools (<= 3:3.3.4-7), libqtwebkit-dev
Replaces: libqtwebkit-dev, libqt4-opengl-dev (<< 4.4.0-2)
@@ -425,7 +439,7 @@
Architecture: any
Section: devel
Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libqt4-dev (<< 4.4.2-1)
+Replaces: libqt4-dev (<< 4.5.0~beta1+snapshot20090114-1)
Description: Qt 4 qmake Makefile generator tool
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -435,6 +449,11 @@
qmake automates the generation of Makefiles so that only a few lines of
information are needed to create each Makefile. qmake can be used for any
software project, whether it is written using Qt or not.
+ .
+ Qt 4 qmake requires a platform and compiler description file which contains
+ many default values used to generate appropriate Makefiles.
+ .
+ This package contains also these platform specifications.
Package: qt4-qtconfig
Architecture: any
@@ -489,3 +508,4 @@
The documentation is provided in HTML format; the HTML version can be viewed
in conjunction with the legacy Qt Assistant (assistant_adp) found in the
qt4-dev-tools package.
+
Modified: trunk/packages/qt4-x11/debian/libqt4-assistant.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-assistant.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-assistant.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,2 +1 @@
usr/lib/libQtAssistantClient.so.*
-
Modified: trunk/packages/qt4-x11/debian/libqt4-dbg.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-dbg.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-dbg.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -10,11 +10,11 @@
usr/lib/libQtNetwork.so.*.debug
usr/lib/libQtOpenGL.so.*.debug
usr/lib/libQtScript.so.*.debug
+usr/lib/libQtScriptTools.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
@@ -22,6 +22,7 @@
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/graphicssystems/libqglgraphicssystem.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
@@ -32,4 +33,3 @@
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
-
Modified: trunk/packages/qt4-x11/debian/libqt4-dbg.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-dbg.lintian 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-dbg.lintian 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,37 +1,20 @@
-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/libQt3Support.so.4.5.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtAssistantClient.so.4.5.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtCLucene.so.4.5.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtCore.so.4.5.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtDBus.so.4.5.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtDesigner.so.4.5.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtDesignerComponents.so.4.5.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtGui.so.4.5.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtHelp.so.4.5.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtNetwork.so.4.5.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtOpenGL.so.4.5.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtScript.so.4.5.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtScriptTools.so.4.5.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtSql.so.4.5.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtSvg.so.4.5.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtTest.so.4.5.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtXml.so.4.5.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
@@ -54,24 +37,23 @@
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/libQt3Support.so.4.5.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtAssistantClient.so.4.5.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtCLucene.so.4.5.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtCore.so.4.5.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtDBus.so.4.5.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtDesigner.so.4.5.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtDesignerComponents.so.4.5.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtGui.so.4.5.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtHelp.so.4.5.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtNetwork.so.4.5.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtOpenGL.so.4.5.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtScript.so.4.5.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtScriptTools.so.4.5.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtSql.so.4.5.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtSvg.so.4.5.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtTest.so.4.5.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtXml.so.4.5.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
@@ -94,3 +76,20 @@
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
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQt3Support.so.4.5.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtAssistantClient.so.4.5.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtCLucene.so.4.5.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtCore.so.4.5.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtDBus.so.4.5.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtDesigner.so.4.5.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtDesignerComponents.so.4.5.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtGui.so.4.5.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtHelp.so.4.5.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtNetwork.so.4.5.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtOpenGL.so.4.5.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtScript.so.4.5.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtScriptTools.so.4.5.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtSql.so.4.5.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtSvg.so.4.5.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtTest.so.4.5.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtXml.so.4.5.0.debug
Modified: trunk/packages/qt4-x11/debian/libqt4-dbus.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-dbus.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-dbus.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,3 +1,2 @@
usr/lib/libQtDBus.so.*
usr/bin/qdbus
-
Modified: trunk/packages/qt4-x11/debian/libqt4-designer.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-designer.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-designer.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,3 +1,2 @@
usr/lib/libQtDesigner.so.*
usr/lib/libQtDesignerComponents.so.*
-
Modified: trunk/packages/qt4-x11/debian/libqt4-dev.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-dev.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-dev.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -14,6 +14,7 @@
usr/include/qt4/Qt/QtHelp
usr/include/qt4/Qt/QtNetwork
usr/include/qt4/Qt/QtScript
+usr/include/qt4/Qt/QtScriptTools
usr/include/qt4/Qt/QtSql
usr/include/qt4/Qt/QtSvg
usr/include/qt4/Qt/QtTest
@@ -134,6 +135,7 @@
usr/include/qt4/Qt/qabstractitemmodel.h
usr/include/qt4/Qt/qabstractitemview.h
usr/include/qt4/Qt/qabstractmessagehandler.h
+usr/include/qt4/Qt/qabstractnetworkcache.h
usr/include/qt4/Qt/qabstractpagesetupdialog.h
usr/include/qt4/Qt/qabstractprintdialog.h
usr/include/qt4/Qt/qabstractproxymodel.h
@@ -159,6 +161,7 @@
usr/include/qt4/Qt/qatomic_alpha.h
usr/include/qt4/Qt/qatomic_arch.h
usr/include/qt4/Qt/qatomic_arm.h
+usr/include/qt4/Qt/qatomic_armv6.h
usr/include/qt4/Qt/qatomic_avr32.h
usr/include/qt4/Qt/qatomic_bfin.h
usr/include/qt4/Qt/qatomic_bootstrap.h
@@ -169,11 +172,14 @@
usr/include/qt4/Qt/qatomic_parisc.h
usr/include/qt4/Qt/qatomic_powerpc.h
usr/include/qt4/Qt/qatomic_s390.h
+usr/include/qt4/Qt/qatomic_sh.h
+usr/include/qt4/Qt/qatomic_sh4a.h
usr/include/qt4/Qt/qatomic_sparc.h
usr/include/qt4/Qt/qatomic_x86_64.h
usr/include/qt4/Qt/qauthenticator.h
usr/include/qt4/Qt/qbasicatomic.h
usr/include/qt4/Qt/qbasictimer.h
+usr/include/qt4/Qt/qbenchmark.h
usr/include/qt4/Qt/qbitarray.h
usr/include/qt4/Qt/qbitmap.h
usr/include/qt4/Qt/qboxlayout.h
@@ -224,6 +230,8 @@
usr/include/qt4/Qt/qdbusmacros.h
usr/include/qt4/Qt/qdbusmessage.h
usr/include/qt4/Qt/qdbusmetatype.h
+usr/include/qt4/Qt/qdbuspendingcall.h
+usr/include/qt4/Qt/qdbuspendingreply.h
usr/include/qt4/Qt/qdbusreply.h
usr/include/qt4/Qt/qdbusserver.h
usr/include/qt4/Qt/qdebug.h
@@ -281,6 +289,7 @@
usr/include/qt4/Qt/qgraphicswidget.h
usr/include/qt4/Qt/qgridlayout.h
usr/include/qt4/Qt/qgroupbox.h
+usr/include/qt4/Qt/qgtkstyle.h
usr/include/qt4/Qt/qhash.h
usr/include/qt4/Qt/qheaderview.h
usr/include/qt4/Qt/qhelp_global.h
@@ -347,6 +356,7 @@
usr/include/qt4/Qt/qnamespace.h
usr/include/qt4/Qt/qnetworkaccessmanager.h
usr/include/qt4/Qt/qnetworkcookie.h
+usr/include/qt4/Qt/qnetworkdiskcache.h
usr/include/qt4/Qt/qnetworkinterface.h
usr/include/qt4/Qt/qnetworkproxy.h
usr/include/qt4/Qt/qnetworkreply.h
@@ -367,6 +377,7 @@
usr/include/qt4/Qt/qpictureformatplugin.h
usr/include/qt4/Qt/qpixmap.h
usr/include/qt4/Qt/qpixmapcache.h
+usr/include/qt4/Qt/qpixmapfilter.h
usr/include/qt4/Qt/qplaintextedit.h
usr/include/qt4/Qt/qplastiquestyle.h
usr/include/qt4/Qt/qplugin.h
@@ -402,6 +413,7 @@
usr/include/qt4/Qt/qscriptcontextinfo.h
usr/include/qt4/Qt/qscriptengine.h
usr/include/qt4/Qt/qscriptengineagent.h
+usr/include/qt4/Qt/qscriptenginedebugger.h
usr/include/qt4/Qt/qscriptextensioninterface.h
usr/include/qt4/Qt/qscriptextensionplugin.h
usr/include/qt4/Qt/qscriptstring.h
@@ -415,6 +427,8 @@
usr/include/qt4/Qt/qsettings.h
usr/include/qt4/Qt/qshareddata.h
usr/include/qt4/Qt/qsharedmemory.h
+usr/include/qt4/Qt/qsharedpointer.h
+usr/include/qt4/Qt/qsharedpointer_impl.h
usr/include/qt4/Qt/qshortcut.h
usr/include/qt4/Qt/qsignalmapper.h
usr/include/qt4/Qt/qsignalspy.h
@@ -520,6 +534,7 @@
usr/include/qt4/Qt/qtextcursor.h
usr/include/qt4/Qt/qtextdocument.h
usr/include/qt4/Qt/qtextdocumentfragment.h
+usr/include/qt4/Qt/qtextdocumentwriter.h
usr/include/qt4/Qt/qtextedit.h
usr/include/qt4/Qt/qtextformat.h
usr/include/qt4/Qt/qtextlayout.h
@@ -554,12 +569,14 @@
usr/include/qt4/Qt/qvarlengtharray.h
usr/include/qt4/Qt/qvector.h
usr/include/qt4/Qt/qwaitcondition.h
+usr/include/qt4/Qt/qwebdatabase.h
usr/include/qt4/Qt/qwebframe.h
usr/include/qt4/Qt/qwebhistory.h
usr/include/qt4/Qt/qwebhistoryinterface.h
usr/include/qt4/Qt/qwebkitglobal.h
usr/include/qt4/Qt/qwebpage.h
usr/include/qt4/Qt/qwebpluginfactory.h
+usr/include/qt4/Qt/qwebsecurityorigin.h
usr/include/qt4/Qt/qwebsettings.h
usr/include/qt4/Qt/qwebview.h
usr/include/qt4/Qt/qwhatsthis.h
@@ -950,6 +967,7 @@
usr/include/qt4/QtCore/QHashIterator
usr/include/qt4/QtCore/QHashNode
usr/include/qt4/QtCore/QIODevice
+usr/include/qt4/QtCore/QIncompatibleFlag
usr/include/qt4/QtCore/QIntForSize
usr/include/qt4/QtCore/QIntForType
usr/include/qt4/QtCore/QInternal
@@ -970,10 +988,13 @@
usr/include/qt4/QtCore/QMap
usr/include/qt4/QtCore/QMapData
usr/include/qt4/QtCore/QMapIterator
+usr/include/qt4/QtCore/QMapNode
+usr/include/qt4/QtCore/QMapPayloadNode
usr/include/qt4/QtCore/QMetaClassInfo
usr/include/qt4/QtCore/QMetaEnum
usr/include/qt4/QtCore/QMetaMethod
usr/include/qt4/QtCore/QMetaObject
+usr/include/qt4/QtCore/QMetaObjectExtraData
usr/include/qt4/QtCore/QMetaProperty
usr/include/qt4/QtCore/QMetaType
usr/include/qt4/QtCore/QMetaTypeId
@@ -1023,6 +1044,7 @@
usr/include/qt4/QtCore/QSharedData
usr/include/qt4/QtCore/QSharedDataPointer
usr/include/qt4/QtCore/QSharedMemory
+usr/include/qt4/QtCore/QSharedPointer
usr/include/qt4/QtCore/QSignalMapper
usr/include/qt4/QtCore/QSize
usr/include/qt4/QtCore/QSizeF
@@ -1067,6 +1089,7 @@
usr/include/qt4/QtCore/QVarLengthArray
usr/include/qt4/QtCore/QVariant
usr/include/qt4/QtCore/QVariantComparisonHelper
+usr/include/qt4/QtCore/QVariantHash
usr/include/qt4/QtCore/QVariantList
usr/include/qt4/QtCore/QVariantMap
usr/include/qt4/QtCore/QVector
@@ -1074,6 +1097,7 @@
usr/include/qt4/QtCore/QVectorIterator
usr/include/qt4/QtCore/QVectorTypedData
usr/include/qt4/QtCore/QWaitCondition
+usr/include/qt4/QtCore/QWeakPointer
usr/include/qt4/QtCore/QWriteLocker
usr/include/qt4/QtCore/QXmlStreamAttribute
usr/include/qt4/QtCore/QXmlStreamAttributes
@@ -1122,6 +1146,7 @@
usr/include/qt4/QtCore/qatomic_alpha.h
usr/include/qt4/QtCore/qatomic_arch.h
usr/include/qt4/QtCore/qatomic_arm.h
+usr/include/qt4/QtCore/qatomic_armv6.h
usr/include/qt4/QtCore/qatomic_avr32.h
usr/include/qt4/QtCore/qatomic_bfin.h
usr/include/qt4/QtCore/qatomic_bootstrap.h
@@ -1132,6 +1157,8 @@
usr/include/qt4/QtCore/qatomic_parisc.h
usr/include/qt4/QtCore/qatomic_powerpc.h
usr/include/qt4/QtCore/qatomic_s390.h
+usr/include/qt4/QtCore/qatomic_sh.h
+usr/include/qt4/QtCore/qatomic_sh4a.h
usr/include/qt4/QtCore/qatomic_sparc.h
usr/include/qt4/QtCore/qatomic_x86_64.h
usr/include/qt4/QtCore/qbasicatomic.h
@@ -1207,6 +1234,8 @@
usr/include/qt4/QtCore/qsettings.h
usr/include/qt4/QtCore/qshareddata.h
usr/include/qt4/QtCore/qsharedmemory.h
+usr/include/qt4/QtCore/qsharedpointer.h
+usr/include/qt4/QtCore/qsharedpointer_impl.h
usr/include/qt4/QtCore/qsignalmapper.h
usr/include/qt4/QtCore/qsize.h
usr/include/qt4/QtCore/qsocketnotifier.h
@@ -1259,6 +1288,10 @@
usr/include/qt4/QtDBus/QDBusMessage
usr/include/qt4/QtDBus/QDBusMetaType
usr/include/qt4/QtDBus/QDBusObjectPath
+usr/include/qt4/QtDBus/QDBusPendingCall
+usr/include/qt4/QtDBus/QDBusPendingCallWatcher
+usr/include/qt4/QtDBus/QDBusPendingReply
+usr/include/qt4/QtDBus/QDBusPendingReplyData
usr/include/qt4/QtDBus/QDBusReply
usr/include/qt4/QtDBus/QDBusServer
usr/include/qt4/QtDBus/QDBusSignature
@@ -1276,6 +1309,8 @@
usr/include/qt4/QtDBus/qdbusmacros.h
usr/include/qt4/QtDBus/qdbusmessage.h
usr/include/qt4/QtDBus/qdbusmetatype.h
+usr/include/qt4/QtDBus/qdbuspendingcall.h
+usr/include/qt4/QtDBus/qdbuspendingreply.h
usr/include/qt4/QtDBus/qdbusreply.h
usr/include/qt4/QtDBus/qdbusserver.h
usr/include/qt4/QtDesigner/QAbstractExtensionFactory
@@ -1485,6 +1520,7 @@
usr/include/qt4/QtGui/QGraphicsWidget
usr/include/qt4/QtGui/QGridLayout
usr/include/qt4/QtGui/QGroupBox
+usr/include/qt4/QtGui/QGtkStyle
usr/include/qt4/QtGui/QHBoxLayout
usr/include/qt4/QtGui/QHeaderView
usr/include/qt4/QtGui/QHelpEvent
@@ -1566,6 +1602,10 @@
usr/include/qt4/QtGui/QPictureIO
usr/include/qt4/QtGui/QPixmap
usr/include/qt4/QtGui/QPixmapCache
+usr/include/qt4/QtGui/QPixmapColorizeFilter
+usr/include/qt4/QtGui/QPixmapConvolutionFilter
+usr/include/qt4/QtGui/QPixmapDropShadowFilter
+usr/include/qt4/QtGui/QPixmapFilter
usr/include/qt4/QtGui/QPlainTextDocumentLayout
usr/include/qt4/QtGui/QPlainTextEdit
usr/include/qt4/QtGui/QPlastiqueStyle
@@ -1627,6 +1667,7 @@
usr/include/qt4/QtGui/QStyleOptionFocusRect
usr/include/qt4/QtGui/QStyleOptionFrame
usr/include/qt4/QtGui/QStyleOptionFrameV2
+usr/include/qt4/QtGui/QStyleOptionFrameV3
usr/include/qt4/QtGui/QStyleOptionGraphicsItem
usr/include/qt4/QtGui/QStyleOptionGroupBox
usr/include/qt4/QtGui/QStyleOptionHeader
@@ -1642,7 +1683,9 @@
usr/include/qt4/QtGui/QStyleOptionSpinBox
usr/include/qt4/QtGui/QStyleOptionTab
usr/include/qt4/QtGui/QStyleOptionTabBarBase
+usr/include/qt4/QtGui/QStyleOptionTabBarBaseV2
usr/include/qt4/QtGui/QStyleOptionTabV2
+usr/include/qt4/QtGui/QStyleOptionTabV3
usr/include/qt4/QtGui/QStyleOptionTabWidgetFrame
usr/include/qt4/QtGui/QStyleOptionTitleBar
usr/include/qt4/QtGui/QStyleOptionToolBar
@@ -1674,6 +1717,7 @@
usr/include/qt4/QtGui/QTextCursor
usr/include/qt4/QtGui/QTextDocument
usr/include/qt4/QtGui/QTextDocumentFragment
+usr/include/qt4/QtGui/QTextDocumentWriter
usr/include/qt4/QtGui/QTextEdit
usr/include/qt4/QtGui/QTextFormat
usr/include/qt4/QtGui/QTextFragment
@@ -1816,6 +1860,7 @@
usr/include/qt4/QtGui/qgraphicswidget.h
usr/include/qt4/QtGui/qgridlayout.h
usr/include/qt4/QtGui/qgroupbox.h
+usr/include/qt4/QtGui/qgtkstyle.h
usr/include/qt4/QtGui/qheaderview.h
usr/include/qt4/QtGui/qicon.h
usr/include/qt4/QtGui/qiconengine.h
@@ -1861,6 +1906,7 @@
usr/include/qt4/QtGui/qpictureformatplugin.h
usr/include/qt4/QtGui/qpixmap.h
usr/include/qt4/QtGui/qpixmapcache.h
+usr/include/qt4/QtGui/qpixmapfilter.h
usr/include/qt4/QtGui/qplaintextedit.h
usr/include/qt4/QtGui/qplastiquestyle.h
usr/include/qt4/QtGui/qpolygon.h
@@ -1911,6 +1957,7 @@
usr/include/qt4/QtGui/qtextcursor.h
usr/include/qt4/QtGui/qtextdocument.h
usr/include/qt4/QtGui/qtextdocumentfragment.h
+usr/include/qt4/QtGui/qtextdocumentwriter.h
usr/include/qt4/QtGui/qtextedit.h
usr/include/qt4/QtGui/qtextformat.h
usr/include/qt4/QtGui/qtextlayout.h
@@ -1965,6 +2012,7 @@
usr/include/qt4/QtHelp/qhelpsearchengine.h
usr/include/qt4/QtHelp/qhelpsearchquerywidget.h
usr/include/qt4/QtHelp/qhelpsearchresultwidget.h
+usr/include/qt4/QtNetwork/QAbstractNetworkCache
usr/include/qt4/QtNetwork/QAbstractSocket
usr/include/qt4/QtNetwork/QAuthenticator
usr/include/qt4/QtNetwork/QFtp
@@ -1979,10 +2027,14 @@
usr/include/qt4/QtNetwork/QLocalSocket
usr/include/qt4/QtNetwork/QNetworkAccessManager
usr/include/qt4/QtNetwork/QNetworkAddressEntry
+usr/include/qt4/QtNetwork/QNetworkCacheMetaData
usr/include/qt4/QtNetwork/QNetworkCookie
usr/include/qt4/QtNetwork/QNetworkCookieJar
+usr/include/qt4/QtNetwork/QNetworkDiskCache
usr/include/qt4/QtNetwork/QNetworkInterface
usr/include/qt4/QtNetwork/QNetworkProxy
+usr/include/qt4/QtNetwork/QNetworkProxyFactory
+usr/include/qt4/QtNetwork/QNetworkProxyQuery
usr/include/qt4/QtNetwork/QNetworkReply
usr/include/qt4/QtNetwork/QNetworkRequest
usr/include/qt4/QtNetwork/QSsl
@@ -1998,6 +2050,7 @@
usr/include/qt4/QtNetwork/QUrlInfo
usr/include/qt4/QtNetwork/Q_IPV6ADDR
usr/include/qt4/QtNetwork/QtNetwork
+usr/include/qt4/QtNetwork/qabstractnetworkcache.h
usr/include/qt4/QtNetwork/qabstractsocket.h
usr/include/qt4/QtNetwork/qauthenticator.h
usr/include/qt4/QtNetwork/qftp.h
@@ -2008,6 +2061,7 @@
usr/include/qt4/QtNetwork/qlocalsocket.h
usr/include/qt4/QtNetwork/qnetworkaccessmanager.h
usr/include/qt4/QtNetwork/qnetworkcookie.h
+usr/include/qt4/QtNetwork/qnetworkdiskcache.h
usr/include/qt4/QtNetwork/qnetworkinterface.h
usr/include/qt4/QtNetwork/qnetworkproxy.h
usr/include/qt4/QtNetwork/qnetworkreply.h
@@ -2033,6 +2087,7 @@
usr/include/qt4/QtScript/QScriptExtensionInterface
usr/include/qt4/QtScript/QScriptExtensionPlugin
usr/include/qt4/QtScript/QScriptString
+usr/include/qt4/QtScript/QScriptSyntaxCheckResult
usr/include/qt4/QtScript/QScriptValue
usr/include/qt4/QtScript/QScriptValueIterator
usr/include/qt4/QtScript/QScriptValueList
@@ -2050,6 +2105,9 @@
usr/include/qt4/QtScript/qscriptstring.h
usr/include/qt4/QtScript/qscriptvalue.h
usr/include/qt4/QtScript/qscriptvalueiterator.h
+usr/include/qt4/QtScriptTools/QScriptEngineDebugger
+usr/include/qt4/QtScriptTools/QtScriptTools
+usr/include/qt4/QtScriptTools/qscriptenginedebugger.h
usr/include/qt4/QtSql/QIBaseDriver
usr/include/qt4/QtSql/QIBaseResult
usr/include/qt4/QtSql/QMYSQLDriver
@@ -2124,6 +2182,7 @@
usr/include/qt4/QtTest/QTestKeyEvent
usr/include/qt4/QtTest/QTestMouseEvent
usr/include/qt4/QtTest/QtTest
+usr/include/qt4/QtTest/qbenchmark.h
usr/include/qt4/QtTest/qsignalspy.h
usr/include/qt4/QtTest/qtest.h
usr/include/qt4/QtTest/qtest_global.h
@@ -2141,6 +2200,7 @@
usr/include/qt4/QtUiTools/QUiLoader
usr/include/qt4/QtUiTools/QtUiTools
usr/include/qt4/QtUiTools/quiloader.h
+usr/include/qt4/QtWebKit/QWebDatabase
usr/include/qt4/QtWebKit/QWebFrame
usr/include/qt4/QtWebKit/QWebHistory
usr/include/qt4/QtWebKit/QWebHistoryInterface
@@ -2148,15 +2208,18 @@
usr/include/qt4/QtWebKit/QWebHitTestResult
usr/include/qt4/QtWebKit/QWebPage
usr/include/qt4/QtWebKit/QWebPluginFactory
+usr/include/qt4/QtWebKit/QWebSecurityOrigin
usr/include/qt4/QtWebKit/QWebSettings
usr/include/qt4/QtWebKit/QWebView
usr/include/qt4/QtWebKit/QtWebKit
+usr/include/qt4/QtWebKit/qwebdatabase.h
usr/include/qt4/QtWebKit/qwebframe.h
usr/include/qt4/QtWebKit/qwebhistory.h
usr/include/qt4/QtWebKit/qwebhistoryinterface.h
usr/include/qt4/QtWebKit/qwebkitglobal.h
usr/include/qt4/QtWebKit/qwebpage.h
usr/include/qt4/QtWebKit/qwebpluginfactory.h
+usr/include/qt4/QtWebKit/qwebsecurityorigin.h
usr/include/qt4/QtWebKit/qwebsettings.h
usr/include/qt4/QtWebKit/qwebview.h
usr/include/qt4/QtXml/QDomAttr
@@ -2255,6 +2318,8 @@
usr/lib/libQtNetwork.so
usr/lib/libQtScript.prl
usr/lib/libQtScript.so
+usr/lib/libQtScriptTools.prl
+usr/lib/libQtScriptTools.so
usr/lib/libQtSql.prl
usr/lib/libQtSql.so
usr/lib/libQtSvg.prl
@@ -2280,6 +2345,7 @@
usr/lib/pkgconfig/QtHelp.pc
usr/lib/pkgconfig/QtNetwork.pc
usr/lib/pkgconfig/QtScript.pc
+usr/lib/pkgconfig/QtScriptTools.pc
usr/lib/pkgconfig/QtSql.pc
usr/lib/pkgconfig/QtSvg.pc
usr/lib/pkgconfig/QtTest.pc
@@ -2287,5 +2353,4 @@
usr/lib/pkgconfig/QtWebKit.pc
usr/lib/pkgconfig/QtXml.pc
usr/lib/pkgconfig/QtXmlPatterns.pc
-usr/share/qt4/mkspecs/*
usr/share/qt4/q3porting.xml
Modified: trunk/packages/qt4-x11/debian/libqt4-dev.links
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-dev.links 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-dev.links 2009-02-20 20:24:25 UTC (rev 13852)
@@ -5,4 +5,3 @@
usr/bin/uic-qt4 usr/share/qt4/bin/uic
usr/bin/rcc usr/share/qt4/bin/rcc
usr/lib/qt4/plugins usr/share/qt4/plugins
-usr/share/qt4/mkspecs/linux-g++ usr/share/qt4/mkspecs/default
Modified: trunk/packages/qt4-x11/debian/libqt4-help.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-help.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-help.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,6 +1,6 @@
usr/lib/libQtHelp.so.*
usr/share/qt4/translations/qt_help_de.qm
usr/share/qt4/translations/qt_help_pl.qm
-usr/share/qt4/translations/qt_help_zh_CN.qm
-usr/share/qt4/translations/qt_help_zh_TW.qm
-
+# Disable for unofficial release like snapshots
+#usr/share/qt4/translations/qt_help_zh_CN.qm
+#usr/share/qt4/translations/qt_help_zh_TW.qm
Modified: trunk/packages/qt4-x11/debian/libqt4-network.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-network.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-network.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,2 +1 @@
usr/lib/libQtNetwork.so.*
-
Modified: trunk/packages/qt4-x11/debian/libqt4-opengl-dev.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-opengl-dev.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-opengl-dev.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,4 +1,5 @@
usr/include/qt4/Qt/QtOpenGL
+usr/include/qt4/Qt/glgc_shader_source.h
usr/include/qt4/Qt/qgl.h
usr/include/qt4/Qt/qglcolormap.h
usr/include/qt4/Qt/qglframebufferobject.h
@@ -14,6 +15,7 @@
usr/include/qt4/QtOpenGL/QMacCompatGLuint
usr/include/qt4/QtOpenGL/QMacGLCompatTypes
usr/include/qt4/QtOpenGL/QtOpenGL
+usr/include/qt4/QtOpenGL/glgc_shader_source.h
usr/include/qt4/QtOpenGL/qgl.h
usr/include/qt4/QtOpenGL/qglcolormap.h
usr/include/qt4/QtOpenGL/qglframebufferobject.h
Modified: trunk/packages/qt4-x11/debian/libqt4-opengl.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-opengl.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-opengl.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1 +1,2 @@
usr/lib/libQtOpenGL.so.*
+usr/lib/qt4/plugins/graphicssystems/libqglgraphicssystem.so
Modified: trunk/packages/qt4-x11/debian/libqt4-qt3support.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-qt3support.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-qt3support.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,4 +1,3 @@
usr/lib/libQt3Support.so.*
usr/lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so
usr/lib/qt4/plugins/designer/libqt3supportwidgets.so
-
Added: trunk/packages/qt4-x11/debian/libqt4-scripttools.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-scripttools.install (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-scripttools.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -0,0 +1 @@
+usr/lib/libQtScriptTools.so.*
Added: trunk/packages/qt4-x11/debian/libqt4-scripttools.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-scripttools.lintian (rev 0)
+++ trunk/packages/qt4-x11/debian/libqt4-scripttools.lintian 2009-02-20 20:24:25 UTC (rev 13852)
@@ -0,0 +1 @@
+libqt4-scripttools: package-name-doesnt-match-sonames libQtScriptTools4
Modified: trunk/packages/qt4-x11/debian/libqt4-sql-ibase.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-sql-ibase.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-sql-ibase.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,2 +1 @@
usr/lib/qt4/plugins/sqldrivers/libqsqlibase.so
-
Modified: trunk/packages/qt4-x11/debian/libqt4-sql-mysql.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-sql-mysql.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-sql-mysql.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,2 +1 @@
usr/lib/qt4/plugins/sqldrivers/libqsqlmysql.so
-
Modified: trunk/packages/qt4-x11/debian/libqt4-sql-odbc.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-sql-odbc.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-sql-odbc.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,2 +1 @@
usr/lib/qt4/plugins/sqldrivers/libqsqlodbc.so
-
Modified: trunk/packages/qt4-x11/debian/libqt4-sql-psql.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-sql-psql.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-sql-psql.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,2 +1 @@
usr/lib/qt4/plugins/sqldrivers/libqsqlpsql.so
-
Modified: trunk/packages/qt4-x11/debian/libqt4-sql-sqlite.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-sql-sqlite.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-sql-sqlite.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,2 +1 @@
usr/lib/qt4/plugins/sqldrivers/libqsqlite.so
-
Modified: trunk/packages/qt4-x11/debian/libqt4-sql-sqlite2.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-sql-sqlite2.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-sql-sqlite2.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,2 +1 @@
usr/lib/qt4/plugins/sqldrivers/libqsqlite2.so
-
Modified: trunk/packages/qt4-x11/debian/libqt4-sql.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-sql.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-sql.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,2 +1 @@
usr/lib/libQtSql.so.*
-
Modified: trunk/packages/qt4-x11/debian/libqt4-svg.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-svg.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-svg.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,4 +1,3 @@
usr/lib/libQtSvg.so.*
usr/lib/qt4/plugins/iconengines/libqsvgicon.so
usr/lib/qt4/plugins/imageformats/libqsvg.so
-
Modified: trunk/packages/qt4-x11/debian/libqt4-test.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-test.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-test.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,2 +1 @@
usr/lib/libQtTest.so.*
-
Modified: trunk/packages/qt4-x11/debian/libqt4-webkit-dbg.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-webkit-dbg.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-webkit-dbg.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,3 +1,2 @@
usr/lib/libQtWebKit.so.*.debug
usr/lib/qt4/plugins/designer/libqwebview.so.debug
-
Modified: trunk/packages/qt4-x11/debian/libqt4-webkit-dbg.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-webkit-dbg.lintian 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-webkit-dbg.lintian 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,6 +1,5 @@
-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/libQtWebKit.so.4.5.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/libQtWebKit.so.4.5.0.debug
libqt4-webkit-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/designer/libqwebview.so.debug
-
+libqt4-webkit-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtWebKit.so.4.5.0.debug
Modified: trunk/packages/qt4-x11/debian/libqt4-webkit.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-webkit.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-webkit.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,3 +1,2 @@
usr/lib/libQtWebKit.so.*
usr/lib/qt4/plugins/designer/libqwebview.so
-
Modified: trunk/packages/qt4-x11/debian/libqt4-xmlpatterns-dbg.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-xmlpatterns-dbg.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-xmlpatterns-dbg.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,2 +1 @@
usr/lib/libQtXmlPatterns.so.*.debug
-
Modified: trunk/packages/qt4-x11/debian/libqt4-xmlpatterns-dbg.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-xmlpatterns-dbg.lintian 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-xmlpatterns-dbg.lintian 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,4 +1,3 @@
-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
-
+libqt4-xmlpatterns-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtXmlPatterns.so.4.5.0.debug
+libqt4-xmlpatterns-dbg: shared-lib-without-dependency-information ./usr/lib/libQtXmlPatterns.so.4.5.0.debug
+libqt4-xmlpatterns-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtXmlPatterns.so.4.5.0.debug
Modified: trunk/packages/qt4-x11/debian/libqt4-xmlpatterns.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-xmlpatterns.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqt4-xmlpatterns.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,2 +1 @@
usr/lib/libQtXmlPatterns.so.*
-
Modified: trunk/packages/qt4-x11/debian/libqtcore4.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqtcore4.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqtcore4.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -16,5 +16,3 @@
usr/share/qt4/translations/qt_uk.qm
usr/share/qt4/translations/qt_zh_CN.qm
usr/share/qt4/translations/qt_zh_TW.qm
-
-
Modified: trunk/packages/qt4-x11/debian/libqtgui4.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqtgui4.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/libqtgui4.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -6,4 +6,3 @@
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/not-installed
===================================================================
--- trunk/packages/qt4-x11/debian/not-installed 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/not-installed 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,56 +1,254 @@
-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
-
-# Include files for the platforms Debian does not support
-usr/include/qt4/Qt/qmacstyle_mac.h
-usr/include/qt4/Qt/qwindowdefs_win.h
-usr/include/qt4/Qt/qatomic_macosx.h
-usr/include/qt4/QtCore/qatomic_macosx.h
-usr/include/qt4/QtGui/qmacstyle_mac.h
-usr/include/qt4/QtGui/qwindowdefs_win.h
-usr/include/qt4/QtGui/QMacStyle
-
-# Debugging symbols of binaries and a few designer plugins
-usr/bin/uic3.debug
-usr/bin/qdbusviewer.debug
-usr/bin/qhelpgenerator.debug
-usr/bin/pixeltool.debug
-usr/bin/qtconfig-qt4.debug
+usr/bin/assistant-qt4.debug
usr/bin/assistant_adp.debug
+usr/bin/designer-qt4.debug
+usr/bin/lconvert.debug
+usr/bin/linguist-qt4.debug
usr/bin/lrelease-qt4.debug
+usr/bin/lupdate-qt4.debug
+usr/bin/moc-qt4.debug
+usr/bin/pixeltool.debug
usr/bin/qcollectiongenerator.debug
+usr/bin/qdbus.debug
+usr/bin/qdbuscpp2xml.debug
+usr/bin/qdbusviewer.debug
+usr/bin/qdbusxml2cpp.debug
usr/bin/qhelpconverter.debug
-usr/bin/qdbusxml2cpp.debug
+usr/bin/qhelpgenerator.debug
usr/bin/qt3to4.debug
+usr/bin/qtconfig-qt4.debug
usr/bin/qtdemo.debug
-usr/bin/lupdate-qt4.debug
-usr/bin/xmlpatterns.debug
usr/bin/rcc.debug
-usr/bin/qdbuscpp2xml.debug
-usr/bin/linguist-qt4.debug
-usr/bin/designer-qt4.debug
usr/bin/uic-qt4.debug
-usr/bin/assistant-qt4.debug
-usr/bin/moc-qt4.debug
-usr/bin/qdbus.debug
+usr/bin/uic3.debug
+usr/bin/xmlpatterns.debug
+usr/lib/libQt3Support.la
+usr/lib/libQtCLucene.la
+usr/lib/libQtCore.la
+usr/lib/libQtDBus.la
+usr/lib/libQtGui.la
+usr/lib/libQtHelp.la
+usr/lib/libQtNetwork.la
+usr/lib/libQtOpenGL.la
+usr/lib/libQtScript.la
+usr/lib/libQtScriptTools.la
+usr/lib/libQtSql.la
+usr/lib/libQtSvg.la
+usr/lib/libQtTest.la
+usr/lib/libQtWebKit.la
+usr/lib/libQtXml.la
+usr/lib/libQtXmlPatterns.la
+usr/lib/qt4/demos/affine/affine.debug
+usr/lib/qt4/demos/books/books.debug
+usr/lib/qt4/demos/boxes/boxes.debug
+usr/lib/qt4/demos/browser/browser.debug
+usr/lib/qt4/demos/chip/chip.debug
+usr/lib/qt4/demos/composition/composition.debug
+usr/lib/qt4/demos/deform/deform.debug
+usr/lib/qt4/demos/embeddeddialogs/embeddeddialogs.debug
+usr/lib/qt4/demos/gradients/gradients.debug
+usr/lib/qt4/demos/interview/interview.debug
+usr/lib/qt4/demos/mainwindow/mainwindow.debug
+usr/lib/qt4/demos/pathstroke/pathstroke.debug
+usr/lib/qt4/demos/spreadsheet/spreadsheet.debug
+usr/lib/qt4/demos/sqlbrowser/sqlbrowser.debug
+usr/lib/qt4/demos/textedit/textedit.debug
+usr/lib/qt4/demos/undo/undo.debug
+usr/lib/qt4/examples/assistant/simpletextviewer/simpletextviewer.debug
+usr/lib/qt4/examples/dbus/chat/dbus-chat.debug
+usr/lib/qt4/examples/dbus/complexpingpong/complexping.debug
+usr/lib/qt4/examples/dbus/complexpingpong/complexpong.debug
+usr/lib/qt4/examples/dbus/listnames/listnames.debug
+usr/lib/qt4/examples/dbus/pingpong/ping.debug
+usr/lib/qt4/examples/dbus/pingpong/pong.debug
+usr/lib/qt4/examples/dbus/remotecontrolledcar/car/car.debug
+usr/lib/qt4/examples/dbus/remotecontrolledcar/controller/controller.debug
+usr/lib/qt4/examples/designer/calculatorbuilder/calculatorbuilder.debug
+usr/lib/qt4/examples/designer/calculatorform/calculatorform.debug
+usr/lib/qt4/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.debug
+usr/lib/qt4/examples/desktop/screenshot/screenshot.debug
+usr/lib/qt4/examples/desktop/systray/systray.debug
+usr/lib/qt4/examples/dialogs/classwizard/classwizard.debug
+usr/lib/qt4/examples/dialogs/configdialog/configdialog.debug
+usr/lib/qt4/examples/dialogs/extension/extension.debug
+usr/lib/qt4/examples/dialogs/findfiles/findfiles.debug
+usr/lib/qt4/examples/dialogs/licensewizard/licensewizard.debug
+usr/lib/qt4/examples/dialogs/standarddialogs/standarddialogs.debug
+usr/lib/qt4/examples/dialogs/tabdialog/tabdialog.debug
+usr/lib/qt4/examples/dialogs/trivialwizard/trivialwizard.debug
+usr/lib/qt4/examples/draganddrop/delayedencoding/delayedencoding.debug
+usr/lib/qt4/examples/draganddrop/draggableicons/draggableicons.debug
+usr/lib/qt4/examples/draganddrop/draggabletext/draggabletext.debug
+usr/lib/qt4/examples/draganddrop/dropsite/dropsite.debug
+usr/lib/qt4/examples/draganddrop/fridgemagnets/fridgemagnets.debug
+usr/lib/qt4/examples/draganddrop/puzzle/puzzle.debug
+usr/lib/qt4/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.debug
+usr/lib/qt4/examples/graphicsview/collidingmice/collidingmice.debug
+usr/lib/qt4/examples/graphicsview/diagramscene/diagramscene.debug
+usr/lib/qt4/examples/graphicsview/dragdroprobot/dragdroprobot.debug
+usr/lib/qt4/examples/graphicsview/elasticnodes/elasticnodes.debug
+usr/lib/qt4/examples/graphicsview/padnavigator/padnavigator.debug
+usr/lib/qt4/examples/graphicsview/portedasteroids/portedasteroids.debug
+usr/lib/qt4/examples/graphicsview/portedcanvas/portedcanvas.debug
+usr/lib/qt4/examples/help/contextsensitivehelp/contextsensitivehelp.debug
+usr/lib/qt4/examples/help/remotecontrol/remotecontrol.debug
+usr/lib/qt4/examples/help/simpletextviewer/simpletextviewer.debug
+usr/lib/qt4/examples/ipc/localfortuneclient/localfortuneclient.debug
+usr/lib/qt4/examples/ipc/localfortuneserver/localfortuneserver.debug
+usr/lib/qt4/examples/ipc/sharedmemory/sharedmemory.debug
+usr/lib/qt4/examples/itemviews/addressbook/addressbook.debug
+usr/lib/qt4/examples/itemviews/basicsortfiltermodel/basicsortfiltermodel.debug
+usr/lib/qt4/examples/itemviews/chart/chart.debug
+usr/lib/qt4/examples/itemviews/coloreditorfactory/coloreditorfactory.debug
+usr/lib/qt4/examples/itemviews/combowidgetmapper/combowidgetmapper.debug
+usr/lib/qt4/examples/itemviews/customsortfiltermodel/customsortfiltermodel.debug
+usr/lib/qt4/examples/itemviews/dirview/dirview.debug
+usr/lib/qt4/examples/itemviews/editabletreemodel/editabletreemodel.debug
+usr/lib/qt4/examples/itemviews/pixelator/pixelator.debug
+usr/lib/qt4/examples/itemviews/puzzle/puzzle.debug
+usr/lib/qt4/examples/itemviews/simpledommodel/simpledommodel.debug
+usr/lib/qt4/examples/itemviews/simpletreemodel/simpletreemodel.debug
+usr/lib/qt4/examples/itemviews/simplewidgetmapper/simplewidgetmapper.debug
+usr/lib/qt4/examples/itemviews/spinboxdelegate/spinboxdelegate.debug
+usr/lib/qt4/examples/itemviews/sqlwidgetmapper/sqlwidgetmapper.debug
+usr/lib/qt4/examples/itemviews/stardelegate/fetchmore.debug
+usr/lib/qt4/examples/itemviews/stardelegate/stardelegate.debug
+usr/lib/qt4/examples/layouts/basiclayouts/basiclayouts.debug
+usr/lib/qt4/examples/layouts/borderlayout/borderlayout.debug
+usr/lib/qt4/examples/layouts/dynamiclayouts/dynamiclayouts.debug
+usr/lib/qt4/examples/layouts/flowlayout/flowlayout.debug
+usr/lib/qt4/examples/linguist/arrowpad/arrowpad.debug
+usr/lib/qt4/examples/linguist/hellotr/hellotr.debug
+usr/lib/qt4/examples/linguist/trollprint/trollprint.debug
+usr/lib/qt4/examples/mainwindows/application/application.debug
+usr/lib/qt4/examples/mainwindows/dockwidgets/dockwidgets.debug
+usr/lib/qt4/examples/mainwindows/mdi/mdi.debug
+usr/lib/qt4/examples/mainwindows/menus/menus.debug
+usr/lib/qt4/examples/mainwindows/recentfiles/recentfiles.debug
+usr/lib/qt4/examples/mainwindows/sdi/sdi.debug
+usr/lib/qt4/examples/network/blockingfortuneclient/blockingfortuneclient.debug
+usr/lib/qt4/examples/network/broadcastreceiver/broadcastreceiver.debug
+usr/lib/qt4/examples/network/broadcastsender/broadcastsender.debug
+usr/lib/qt4/examples/network/chat/network-chat.debug
+usr/lib/qt4/examples/network/download/download.debug
+usr/lib/qt4/examples/network/downloadmanager/downloadmanager.debug
+usr/lib/qt4/examples/network/fortuneclient/fortuneclient.debug
+usr/lib/qt4/examples/network/fortuneserver/fortuneserver.debug
+usr/lib/qt4/examples/network/ftp/ftp.debug
+usr/lib/qt4/examples/network/http/http.debug
+usr/lib/qt4/examples/network/loopback/loopback.debug
+usr/lib/qt4/examples/network/securesocketclient/securesocketclient.debug
+usr/lib/qt4/examples/network/threadedfortuneserver/threadedfortuneserver.debug
+usr/lib/qt4/examples/network/torrent/torrent.debug
+usr/lib/qt4/examples/opengl/2dpainting/2dpainting.debug
+usr/lib/qt4/examples/opengl/framebufferobject/framebufferobject.debug
+usr/lib/qt4/examples/opengl/framebufferobject2/framebufferobject2.debug
+usr/lib/qt4/examples/opengl/grabber/grabber.debug
+usr/lib/qt4/examples/opengl/hellogl/hellogl.debug
+usr/lib/qt4/examples/opengl/overpainting/overpainting.debug
+usr/lib/qt4/examples/opengl/pbuffers/pbuffers.debug
+usr/lib/qt4/examples/opengl/pbuffers2/pbuffers2.debug
+usr/lib/qt4/examples/opengl/samplebuffers/samplebuffers.debug
+usr/lib/qt4/examples/opengl/textures/textures.debug
+usr/lib/qt4/examples/painting/basicdrawing/basicdrawing.debug
+usr/lib/qt4/examples/painting/concentriccircles/concentriccircles.debug
+usr/lib/qt4/examples/painting/fontsampler/fontsampler.debug
+usr/lib/qt4/examples/painting/imagecomposition/imagecomposition.debug
+usr/lib/qt4/examples/painting/painterpaths/painterpaths.debug
+usr/lib/qt4/examples/painting/pixmapfilters/pixmapfilters.debug
+usr/lib/qt4/examples/painting/svgviewer/svgviewer.debug
+usr/lib/qt4/examples/painting/transformations/transformations.debug
+usr/lib/qt4/examples/qtconcurrent/imagescaling/imagescaling.debug
+usr/lib/qt4/examples/qtconcurrent/map/mapdemo.debug
+usr/lib/qt4/examples/qtconcurrent/progressdialog/progressdialog.debug
+usr/lib/qt4/examples/qtconcurrent/runfunction/runfunction.debug
+usr/lib/qt4/examples/qtconcurrent/wordcount/wordcount.debug
+usr/lib/qt4/examples/qtestlib/tutorial1/tutorial1.debug
+usr/lib/qt4/examples/qtestlib/tutorial2/tutorial2.debug
+usr/lib/qt4/examples/qtestlib/tutorial3/tutorial3.debug
+usr/lib/qt4/examples/qtestlib/tutorial4/tutorial4.debug
+usr/lib/qt4/examples/qtestlib/tutorial5/tutorial5.debug
+usr/lib/qt4/examples/richtext/calendar/calendar.debug
+usr/lib/qt4/examples/richtext/orderform/orderform.debug
+usr/lib/qt4/examples/richtext/syntaxhighlighter/syntaxhighlighter.debug
+usr/lib/qt4/examples/script/calculator/calculator.debug
+usr/lib/qt4/examples/script/context2d/context2d.debug
+usr/lib/qt4/examples/script/customclass/customclass.debug
+usr/lib/qt4/examples/script/defaultprototypes/defaultprototypes.debug
+usr/lib/qt4/examples/script/helloscript/helloscript.debug
+usr/lib/qt4/examples/script/marshal/marshal.debug
+usr/lib/qt4/examples/script/qscript/qscript.debug
+usr/lib/qt4/examples/script/qstetrix/qstetrix.debug
+usr/lib/qt4/examples/sql/cachedtable/cachedtable.debug
+usr/lib/qt4/examples/sql/drilldown/drilldown.debug
+usr/lib/qt4/examples/sql/masterdetail/masterdetail.debug
+usr/lib/qt4/examples/sql/querymodel/querymodel.debug
+usr/lib/qt4/examples/sql/relationaltablemodel/relationaltablemodel.debug
+usr/lib/qt4/examples/sql/tablemodel/tablemodel.debug
+usr/lib/qt4/examples/threads/mandelbrot/mandelbrot.debug
+usr/lib/qt4/examples/threads/semaphores/semaphores.debug
+usr/lib/qt4/examples/threads/waitconditions/waitconditions.debug
+usr/lib/qt4/examples/tools/codecs/codecs.debug
+usr/lib/qt4/examples/tools/completer/completer.debug
+usr/lib/qt4/examples/tools/customcompleter/customcompleter.debug
+usr/lib/qt4/examples/tools/echoplugin/echoplugin.debug
+usr/lib/qt4/examples/tools/echoplugin/plugin/libechoplugin.so.debug
+usr/lib/qt4/examples/tools/i18n/i18n.debug
+usr/lib/qt4/examples/tools/plugandpaint/plugandpaint.debug
+usr/lib/qt4/examples/tools/plugandpaint/plugins/libpnp_extrafilters.so.debug
+usr/lib/qt4/examples/tools/regexp/regexp.debug
+usr/lib/qt4/examples/tools/settingseditor/settingseditor.debug
+usr/lib/qt4/examples/tools/styleplugin/styleplugin.debug
+usr/lib/qt4/examples/tools/styleplugin/styles/libsimplestyleplugin.so.debug
+usr/lib/qt4/examples/tools/treemodelcompleter/treemodelcompleter.debug
+usr/lib/qt4/examples/tools/undoframework/undoframework.debug
+usr/lib/qt4/examples/tutorials/addressbook/part1/part1.debug
+usr/lib/qt4/examples/tutorials/addressbook/part2/part2.debug
+usr/lib/qt4/examples/tutorials/addressbook/part3/part3.debug
+usr/lib/qt4/examples/tutorials/addressbook/part4/part4.debug
+usr/lib/qt4/examples/tutorials/addressbook/part5/part5.debug
+usr/lib/qt4/examples/tutorials/addressbook/part6/part6.debug
+usr/lib/qt4/examples/tutorials/addressbook/part7/part7.debug
+usr/lib/qt4/examples/uitools/multipleinheritance/multipleinheritance.debug
+usr/lib/qt4/examples/uitools/textfinder/textfinder.debug
+usr/lib/qt4/examples/webkit/formextractor/formExtractor.debug
+usr/lib/qt4/examples/webkit/previewer/previewer.debug
+usr/lib/qt4/examples/widgets/analogclock/analogclock.debug
+usr/lib/qt4/examples/widgets/calculator/calculator.debug
+usr/lib/qt4/examples/widgets/calendarwidget/calendarwidget.debug
+usr/lib/qt4/examples/widgets/charactermap/charactermap.debug
+usr/lib/qt4/examples/widgets/codeeditor/codeeditor.debug
+usr/lib/qt4/examples/widgets/digitalclock/digitalclock.debug
+usr/lib/qt4/examples/widgets/groupbox/groupbox.debug
+usr/lib/qt4/examples/widgets/icons/icons.debug
+usr/lib/qt4/examples/widgets/imageviewer/imageviewer.debug
+usr/lib/qt4/examples/widgets/lineedits/lineedits.debug
+usr/lib/qt4/examples/widgets/movie/movie.debug
+usr/lib/qt4/examples/widgets/scribble/scribble.debug
+usr/lib/qt4/examples/widgets/shapedclock/shapedclock.debug
+usr/lib/qt4/examples/widgets/sliders/sliders.debug
+usr/lib/qt4/examples/widgets/spinboxes/spinboxes.debug
+usr/lib/qt4/examples/widgets/styles/styles.debug
+usr/lib/qt4/examples/widgets/stylesheet/stylesheet.debug
+usr/lib/qt4/examples/widgets/tablet/tablet.debug
+usr/lib/qt4/examples/widgets/tetrix/tetrix.debug
+usr/lib/qt4/examples/widgets/tooltips/tooltips.debug
+usr/lib/qt4/examples/widgets/validators/validators.debug
+usr/lib/qt4/examples/widgets/wiggly/wiggly.debug
+usr/lib/qt4/examples/widgets/windowflags/windowflags.debug
+usr/lib/qt4/examples/xml/dombookmarks/dombookmarks.debug
+usr/lib/qt4/examples/xml/rsslisting/rsslisting.debug
+usr/lib/qt4/examples/xml/saxbookmarks/saxbookmarks.debug
+usr/lib/qt4/examples/xml/streambookmarks/streambookmarks.debug
+usr/lib/qt4/examples/xml/xmlstreamlint/xmlstreamlint.debug
+usr/lib/qt4/examples/xmlpatterns/filetree/filetree.debug
+usr/lib/qt4/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.debug
+usr/lib/qt4/examples/xmlpatterns/recipes/recipes.debug
+usr/lib/qt4/plugins/designer/libarthurplugin.so.debug
+usr/lib/qt4/plugins/designer/libcontainerextension.so.debug
+usr/lib/qt4/plugins/designer/libcustomwidgetplugin.so.debug
usr/lib/qt4/plugins/designer/libtaskmenuextension.so.debug
-usr/lib/qt4/plugins/designer/libcustomwidgetplugin.so.debug
-usr/lib/qt4/plugins/designer/libcontainerextension.so.debug
usr/lib/qt4/plugins/designer/libworldtimeclockplugin.so.debug
-usr/lib/qt4/plugins/designer/libarthurplugin.so.debug
+usr/lib/qt4/plugins/graphicssystems/libqglgraphicssystem.so.debug
+usr/share/qt4/translations/qvfb_pl.qm
+usr/share/qt4/translations/qvfb_zh_CN.qm
+usr/share/qt4/translations/qvfb_zh_TW.qm
Deleted: trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff
Modified: trunk/packages/qt4-x11/debian/patches/0180-window-role.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0180-window-role.diff 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/patches/0180-window-role.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -14,7 +14,7 @@
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
-@@ -1037,9 +1037,18 @@
+@@ -988,9 +988,18 @@ void QObject::setObjectName(const QStrin
{
Q_D(QObject);
d->objectName = name;
@@ -35,7 +35,7 @@
QObject::child is compat but needs to call itself recursively,
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
-@@ -146,6 +146,9 @@
+@@ -139,6 +139,9 @@ public:
mutable quint32 connectedSignals;
QString objectName;
@@ -47,17 +47,17 @@
struct Connection
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
-@@ -333,6 +333,7 @@
+@@ -355,6 +355,7 @@ public:
#if defined(Q_WS_X11)
void setWindowRole();
+ virtual void checkWindowRole();
void sendStartupMessage(const char *message) const;
void setNetWmWindowTypes();
- #endif
+ void x11UpdateIsOpaque();
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -719,13 +719,17 @@
+@@ -761,13 +761,17 @@ void QWidgetPrivate::create_sys(WId wind
data.fstrut_dirty = 1;
// declare the widget's window role
@@ -81,7 +81,7 @@
}
// set client leader property
-@@ -2719,6 +2723,17 @@
+@@ -2733,6 +2737,17 @@ void QWidgetPrivate::setWindowRole()
(unsigned char *)windowRole.constData(), windowRole.length());
}
Modified: trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -9,7 +9,7 @@
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -662,6 +662,11 @@
+@@ -702,6 +702,11 @@ void QWidgetPrivate::create_sys(WId wind
Q_ASSERT(id);
XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
&wsa);
@@ -21,7 +21,7 @@
} else if (topLevel && !desktop) { // top-level widget
if (!X11->wm_client_leader)
create_wm_client_leader();
-@@ -710,13 +715,21 @@
+@@ -752,13 +757,21 @@ void QWidgetPrivate::create_sys(WId wind
// set EWMH window types
setNetWmWindowTypes();
@@ -45,7 +45,7 @@
// declare the widget's window role
QByteArray windowRole;
-@@ -736,10 +749,6 @@
+@@ -778,10 +791,6 @@ void QWidgetPrivate::create_sys(WId wind
XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
XA_WINDOW, 32, PropModeReplace,
(unsigned char *)&X11->wm_client_leader, 1);
Deleted: trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff
Modified: trunk/packages/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -15,7 +15,7 @@
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
-@@ -85,7 +85,9 @@
+@@ -78,7 +78,9 @@ extern QSignalSpyCallbackSet Q_CORE_EXPO
inline QObjectData::~QObjectData() {}
Modified: trunk/packages/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -24,7 +24,7 @@
--- a/configure
+++ b/configure
-@@ -833,6 +833,11 @@
+@@ -845,6 +845,11 @@ while [ "$#" -gt 0 ]; do
VAL=`echo $1 | sed 's,-D,,'`
fi
;;
@@ -36,7 +36,7 @@
-I?*|-I)
VAR="add_ipath"
if [ "$1" = "-I" ]; then
-@@ -1740,6 +1745,9 @@
+@@ -1805,6 +1810,9 @@ while [ "$#" -gt 0 ]; do
add_ipath)
I_FLAGS="$I_FLAGS -I\"${VAL}\""
;;
Deleted: trunk/packages/qt4-x11/debian/patches/0224-fast-qpixmap-fill.diff
Modified: trunk/packages/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,5 +1,5 @@
-qt-bugs@ issue : None
-Trolltech task ID : None
+qt-bugs@ issue : 208185
+Trolltech task ID : 208349
bugs.kde.org number : 159014
applied: no
author: Robert Knight <robertknight at gmail.com>
@@ -21,7 +21,7 @@
--- a/src/gui/widgets/qtabbar.cpp
+++ b/src/gui/widgets/qtabbar.cpp
-@@ -533,8 +533,8 @@
+@@ -673,8 +673,8 @@ void QTabBarPrivate::refresh()
layoutTabs();
makeVisible(currentIndex);
q->update();
Deleted: trunk/packages/qt4-x11/debian/patches/0226-qtreeview-column_resize_when_needed.diff
Modified: trunk/packages/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -9,7 +9,7 @@
--- a/src/sql/drivers/mysql/qsql_mysql.cpp
+++ b/src/sql/drivers/mysql/qsql_mysql.cpp
-@@ -1248,6 +1248,10 @@
+@@ -1252,6 +1252,10 @@ bool QMYSQLDriver::open(const QString& d
d->preparedQuerysEnabled = false;
#endif
@@ -20,7 +20,7 @@
setOpen(true);
setOpenError(false);
return true;
-@@ -1256,6 +1260,9 @@
+@@ -1260,6 +1264,9 @@ bool QMYSQLDriver::open(const QString& d
void QMYSQLDriver::close()
{
if (isOpen()) {
@@ -28,5 +28,5 @@
+ mysql_thread_end();
+#endif
mysql_close(d->mysql);
+ d->mysql = NULL;
setOpen(false);
- setOpenError(false);
Deleted: trunk/packages/qt4-x11/debian/patches/0238-fix-qt-qttabbar-size.diff
Modified: trunk/packages/qt4-x11/debian/patches/0245-fix-randr-changes-detecting.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0245-fix-randr-changes-detecting.diff 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/patches/0245-fix-randr-changes-detecting.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -9,7 +9,7 @@
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
-@@ -2994,11 +2994,11 @@ int QApplication::x11ProcessEvent(XEvent
+@@ -3339,11 +3339,11 @@ int QApplication::x11ProcessEvent(XEvent
QSize oldSize(w->size());
w->data->crect.setWidth(DisplayWidth(X11->display, scr));
w->data->crect.setHeight(DisplayHeight(X11->display, scr));
Deleted: trunk/packages/qt4-x11/debian/patches/0248-fix-qwidget-scroll-slowness.diff
Deleted: trunk/packages/qt4-x11/debian/patches/0249-webkit-stale-frame-pointer.diff
Deleted: trunk/packages/qt4-x11/debian/patches/0254-fix-qgraphicsproxywidget-deletion-crash.diff
Modified: trunk/packages/qt4-x11/debian/patches/0255-qtreeview-selection-columns-hidden.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0255-qtreeview-selection-columns-hidden.diff 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/patches/0255-qtreeview-selection-columns-hidden.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -31,10 +31,10 @@
--- a/src/gui/itemviews/qtreeview.cpp
+++ b/src/gui/itemviews/qtreeview.cpp
-@@ -3530,7 +3530,7 @@ QList<QPair<int, int> > QTreeViewPrivate
+@@ -3526,7 +3526,7 @@ QList<QPair<int, int> > QTreeViewPrivate
current.first = -2; // -1 is not enough because -1+1 = 0
current.second = -2;
- foreach(int logicalColumn, logicalIndexes) {
+ foreach (int logicalColumn, logicalIndexes) {
- if (current.second + 1 != logicalColumn) {
+ if (current.second + 1 != logicalColumn && !header->isSectionHidden(current.second + 1)) {
if (current.first != -2) {
Deleted: trunk/packages/qt4-x11/debian/patches/0256-fix-recursive-backingstore-sync-crash.diff
Deleted: trunk/packages/qt4-x11/debian/patches/0257-qurl-validate-speedup.diff
Deleted: trunk/packages/qt4-x11/debian/patches/0260-fix-qgraphicswidget-deletionclearFocus.diff
Deleted: trunk/packages/qt4-x11/debian/patches/0261-sync-before-reset-errorhandler.patch
Deleted: trunk/packages/qt4-x11/debian/patches/0262-fix-treeview-animation-crash.diff
Added: trunk/packages/qt4-x11/debian/patches/0273-odbc-64bit-compile.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0273-odbc-64bit-compile.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0273-odbc-64bit-compile.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -0,0 +1,23 @@
+qt-bugs@ issue:
+QtSw task ID:
+applied: no
+author: Alex Merry
+
+--- a/src/sql/drivers/odbc/qsql_odbc.cpp
++++ b/src/sql/drivers/odbc/qsql_odbc.cpp
+@@ -64,13 +64,13 @@ QT_BEGIN_NAMESPACE
+ #endif
+
+ // newer platform SDKs use SQLLEN instead of SQLINTEGER
+-#if defined(SQLLEN) || defined(Q_OS_WIN64)
++#if defined(SQLLEN) || defined(Q_OS_WIN64) || (defined(Q_OS_UNIX) && !defined(Q_OS_MAC))
+ # define QSQLLEN SQLLEN
+ #else
+ # define QSQLLEN SQLINTEGER
+ #endif
+
+-#if defined(SQLULEN) || defined(Q_OS_WIN64)
++#if defined(SQLULEN) || defined(Q_OS_WIN64) || (defined(Q_OS_UNIX) && !defined(Q_OS_MAC))
+ # define QSQLULEN SQLULEN
+ #else
+ # define QSQLULEN SQLUINTEGER
Modified: trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,6 +1,6 @@
--- a/demos/qtdemo/menumanager.cpp
+++ b/demos/qtdemo/menumanager.cpp
-@@ -285,7 +285,7 @@ void MenuManager::showDocInAssistant(con
+@@ -284,7 +284,7 @@ void MenuManager::showDocInAssistant(con
if (this->assistantProcess.state() != QProcess::Running){
QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator();
#if !defined(Q_OS_MAC)
Modified: trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -4,7 +4,7 @@
--- a/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp
+++ b/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp
-@@ -392,7 +392,7 @@ int main(int argc, char **argv)
+@@ -391,7 +391,7 @@ int main(int argc, char **argv)
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 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -2,7 +2,7 @@
--- a/tools/designer/src/lib/shared/qdesigner_utils.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_utils.cpp
-@@ -482,7 +482,7 @@ namespace qdesigner_internal
+@@ -663,7 +663,7 @@ namespace qdesigner_internal
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 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -57,7 +57,7 @@
if [ "$VERBOSE" = "yes" ]; then
--- a/configure
+++ b/configure
-@@ -3789,7 +3789,7 @@ END {
+@@ -3935,7 +3935,7 @@ END {
}
# build qmake
@@ -66,7 +66,7 @@
echo "Creating qmake. Please wait..."
OLD_QCONFIG_H=
-@@ -6031,8 +6031,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
+@@ -6511,8 +6511,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
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
-@@ -6333,11 +6333,11 @@ EXEC=""
+@@ -6861,11 +6861,11 @@ EXEC=""
#-------------------------------------------------------------------------------
echo "Finding project files. Please wait..."
@@ -91,7 +91,7 @@
fi
# .projects -> projects to process
-@@ -6510,7 +6510,7 @@ for file in .projects .projects.3; do
+@@ -7038,7 +7038,7 @@ for file in .projects .projects.3; do
echo " for $a\c"
fi
@@ -102,7 +102,7 @@
if echo '\c' | grep '\c' >/dev/null; then
--- a/projects.pro
+++ b/projects.pro
-@@ -116,7 +116,7 @@ qmake.path=$$[QT_INSTALL_BINS]
+@@ -115,7 +115,7 @@ qmake.path=$$[QT_INSTALL_BINS]
win32 {
qmake.files=$$QT_BUILD_TREE/bin/qmake.exe
} else {
@@ -113,7 +113,7 @@
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
-@@ -98,17 +98,17 @@ CPPFLAGS = -I. -Igenerators -Igenerators
+@@ -99,17 +99,17 @@ CPPFLAGS = -I. -Igenerators -Igenerators
CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS)
@@ -137,26 +137,22 @@
makedepend -D__MAKEDEPEND__ $(CPPFLAGS) $(DEPEND_SRC)
--- a/tools/linguist/lrelease/lrelease.pro
+++ b/tools/linguist/lrelease/lrelease.pro
-@@ -29,7 +29,7 @@ HEADERS += $$PROPARSERPATH/proitems.h \
- SOURCES += $$PROPARSERPATH/proitems.cpp \
- $$PROPARSERPATH/proreader.cpp
-
+@@ -1,5 +1,5 @@
+ TEMPLATE = app
-TARGET = lrelease
+TARGET = lrelease-qt4
- INCLUDEPATH += ../shared
DESTDIR = ../../../bin
+ QT -= gui
--- a/tools/linguist/lupdate/lupdate.pro
+++ b/tools/linguist/lupdate/lupdate.pro
-@@ -42,7 +42,7 @@ SOURCES += $$PROPARSERPATH/proitems.cpp
- $$PROPARSERPATH/proreader.cpp
-
-
+@@ -1,5 +1,5 @@
+ TEMPLATE = app
-TARGET = lupdate
+TARGET = lupdate-qt4
- INCLUDEPATH += ../shared
DESTDIR = ../../../bin
+ QT -= gui
--- a/src/tools/moc/moc.pro
+++ b/src/tools/moc/moc.pro
@@ -1,5 +1,5 @@
@@ -164,19 +160,17 @@
-TARGET = moc
+TARGET = moc-qt4
- CONFIG += console qtinc
- CONFIG -= qt
+ DEFINES += QT_MOC
+ DESTDIR = ../../../bin
--- a/src/tools/uic/uic.pro
+++ b/src/tools/uic/uic.pro
-@@ -9,7 +9,7 @@ build_all:!build_pass {
-
- unix:!contains(QT_CONFIG, zlib):LIBS += -lz
-
+@@ -1,5 +1,5 @@
+ TEMPLATE = app
-TARGET = uic
+TARGET = uic-qt4
- DESTDIR = ../../../bin
- DEFINES += QT_BOOTSTRAPPED QT_UIC QT_LITE_UNICODE QT_NO_DATASTREAM \
+ DESTDIR = ../../../bin
+ DEFINES += QT_UIC
--- a/tools/assistant/tools/assistant/assistant.pro
+++ b/tools/assistant/tools/assistant/assistant.pro
@@ -2,7 +2,7 @@ include($$QT_SOURCE_TREE/tools/shared/fo
@@ -201,10 +195,10 @@
include($$QT_SOURCE_TREE/tools/shared/qttoolbardialog/qttoolbardialog.pri)
--- a/tools/linguist/linguist/linguist.pro
+++ b/tools/linguist/linguist/linguist.pro
-@@ -67,7 +67,7 @@ HEADERS += batchtranslationdialog.h \
+@@ -68,7 +68,7 @@ HEADERS += \
+
contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE
DEFINES += QT_KEYWORDS
- DESTDIR = ../../../bin
-TARGET = linguist
+TARGET = linguist-qt4
win32:RC_FILE = linguist.rc
Modified: trunk/packages/qt4-x11/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/07_trust_dpkg-arch_over_uname-m.diff 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/patches/07_trust_dpkg-arch_over_uname-m.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,5 +1,7 @@
author: Sune Vuorela
-Reported to trolltech as N180631 - and task 181882
+qt-bugs@ issue : N180631
+Trolltech task ID : 181882
+
--- a/configure
+++ b/configure
@@ -94,7 +94,50 @@ getQMakeConf()
Modified: trunk/packages/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -5,7 +5,7 @@
--- a/configure
+++ b/configure
-@@ -463,6 +463,8 @@ mkdir -p "$outpath/config.tests"
+@@ -495,6 +495,8 @@ mkdir -p "$outpath/config.tests"
rm -f "$outpath/config.tests/.qmake.cache"
cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
Deleted: trunk/packages/qt4-x11/debian/patches/12_fix_qmake_pkgconfig.diff
Modified: trunk/packages/qt4-x11/debian/patches/14_add_libraries_to_gui_build_where_actually_needed.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/14_add_libraries_to_gui_build_where_actually_needed.diff 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/patches/14_add_libraries_to_gui_build_where_actually_needed.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,6 +1,6 @@
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
-@@ -141,6 +141,8 @@ embedded {
+@@ -146,6 +146,8 @@ embedded {
HEADERS += \
kernel/qeventdispatcher_glib_qws_p.h
QMAKE_CXXFLAGS += $$QT_CFLAGS_GLIB
@@ -11,9 +11,9 @@
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
-@@ -63,6 +63,8 @@ SOURCES += \
- painting/qpathclipper.cpp \
- painting/qmemrotate.cpp
+@@ -78,6 +78,8 @@ SOURCES += \
+ painting/qtextureglyphcache.cpp \
+ painting/qtransform.cpp \
+LIBS += -lz
+
Modified: trunk/packages/qt4-x11/debian/patches/15_fix_qmake_makefile_generation.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/15_fix_qmake_makefile_generation.diff 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/patches/15_fix_qmake_makefile_generation.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,6 +1,6 @@
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
-@@ -2328,7 +2328,7 @@ MakefileGenerator::writeSubTargets(QText
+@@ -2329,7 +2329,7 @@ MakefileGenerator::writeSubTargets(QText
QString mkfile = subtarget->makefile;
if(!in_directory.isEmpty())
Modified: trunk/packages/qt4-x11/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/16_hide_std_symbols_on_qtwebkit.diff 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/patches/16_hide_std_symbols_on_qtwebkit.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,13 +1,13 @@
--- a/src/3rdparty/webkit/WebKit.pri
+++ b/src/3rdparty/webkit/WebKit.pri
-@@ -27,6 +27,7 @@ CONFIG(release) {
+@@ -26,6 +26,7 @@ CONFIG(release) {
+
BASE_DIR = $$PWD
- qt-port:INCLUDEPATH += \
- $$PWD/WebKit/qt/Api
-+qt-port:QMAKE_LFLAGS += -Wl,--version-script,$$BASE_DIR/symbols.filter
- gtk-port:INCLUDEPATH += \
- $$BASE_DIR/WebCore/platform/gtk \
- $$BASE_DIR/WebCore/platform/network/curl \
+ INCLUDEPATH += $$PWD/WebKit/qt/Api
++QMAKE_LFLAGS += -Wl,--version-script,$$BASE_DIR/symbols.filter
+
+ #
+ # For builds inside Qt we interpret the output rule and the input of each extra compiler manually
--- /dev/null
+++ b/src/3rdparty/webkit/symbols.filter
@@ -0,0 +1,5 @@
Modified: trunk/packages/qt4-x11/debian/patches/17_add_postgresql_8.3_support.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/17_add_postgresql_8.3_support.diff 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/patches/17_add_postgresql_8.3_support.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -2,7 +2,7 @@
--- a/src/sql/drivers/psql/qsql_psql.cpp
+++ b/src/sql/drivers/psql/qsql_psql.cpp
-@@ -633,9 +633,12 @@ static QPSQLDriver::Protocol getPSQLVers
+@@ -632,9 +632,12 @@ static QPSQLDriver::Protocol getPSQLVers
serverVersion = QPSQLDriver::Version81;
break;
case 2:
@@ -16,7 +16,7 @@
}
break;
default:
-@@ -916,6 +919,7 @@ QSqlIndex QPSQLDriver::primaryIndex(cons
+@@ -915,6 +918,7 @@ QSqlIndex QPSQLDriver::primaryIndex(cons
case QPSQLDriver::Version8:
case QPSQLDriver::Version81:
case QPSQLDriver::Version82:
@@ -24,7 +24,7 @@
stmt = QLatin1String("SELECT pg_attribute.attname, pg_attribute.atttypid::int, "
"pg_class.relname "
"FROM pg_attribute, pg_class "
-@@ -989,6 +993,7 @@ QSqlRecord QPSQLDriver::record(const QSt
+@@ -988,6 +992,7 @@ QSqlRecord QPSQLDriver::record(const QSt
case QPSQLDriver::Version8:
case QPSQLDriver::Version81:
case QPSQLDriver::Version82:
@@ -34,7 +34,7 @@
"pg_attrdef.adsrc "
--- a/src/sql/drivers/psql/qsql_psql.h
+++ b/src/sql/drivers/psql/qsql_psql.h
-@@ -100,7 +100,8 @@ public:
+@@ -99,7 +99,8 @@ public:
Version74 = 10,
Version8 = 11,
Version81 = 12,
Added: trunk/packages/qt4-x11/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -0,0 +1,26 @@
+author: Fathi Boudra <fabo at debian.org>
+
+On Qt >= 4.5, debug info are disabled for Qt3Support and QtWebkit.
+This patch enable them.
+
+--- a/src/3rdparty/webkit/WebCore/WebCore.pro
++++ b/src/3rdparty/webkit/WebCore/WebCore.pro
+@@ -2030,9 +2030,3 @@ HEADERS += $$WEBKIT_API_HEADERS
+ }
+ }
+
+-CONFIG(QTDIR_build):isEqual(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 4) {
+- # start with 4.5
+- CONFIG -= separate_debug_info
+- CONFIG += no_debug_info
+-}
+-
+--- a/src/qt3support/qt3support.pro
++++ b/src/qt3support/qt3support.pro
+@@ -34,6 +34,3 @@ MOCDIR = .moc
+
+ *-g++*: QMAKE_CXXFLAGS += -fno-strict-aliasing
+
+-CONFIG -= separate_debug_info
+-CONFIG += no_debug_info
+-
Added: trunk/packages/qt4-x11/debian/patches/19_install_qdoc3.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/19_install_qdoc3.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/19_install_qdoc3.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -0,0 +1,21 @@
+--- a/tools/qdoc3/qdoc3.pro
++++ b/tools/qdoc3/qdoc3.pro
+@@ -106,3 +106,8 @@ win32 {
+ QT_WINCONFIG = debug
+ }
+ }
++
++TARGET = qdoc3
++target.path = $$[QT_INSTALL_BINS]
++INSTALLS += target
++
+--- a/tools/tools.pro
++++ b/tools/tools.pro
+@@ -13,6 +13,7 @@ no-png {
+ SUBDIRS += designer
+ }
+ SUBDIRS += linguist
++ SUBDIRS += qdoc3
+ wince*: SUBDIRS = qtestlib designer
+ unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
+ win32:!wince*:!contains(QT_EDITION, OpenSource|Console):SUBDIRS += activeqt
Added: trunk/packages/qt4-x11/debian/patches/20_fix_ftbfs_callgrindChildExitCode.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/20_fix_ftbfs_callgrindChildExitCode.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/20_fix_ftbfs_callgrindChildExitCode.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -0,0 +1,28 @@
+--- a/src/testlib/qtestcase.cpp
++++ b/src/testlib/qtestcase.cpp
+@@ -1359,6 +1359,9 @@ int QTest::qExec(QObject *testObject, in
+ QBenchmarkGlobalData benchmarkData;
+ QBenchmarkGlobalData::current = &benchmarkData;
+
++#ifdef QTESTLIB_USE_VALGRIND
++ int callgrindChildExitCode = 0;
++#endif
+
+ #ifdef Q_WS_MAC
+ bool macNeedsActivate = qApp && qstrcmp(qApp->metaObject()->className(), "QApplicaion");
+@@ -1411,7 +1414,6 @@ int QTest::qExec(QObject *testObject, in
+ QTestResult::setCurrentTestObject(metaObject->className());
+ qParseArgs(argc, argv);
+ #ifdef QTESTLIB_USE_VALGRIND
+- int callgrindChildExitCode;
+ if (QBenchmarkGlobalData::current->mode() == QBenchmarkGlobalData::CallgrindParentProcess) {
+ const QStringList origAppArgs(QCoreApplication::arguments());
+ if (!QBenchmarkValgrindUtils::rerunThroughCallgrind(origAppArgs, callgrindChildExitCode))
+@@ -1436,6 +1438,7 @@ int QTest::qExec(QObject *testObject, in
+ QTestResult::setCurrentTestFunction(0);
+ }
+
++ QTestLog::stopLogging();
+ #ifdef QT_MAC_USE_COCOA
+ if (macNeedsActivate) {
+ IOPMAssertionRelease(powerID);
Deleted: trunk/packages/qt4-x11/debian/patches/20_mips_atomic_ops.diff
Added: trunk/packages/qt4-x11/debian/patches/21_fix_ppc_build.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/21_fix_ppc_build.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/21_fix_ppc_build.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -0,0 +1,11 @@
+--- a/src/corelib/arch/qatomic_powerpc.h
++++ b/src/corelib/arch/qatomic_powerpc.h
+@@ -188,7 +188,7 @@ inline bool QBasicAtomicInt::testAndSetR
+ "lwarx %[result]," _Q_VALUE "\n"
+ "xor. %[result], %[result], %[expectedValue]\n"
+ "bne $+12\n"
+- "stwcx. %[newValue],0,%[_q_value]\n"
++ "stwcx. %[newValue]," _Q_VALUE "\n"
+ "bne- $-16\n"
+ : [result] "=&r" (result),
+ _Q_VALUE_MEMORY_OPERAND
Added: trunk/packages/qt4-x11/debian/patches/22_fix_qiconvcodec.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/22_fix_qiconvcodec.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/22_fix_qiconvcodec.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -0,0 +1,68 @@
+--- a/src/corelib/codecs/qiconvcodec.cpp
++++ b/src/corelib/codecs/qiconvcodec.cpp
+@@ -83,6 +83,8 @@ static Ptr_iconv_close ptr_iconv_close =
+
+ QT_BEGIN_NAMESPACE
+
++extern bool qt_locale_initialized;
++
+ QIconvCodec::QIconvCodec()
+ : utf16Codec(0)
+ {
+@@ -182,8 +184,9 @@ QString QIconvCodec::convertToUnicode(co
+ }
+ } else {
+ QThreadStorage<QIconvCodec::IconvState *> *ts = toUnicodeState();
+- if (!ts) {
++ if (!qt_locale_initialized || !ts) {
+ // we're running after the Q_GLOBAL_STATIC has been deleted
++ // or before the QCoreApplication initialization
+ // bad programmer, no cookie for you
+ return QString::fromLatin1(chars, len);
+ }
+@@ -305,9 +308,14 @@ QByteArray QIconvCodec::convertFromUnico
+ #endif
+
+ QThreadStorage<QIconvCodec::IconvState *> *ts = fromUnicodeState();
+- if (!ts) {
++ if (!qt_locale_initialized || !ts) {
+ // we're running after the Q_GLOBAL_STATIC has been deleted
++ // or before the QCoreApplication initialization
+ // bad programmer, no cookie for you
++ if (!len)
++ // this is a special case - zero-sized string should be
++ // translated to empty but not-null QByteArray.
++ return QByteArray("");
+ return QString::fromRawData(uc, len).toLatin1();
+ }
+ IconvState *&state = ts->localData();
+@@ -384,8 +392,8 @@ QByteArray QIconvCodec::convertFromUnico
+ // fall through
+ case EINVAL:
+ {
+- ++inBytes;
+- --inBytesLeft;
++ inBytes += sizeof(QChar);
++ inBytesLeft -= sizeof(QChar);
+ break;
+ }
+ case E2BIG:
+--- a/src/corelib/kernel/qcoreapplication.cpp
++++ b/src/corelib/kernel/qcoreapplication.cpp
+@@ -163,6 +163,8 @@ void Q_CORE_EXPORT qt_call_post_routines
+ bool QCoreApplicationPrivate::is_app_running = false;
+ // app closing down if true
+ bool QCoreApplicationPrivate::is_app_closing = false;
++// initialized in qcoreapplication and in qtextstream autotest when setlocale is called.
++Q_AUTOTEST_EXPORT bool qt_locale_initialized = false;
+
+
+ Q_CORE_EXPORT uint qGlobalPostedEventsCount()
+@@ -440,6 +442,7 @@ void QCoreApplication::init()
+
+ #ifdef Q_OS_UNIX
+ setlocale(LC_ALL, ""); // use correct char set mapping
++ qt_locale_initialized = true;
+ #endif
+
+ #ifdef Q_WS_WIN
Modified: trunk/packages/qt4-x11/debian/patches/30_webkit_unaligned_access.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/30_webkit_unaligned_access.diff 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/patches/30_webkit_unaligned_access.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -14,7 +14,7 @@
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp
-@@ -1267,14 +1267,14 @@ static TCMalloc_Central_FreeListPadded c
+@@ -1936,13 +1936,13 @@ static TCMalloc_Central_FreeListPadded c
// Page-level allocator
static SpinLock pageheap_lock = SPINLOCK_INITIALIZER;
@@ -24,16 +24,15 @@
// Avoid extra level of indirection by making "pageheap" be just an alias
// of pageheap_memory.
-
typedef union {
- void* m_memory;
+ uint64_t* m_memory;
- TCMalloc_PageHeap m_pageHeap;
+ TCMalloc_PageHeap* m_pageHeap;
} PageHeapUnion;
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/ListHashSet.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/ListHashSet.h
-@@ -122,7 +122,7 @@ namespace WTF {
+@@ -127,7 +127,7 @@ namespace WTF {
: m_freeList(pool())
, m_isDoneWithInitialFreeList(false)
{
@@ -42,7 +41,7 @@
}
Node* allocate()
-@@ -166,7 +166,7 @@ namespace WTF {
+@@ -171,7 +171,7 @@ namespace WTF {
}
private:
@@ -51,7 +50,7 @@
Node* pastPool() { return pool() + m_poolSize; }
bool inPool(Node* node)
-@@ -177,10 +177,7 @@ namespace WTF {
+@@ -182,10 +182,7 @@ namespace WTF {
Node* m_freeList;
bool m_isDoneWithInitialFreeList;
static const size_t m_poolSize = 256;
@@ -65,8 +64,8 @@
template<typename ValueArg> struct ListHashSetNode {
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
-@@ -167,6 +167,23 @@
- #define WTF_PLATFORM_X86_64 1
+@@ -233,6 +233,23 @@
+ # endif
#endif
+/* PLATFORM(SPARC) */
@@ -89,32 +88,20 @@
/* Compiler */
/* COMPILER(MSVC) */
---- a/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h
-+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h
-@@ -355,8 +355,7 @@ namespace WTF {
- static const size_t m_inlineBufferSize = inlineCapacity * sizeof(T);
- T* inlineBuffer() { return reinterpret_cast<T*>(&m_inlineBuffer); }
+--- a/src/3rdparty/webkit/WebCore/platform/text/AtomicString.cpp
++++ b/src/3rdparty/webkit/WebCore/platform/text/AtomicString.cpp
+@@ -101,7 +101,7 @@ static inline bool equal(StringImpl* str
+ if (string->length() != length)
+ return false;
-- // FIXME: Nothing guarantees this buffer is appropriately aligned to hold objects of type T.
-- char m_inlineBuffer[m_inlineBufferSize];
-+ uint64_t m_inlineBuffer[(m_inlineBufferSize + sizeof(uint64_t) - 1) / sizeof(uint64_t)];
- };
-
- template<typename T, size_t inlineCapacity = 0>
---- a/src/3rdparty/webkit/WebCore/platform/AtomicString.cpp
-+++ b/src/3rdparty/webkit/WebCore/platform/AtomicString.cpp
-@@ -104,7 +104,7 @@ struct UCharBufferTranslator {
- if (strLength != bufLength)
- return false;
-
-#if PLATFORM(ARM)
+#if PLATFORM(ARM) || PLATFORM(SPARC)
- const UChar* strChars = str->characters();
- const UChar* bufChars = buf.s;
-
---- a/src/3rdparty/webkit/WebCore/platform/StringHash.h
-+++ b/src/3rdparty/webkit/WebCore/platform/StringHash.h
-@@ -44,6 +44,15 @@ namespace WTF {
+ const UChar* stringCharacters = string->characters();
+ for (unsigned i = 0; i != length; ++i) {
+ if (*stringCharacters++ != *characters++)
+--- a/src/3rdparty/webkit/WebCore/platform/text/StringHash.h
++++ b/src/3rdparty/webkit/WebCore/platform/text/StringHash.h
+@@ -47,6 +47,15 @@ namespace WebCore {
if (aLength != bLength)
return false;
@@ -130,11 +117,11 @@
const uint32_t* aChars = reinterpret_cast<const uint32_t*>(a->characters());
const uint32_t* bChars = reinterpret_cast<const uint32_t*>(b->characters());
-@@ -56,6 +65,7 @@ namespace WTF {
+@@ -59,6 +68,7 @@ namespace WebCore {
return false;
return true;
+#endif
}
- };
-
+
+ static unsigned hash(const RefPtr<StringImpl>& key) { return key->hash(); }
Modified: trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,6 +1,6 @@
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -72,14 +72,7 @@ class QLibraryInfoPrivate
+@@ -71,14 +71,7 @@ class QLibraryInfoPrivate
{
public:
static QSettings *findConfiguration();
@@ -16,7 +16,7 @@
static QSettings *configuration()
{
#ifdef QT_NO_THREAD
-@@ -98,6 +91,15 @@ public:
+@@ -97,6 +90,15 @@ public:
}
};
@@ -34,7 +34,7 @@
settings = QLibraryInfoPrivate::findConfiguration();
--- a/src/corelib/tools/qhash.h
+++ b/src/corelib/tools/qhash.h
-@@ -493,7 +493,7 @@ Q_INLINE_TEMPLATE void QHash<Key, T>::de
+@@ -492,7 +492,7 @@ Q_INLINE_TEMPLATE void QHash<Key, T>::de
}
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 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -2,11 +2,11 @@
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
-@@ -6,6 +6,7 @@ DEFINES += QT_NO_USING_NAMESPACE
- win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x63000000
- solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
+@@ -53,6 +53,7 @@ contains(QT_CONFIG, opengles2) {
+ gl2paintengineex/qpaintengineex_opengl2_p.h
+ }
+QMAKE_CXXFLAGS_HIDESYMS -= -fvisibility-inlines-hidden
- include(../qbase.pri)
-
+ x11 {
+ contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles1cl)|contains(QT_CONFIG, opengles2) {
Modified: trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -4,7 +4,7 @@
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
-@@ -204,6 +204,12 @@ namespace QT_NAMESPACE {}
+@@ -208,6 +208,12 @@ namespace QT_NAMESPACE {}
# 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
-@@ -224,8 +230,6 @@ namespace QT_NAMESPACE {}
+@@ -228,8 +234,6 @@ namespace QT_NAMESPACE {}
# define Q_OS_AIX
#elif defined(__Lynx__)
# define Q_OS_LYNX
@@ -28,7 +28,7 @@
#elif defined(__QNXNTO__)
--- a/src/corelib/plugin/qlibrary.cpp
+++ b/src/corelib/plugin/qlibrary.cpp
-@@ -286,13 +286,13 @@ static bool qt_parse_pattern(const char
+@@ -285,13 +285,13 @@ static bool qt_parse_pattern(const char
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(QT_NO_PLUGIN_CHECK)
@@ -46,7 +46,7 @@
const char *pattern, ulong p_len)
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/tools/qlocale.cpp
-@@ -74,7 +74,7 @@ QT_END_NAMESPACE
+@@ -73,7 +73,7 @@ QT_END_NAMESPACE
#include <qdebug.h>
#include <time.h>
@@ -55,7 +55,7 @@
# include <fenv.h>
#endif
-@@ -6253,7 +6253,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
+@@ -6536,7 +6536,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
_control87(MCW_EM, MCW_EM);
#endif
@@ -64,7 +64,7 @@
fenv_t envp;
feholdexcept(&envp);
#endif
-@@ -6269,7 +6269,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
+@@ -6552,7 +6552,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
#endif //_M_X64
#endif //Q_OS_WIN
Modified: trunk/packages/qt4-x11/debian/patches/71_hppa_unaligned_access_fix_458133.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/71_hppa_unaligned_access_fix_458133.diff 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/patches/71_hppa_unaligned_access_fix_458133.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -4,7 +4,7 @@
--- a/src/3rdparty/sha1/sha1.cpp
+++ b/src/3rdparty/sha1/sha1.cpp
-@@ -145,10 +145,10 @@ static inline void sha1ProcessChunk(Sha1
+@@ -144,10 +144,10 @@ static inline void sha1ProcessChunk(Sha1
quint32 d = state->h3;
quint32 e = state->h4;
@@ -18,7 +18,7 @@
for (int i = 0; i < 16; ++i)
chunk->words[i] = qFromBigEndian(chunk->words[i]);
-@@ -184,7 +184,7 @@ static inline void sha1ProcessChunk(Sha1
+@@ -183,7 +183,7 @@ static inline void sha1ProcessChunk(Sha1
// Wipe variables
#ifdef SHA1_WIPE_VARIABLES
a = b = c = d = e = 0;
Modified: trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff 2009-02-20 20:24:25 UTC (rev 13852)
@@ -2,7 +2,7 @@
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
-@@ -60,6 +60,10 @@
+@@ -59,6 +59,10 @@
QT_BEGIN_NAMESPACE
Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/patches/series 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,25 +1,13 @@
# qt-copy patches
-0167-fix-group-reading.diff
0180-window-role.diff
0195-compositing-properties.diff
-0203-qtexthtmlparser-link-color.diff
0209-prevent-qt-mixing.diff
0216-allow-isystem-for-headers.diff
-0224-fast-qpixmap-fill.diff
0225-invalidate-tabbar-geometry-on-refresh.patch
-0226-qtreeview-column_resize_when_needed.diff
0234-fix-mysql-threaded.diff
-0238-fix-qt-qttabbar-size.diff
0245-fix-randr-changes-detecting.diff
-0248-fix-qwidget-scroll-slowness.diff
-0249-webkit-stale-frame-pointer.diff
-0254-fix-qgraphicsproxywidget-deletion-crash.diff
0255-qtreeview-selection-columns-hidden.diff
-0256-fix-recursive-backingstore-sync-crash.diff
-0257-qurl-validate-speedup.diff
-0260-fix-qgraphicswidget-deletionclearFocus.diff
-0261-sync-before-reset-errorhandler.patch
-0262-fix-treeview-animation-crash.diff
+0273-odbc-64bit-compile.diff
# debian patches
01_qmake_for_debian.diff
@@ -30,12 +18,15 @@
07_trust_dpkg-arch_over_uname-m.diff
09_qmake_lflags_as-needed.diff
10_config_tests_fixes.diff
-12_fix_qmake_pkgconfig.diff
14_add_libraries_to_gui_build_where_actually_needed.diff
15_fix_qmake_makefile_generation.diff
16_hide_std_symbols_on_qtwebkit.diff
17_add_postgresql_8.3_support.diff
-20_mips_atomic_ops.diff
+18_enable_qt3support_qtwebkit_debug_info.diff
+19_install_qdoc3.diff
+20_fix_ftbfs_callgrindChildExitCode.diff
+21_fix_ppc_build.diff
+22_fix_qiconvcodec.diff
30_webkit_unaligned_access.diff
40_alpha_ice.diff
41_disable_opengl_visibility.diff
Modified: trunk/packages/qt4-x11/debian/qt4-demos.install
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-demos.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/qt4-demos.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -6,4 +6,3 @@
usr/lib/qt4/plugins/designer/libcustomwidgetplugin.so
usr/lib/qt4/plugins/designer/libtaskmenuextension.so
usr/lib/qt4/plugins/designer/libworldtimeclockplugin.so
-
Modified: trunk/packages/qt4-x11/debian/qt4-demos.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-demos.lintian 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/qt4-demos.lintian 2009-02-20 20:24:25 UTC (rev 13852)
@@ -3,6 +3,16 @@
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/boxes/cubemap_negx.jpg
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/boxes/cubemap_negy.jpg
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/boxes/cubemap_negz.jpg
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/boxes/cubemap_posx.jpg
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/boxes/cubemap_posy.jpg
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/boxes/cubemap_posz.jpg
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/boxes/qt-logo.jpg
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/boxes/qt-logo.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/boxes/smiley.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/boxes/square.jpg
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
@@ -12,10 +22,16 @@
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/composition/flower.jpg
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/composition/flower_alpha.jpg
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/embeddeddialogs/No-Ones-Laughing-3.jpg
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/mainwindow/titlebarCenter.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/mainwindow/titlebarLeft.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/mainwindow/titlebarRight.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
@@ -98,6 +114,22 @@
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/demos/undo/icons/background.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/undo/icons/blue.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/undo/icons/circle.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/undo/icons/exit.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/undo/icons/fileclose.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/undo/icons/filenew.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/undo/icons/fileopen.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/undo/icons/filesave.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/undo/icons/green.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/undo/icons/ok.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/undo/icons/rectangle.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/undo/icons/red.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/undo/icons/redo.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/undo/icons/remove.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/undo/icons/triangle.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/undo/icons/undo.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
@@ -106,9 +138,18 @@
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/classwizard/images/background.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/dialogs/classwizard/images/banner.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/dialogs/classwizard/images/logo1.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/dialogs/classwizard/images/logo2.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/dialogs/classwizard/images/logo3.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/dialogs/classwizard/images/watermark1.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/dialogs/classwizard/images/watermark2.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/dialogs/licensewizard/images/logo.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/dialogs/licensewizard/images/watermark.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
@@ -301,6 +342,16 @@
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/help/remotecontrol/enter.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/help/simpletextviewer/documentation/images/browse.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/help/simpletextviewer/documentation/images/fadedfilemenu.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/help/simpletextviewer/documentation/images/filedialog.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/help/simpletextviewer/documentation/images/handbook.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/help/simpletextviewer/documentation/images/icon.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/help/simpletextviewer/documentation/images/mainwindow.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/help/simpletextviewer/documentation/images/open.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/help/simpletextviewer/documentation/images/wildcard.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/ipc/sharedmemory/image.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
@@ -329,6 +380,7 @@
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/securesocketclient/encrypted.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
@@ -340,9 +392,11 @@
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/designer.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/designer.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
@@ -356,6 +410,18 @@
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/painting/pixmapfilters/images/checker.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/painting/pixmapfilters/images/qt-logo.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/sql/drilldown/images/beijing.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/sql/drilldown/images/berlin.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/sql/drilldown/images/brisbane.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/sql/drilldown/images/munich.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/sql/drilldown/images/oslo.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/sql/drilldown/images/redwood.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/sql/drilldown/logo.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/sql/masterdetail/images/icon.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/sql/masterdetail/images/image.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/tools/undoframework/images/cross.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
@@ -367,6 +433,9 @@
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/qt_extended_16x16.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/icons/images/qt_extended_32x32.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/icons/images/qt_extended_48x48.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
@@ -377,7 +446,38 @@
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/stylesheet/images/checkbox_checked.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/checkbox_checked_hover.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/checkbox_checked_pressed.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/checkbox_unchecked.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/checkbox_unchecked_hover.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/checkbox_unchecked_pressed.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/down_arrow.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/down_arrow_disabled.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/frame.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/pagefold.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/pushbutton.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/pushbutton_hover.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/pushbutton_pressed.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/radiobutton_checked.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/radiobutton_checked_hover.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/radiobutton_checked_pressed.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/radiobutton_unchecked.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/radiobutton_unchecked_hover.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/radiobutton_unchecked_pressed.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/sizegrip.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/spindown.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/spindown_hover.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/spindown_off.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/spindown_pressed.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/spinup.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/spinup_hover.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/spinup_off.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/spinup_pressed.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/up_arrow.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/stylesheet/images/up_arrow_disabled.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
-
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/validators/ledoff.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/widgets/validators/ledon.png
Modified: trunk/packages/qt4-x11/debian/qt4-dev-tools.install
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-dev-tools.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/qt4-dev-tools.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,9 +1,11 @@
usr/bin/assistant-qt4
usr/bin/assistant_adp
+usr/bin/lconvert
usr/bin/linguist-qt4
usr/bin/pixeltool
usr/bin/qcollectiongenerator
usr/bin/qdbusviewer
+usr/bin/qdoc3
usr/bin/qhelpconverter
usr/bin/qhelpgenerator
usr/bin/xmlpatterns
@@ -15,11 +17,11 @@
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/assistant_zh_CN.qm
-usr/share/qt4/translations/assistant_zh_TW.qm
+# Disable for unofficial release like snapshots
+#usr/share/qt4/translations/assistant_zh_CN.qm
+#usr/share/qt4/translations/assistant_zh_TW.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-html.doc-base
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-doc-html.doc-base 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/qt4-doc-html.doc-base 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,10 +1,10 @@
Document: qt4-doc-html
Title: Qt4 Reference Documentation
-Author: Trolltech AS
+Author: Nokia Corporation
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: Applications/programming
Format: HTML
Index: /usr/share/doc/qt4-doc-html/html/index.html
Modified: trunk/packages/qt4-x11/debian/qt4-doc-html.install
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-doc-html.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/qt4-doc-html.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,2 +1 @@
usr/share/qt4/doc/html
-
Modified: trunk/packages/qt4-x11/debian/qt4-doc.install
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-doc.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/qt4-doc.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1,3 +1,2 @@
usr/share/qt4/doc/qch
usr/share/qt4/doc/src
-
Modified: trunk/packages/qt4-x11/debian/qt4-qmake.install
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-qmake.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/qt4-qmake.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1 +1,2 @@
usr/bin/qmake-qt4
+usr/share/qt4/mkspecs/*
Modified: trunk/packages/qt4-x11/debian/qt4-qmake.links
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-qmake.links 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/qt4-qmake.links 2009-02-20 20:24:25 UTC (rev 13852)
@@ -1 +1,2 @@
usr/bin/qmake-qt4 usr/share/qt4/bin/qmake
+usr/share/qt4/mkspecs/linux-g++ usr/share/qt4/mkspecs/default
Modified: trunk/packages/qt4-x11/debian/qt4-qtconfig.install
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-qtconfig.install 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/qt4-qtconfig.install 2009-02-20 20:24:25 UTC (rev 13852)
@@ -2,4 +2,3 @@
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 2009-02-20 09:16:30 UTC (rev 13851)
+++ trunk/packages/qt4-x11/debian/rules 2009-02-20 20:24:25 UTC (rev 13852)
@@ -4,9 +4,11 @@
export PATH := $(QTDIR)/bin:$(PATH)
# workaround to use lrelease.
export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH)
+# workaround to use qhelpgenerator
+export QT_PLUGIN_PATH := $(QTDIR)/plugins
QTVERSION := $(shell ls changes-* | cut -f2 -d '-')
-CURRENTVERSION := $(shell head -1 debian/changelog | sed 's/[^(]*(\([^)]*\)).*/\1/')
+CURRENTVERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/makefile.mk
@@ -26,21 +28,18 @@
# Shlibs of the current upstream version
#DEB_DH_MAKESHLIBS_ARGS_ALL := -V
# Specific shlibs version
-SHLIBSVERSION := 4.4.3
+SHLIBSVERSION := 4.5.0
$(foreach libpkg,$(filter-out %-dev %-dbg,$(filter lib%,$(DEB_ARCH_PACKAGES))),$(eval DEB_DH_MAKESHLIBS_ARGS_$(libpkg) := -V'$(libpkg) (>= $(SHLIBSVERSION))'))
DEB_DH_STRIP_ARGS_libqt4-dbg := --exclude=.debug
DEB_DH_SHLIBDEPS_ARGS_ALL := --exclude=.debug
-DEB_INSTALL_CHANGELOGS_ALL := changes-$(QTVERSION)
+# Disable for rc
+#DEB_INSTALL_CHANGELOGS_ALL := changes-$(QTVERSION)
DEB_INSTALL_DOCS_ALL := GPL_EXCEPTION_ADDENDUM.TXT
-# Disable Qt Eclipse Integration for C++.
-# TODO: Fix it as it breaks current code.
-#EXTRA_CONFIGURE_OPTS += -qtnamespace QtCppIntegration -qtlibinfix CppIntegration
-
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
@@ -62,6 +61,14 @@
debian/stamp-makefile-build-tools: debian/stamp-makefile-build
$(MAKE) sub-tools
+ # Test current version is a snapshot
+ifeq (snapshot, $(findstring snapshot, $(CURRENTVERSION)))
+ # Build documentations
+ $(MAKE) docs
+ # Workaround: It's a known qmake limitation.
+ # It can't generate install rules for files that don't exist yet like docs.
+ ./config.status
+endif
touch $@
common-configure-arch:: config.status
@@ -129,7 +136,7 @@
clean::
# Extra stuff missed by confclean/distclean
-
+
# Misc. files
rm -f \
config.status \
@@ -138,16 +145,17 @@
mkspecs/qconfig.pri \
src/corelib/global/qconfig.* \
;
-
+
# Misc. directories
rm -rf \
+ doc-build/ \
examples/tools/plugandpaint/plugins/ \
examples/tools/styleplugin/styles/ \
lib/ \
mkspecs/glibc-g++/ \
plugins/ \
;
-
+
# hppa test directory
rm -rf debian/hppa-tmp
@@ -165,7 +173,7 @@
-o -name release-static \
-o -name .uic \
\) -print0 | xargs -0 rm -rf
-
+
# Leftover files and all symlinks
find \( -false \
-o -name \*.a \
@@ -177,14 +185,14 @@
-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 \
@@ -200,8 +208,6 @@
-exec perl -pi -e "s, -L$(CURDIR)/?\S+,,g" {} \;
# Fix wrong path in prl files
find $(DEB_DESTDIR)/usr/lib -type f -name '*.prl' \
- -exec perl -pi -e "s, -L$(CURDIR)/\S+,,g" {} \;
- find $(DEB_DESTDIR)/usr/lib -type f -name '*.prl' \
-exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/" {} \;
install/libqtcore4::
More information about the pkg-kde-commits
mailing list