[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.6.0-1-33-g9e397a0

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 9e397a0b4d884deccc525f25ef278f1583651d13
Merge: 5f2b89ead53825024e363957cbff46c7c5baeaba f685fa60ce954aab8c4cdd8016c2c984dc5606ee
Author: Fathi Boudra <fabo at debian.org>
Date:   Sat Jan 30 19:32:13 2010 +0100

    Merge branch 'experimental-snapshots'
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog                                   |   94 +-
 debian/control                                     |   39 +-
 debian/libphonon-dev.install                       |   88 +-
 ...honon4.lintian => libphonon4.lintian-overrides} |    0
 ....lintian => libqt4-assistant.lintian-overrides} |    0
 debian/libqt4-dbg.install                          |   34 -
 debian/libqt4-dbg.lintian                          |   95 -
 ...-dbus.lintian => libqt4-dbus.lintian-overrides} |    0
 ...r.lintian => libqt4-designer.lintian-overrides} |    0
 debian/libqt4-dev.install                          |  456 ++-
 ...t4-dev.lintian => libqt4-dev.lintian-overrides} |    0
 debian/libqt4-help.install                         |    2 +-
 ...-help.lintian => libqt4-help.lintian-overrides} |    0
 debian/libqt4-multimedia.install                   |    1 +
 debian/libqt4-multimedia.lintian-overrides         |    1 +
 ...rk.lintian => libqt4-network.lintian-overrides} |    0
 debian/libqt4-opengl-dev.install                   |   11 +-
 ...ngl.lintian => libqt4-opengl.lintian-overrides} |    0
 ...lintian => libqt4-qt3support.lintian-overrides} |    0
 ...ipt.lintian => libqt4-script.lintian-overrides} |    0
 ...intian => libqt4-scripttools.lintian-overrides} |    0
 debian/libqt4-sql-tds.install                      |    1 +
 ...t4-sql.lintian => libqt4-sql.lintian-overrides} |    0
 ...t4-svg.lintian => libqt4-svg.lintian-overrides} |    0
 ...-test.lintian => libqt4-test.lintian-overrides} |    0
 debian/libqt4-webkit-dbg.install                   |    2 -
 debian/libqt4-webkit-dbg.lintian                   |    5 -
 ...kit.lintian => libqt4-webkit.lintian-overrides} |    0
 ...t4-xml.lintian => libqt4-xml.lintian-overrides} |    0
 debian/libqt4-xmlpatterns-dbg.install              |    1 -
 debian/libqt4-xmlpatterns-dbg.lintian              |    3 -
 ...intian => libqt4-xmlpatterns.lintian-overrides} |    0
 debian/libqtcore4.install                          |    3 +-
 ...tcore4.lintian => libqtcore4.lintian-overrides} |    0
 debian/libqtcore4.symbols                          | 4662 ++++++++++++++++++++
 debian/libqtgui4.install                           |    1 +
 ...bqtgui4.lintian => libqtgui4.lintian-overrides} |    0
 debian/not-installed                               |   30 +-
 ...ions-in-qeventloop-qtimer-and-qsocketnoti.patch |  278 --
 debian/patches/0180-window-role.diff               |   22 +-
 debian/patches/0195-compositing-properties.diff    |    6 +-
 debian/patches/01_qmake_for_debian.diff            |    4 +-
 debian/patches/0209-prevent-qt-mixing.diff         |    6 +-
 debian/patches/0216-allow-isystem-for-headers.diff |    4 +-
 ...225-invalidate-tabbar-geometry-on-refresh.patch |    2 +-
 .../0255-qtreeview-selection-columns-hidden.diff   |   47 -
 debian/patches/0274-shm-native-image-fix.diff      |   85 -
 ...280-deserialization-custom-dbus-properties.diff |   49 -
 debian/patches/0287-qmenu-respect-minwidth.diff    |   26 -
 debian/patches/0288-more-x-keycodes.diff           |  651 ---
 debian/patches/0289-context-for-shortcuts-tr.diff  |    8 +-
 debian/patches/05_append_qt4_target.diff           |   59 +-
 .../patches/07_trust_dpkg-arch_over_uname-m.diff   |    2 +-
 debian/patches/08_configure_quilt_compat.diff      |    2 +-
 debian/patches/09_qmake_lflags_as-needed.diff      |    4 +-
 debian/patches/11_build_translations.diff          |  175 +-
 .../patches/12_add_nostrip_for_debug_packages.diff |   16 +
 ...braries_to_gui_build_where_actually_needed.diff |   23 -
 .../patches/15_fix_qmake_makefile_generation.diff  |    2 +-
 .../patches/16_hide_std_symbols_on_qtwebkit.diff   |    6 +-
 debian/patches/17_add_postgresql_8.3_support.diff  |    6 +-
 .../18_enable_qt3support_qtwebkit_debug_info.diff  |   15 +-
 debian/patches/19_install_qdoc3.diff               |   20 -
 debian/patches/20_install_qvfb.diff                |   13 +
 debian/patches/30_webkit_unaligned_access.diff     |   12 +-
 debian/patches/40_alpha_ice.diff                   |   22 +-
 debian/patches/41_disable_opengl_visibility.diff   |   10 +-
 debian/patches/50_kfreebsd_build_fix.diff          |   14 +-
 debian/patches/51_kfreebsd_strnstr_build_fix.diff  |   15 +
 debian/patches/80_hurd_max_path.diff               |   26 +-
 debian/patches/81_hurd_clock_gettime.diff          |   20 -
 debian/patches/91_s390_-gstabs.diff                |    2 +-
 debian/patches/92_armel_gcc43_valist_compat.diff   |   89 +
 debian/patches/95_sparc_platform_definition.diff   |   23 +
 debian/patches/96_powerpc_no_gc_sections.diff      |   16 +
 debian/patches/series                              |   17 +-
 debian/phonon-dbg.install                          |    2 -
 debian/phonon-dbg.lintian                          |    5 -
 debian/qt4-demos-dbg.install                       |  221 -
 debian/qt4-demos-dbg.lintian                       |  229 -
 ...4-demos.lintian => qt4-demos.lintian-overrides} |   53 +-
 debian/qt4-designer.install                        |    3 +-
 debian/qt4-dev-tools.install                       |   11 +-
 debian/qt4-doc-html.doc-base                       |    2 +-
 debian/qt4-qtconfig.install                        |    1 -
 debian/rules                                       |  212 +-
 86 files changed, 5805 insertions(+), 2260 deletions(-)

-- 
Qt 4 Debian packaging