lp://qastaging/ubuntu/lucid/qt4-x11

Created by James Westby and last modified
Get this branch:
bzr branch lp://qastaging/ubuntu/lucid/qt4-x11
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Ubuntu branches
Review team:
Ubuntu Development Team
Status:
Development

Recent revisions

103. By Alessandro Ghersi

[ Alessandro Ghersi ]
* Update applications icons (LP: #350312)
* Fix watch file to report only stable versions
* Sync patches with Debian:
  - 02_launch_assistant-qt4.diff
  - 10_config_tests_fixes.diff
  - 15_fix_qmake_makefile_generation.diff
  - 16_hide_std_symbols_on_qtwebkit.diff
  - 40_alpha_ice.diff
* Fix qdbus.1 manpage
* Sync desktop files with Debian to fix lintian warning
* Fix lintian warning: binary-control-field-duplicates-source
* Add upstream patch 0002_qmake_qfileinfo_absolutepath.diff
  - Fixed QFileInfo::absolutePath() warning when running "qmake -project"
    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=%23574043

[ Jonathan Thomas ]
* Update upstream's libphonon patch. This will correct build system issues
  that caused both the PulseAudio integration to fail as well as the
  libphonon version to be under-reported (LP: #557514)

102. By Anthony Mercatante

[ Alessandro Ghersi ]
* Drop 90_ia64_opts.diff, is obsolete, fixed in gcc now

[ Anthony Mercatante ]
* Added kubuntu_06_qdnd_x11_cursor.diff:
  - Use X11 theme for drag and drop icons
  - Closes LP: #280113

101. By Roderick B. Greening

[ Jonathan Thomas ]
* Update kubuntu_07_phonon_4.3.80.diff, patches Qt's libphonon to Phonon
  4.4.0

[ Alessandro Ghersi ]
* Add cherry-picked patch 0001_qpixmap_load_no_modify_referenced_copies.diff
  from upstream (sync with Debian)
* Rename kubuntu_07_phonon_4.3.80.diff to kubuntu_07_phonon_4.4.0.diff
* qt4-dev-tools replaces libqtcore4 (<< 4:4.6.2) (LP: #544688)

[ Michael Vogt ]
* debian/control:
  - fix missing Replaces in phonon-dbg (LP: #546024)

[ Roderick B. Greening ]
* Release 4:4.6.2-0ubuntu3

100. By Matthias Klose

[ Matthias Klose ]
* 90_ia64_opts.diff: Build with -Os on ia64, to work around
  PR target/43348. LP: #531697.
* debian/rules (clean): Use find/xargs for a small speedup.

[ Kees Cook ]
* Add kubuntu_12_fix_stack_protector.diff: restore the stack protector
  compiler flag (LP: #538237).

99. By Alessandro Ghersi

[ Jonathan Riddell ]
* New upstream release
* Update kubuntu_07_phonon_4.3.80.diff
* Update 05_append_qt4_target.diff

[ Alessandro Ghersi ]
* Update patches:
  - 0180-window-role.diff
  - 15_fix_qmake_makefile_generation.diff
  - 18_enable_qt3support_qtwebkit_debug_info.diff
  - 81_hurd_architecture.diff
  - 82_hurd_SA_SIGINFO.diff
  - 96_powerpc_no_gc_sections.diff
* Sync 92_armel_gcc43_valist_compat.diff with Debian
* Add kubuntu_11_fix_main_window_without_central_widget.diff (LP: #515132)
  (backport from Qt 4.6.3)
* In libqt4-dbg add conflicts with qt-x11-free-dbg (LP: #517263)
* qt4-dev-tools replaces libqt4-core (<= 4.5.3really4.5.2-0ubuntu1)
  (LP: #527534)
* Sync manpages/qdbus.1 with Debian
  - Update libqt4-dev.manpages
* qt4-dev-tools conflicts with qt3-dev-tools-embedded
* qt4-dev-tools suggests qt4-doc-html
* Update all symbol files
* Bump build dependency of debhelper and pkg-kde-tools to version 0.6.4 as it
  is needed to handle symbol files and build with pkgkde symbolshelper and
  parallel addon
* Call dh_auto_build instead of $(MAKE) for parallel build
* In override_dh_makeshlibs: do not FTBS if there are lost symbols
* Drop rules to generating libphonon4 symbols, no longer need

98. By Alessandro Ghersi

Fix kubuntu_04_qt_ia32_library_path.patch to use QLatin1String
fix ftbs on i386

97. By Alessandro Ghersi

[ Alessandro Ghersi ]
* New upstream release
  - Phonon stuff:
    - In libphonon-dev.install install headers in the right place to build
      KDE with phonon support
  - Refresh patches:
    - 96_powerpc_no_gc_sections.diff
    - 0180-window-role.diff
    - 0216-allow-isystem-for-headers.diff
    - 05_append_qt4_target.diff
    - 07_trust_dpkg-arch_over_uname-m.diff
    - 08_configure_quilt_compat.diff
    - 09_qmake_lflags_as-needed.diff
    - 12_add_nostrip_for_debug_packages.diff
    - 18_enable_qt3support_qtwebkit_debug_info.diff
    - 20_install_qvfb.diff
    - 30_webkit_unaligned_access.diff
    - 40_alpha_ice.diff
    - 92_armel_gcc43_valist_compat.diff
    - 95_sparc_platform_definition.diff
    - 96_powerpc_no_gc_sections.diff
    - kubuntu_04_qt_ia32_library_path.patch
    - kubuntu_09_use_ft_glyph_embolden_to_fake_bold.diff
    - kubuntu_07_phonon_4.3.80.diff
  - Remove patches merged upstream:
    - 93_jsvalue64_on_ia64.diff
    - 94_fix_crash_in_qdbuspendingreply_qdbusreply.diff
    - 97_prevent_crash_on_inputcontext_creation.diff
* Merge with Debian git remaining changes:
  - Do not package firebird and ibase packages, remove from debian/rules and
    debian/control
  - libqt4-sql-ibase not recommend for libqt4-sql
  - libqt4-gui: suggest, not recommend, qt4-qtconfig
  - libphonon and libphonon-dev replace libqt4-phonon{,-dev}
  - libphonon replaces libqt4-phonon-dev (<= 4.5.3really4.5.2-0ubuntu1),
    usr/lib/qt4/plugins/designer/libphononwidgets.so was moved from
    libqt4-phonon-dev
  - libqt4-phonon-dev replaces libphonon-dev (<= 4:4.3.1-1ubuntu1)
  - libqt4-phonon-dbg replaces phonon-dbg (<= 4:4.3.1-4ubuntu1)
  - Install various extra headers in libqt4-opengl-dev.install and
    libqt4-dev.install
  - Build packages with lzma compression
  - Add links from /usr/share/qt4/lib/ to /usr/lib for Qt libraries
    needed for Qt Jambi in debian/rules
  - Rules to remove po dir in clean
  - Add MessagesQt.sh
  - Rules to create Messages.sh link to MessagesQt.sh and rules to create po
    dir and exectue extract-messages.sh in common-install-prehook-impl
  - Rules to remove Messages.sh link
  - Make libqt4-dev depend on libx11-dev
  - Add libpulse-dev to build-depends
  - In debian/rules Set DEB_HOST_ARCH and DEB_HOST_ARCH_OS.
    Configure with "-arch armv6" option on ARM
  - Keep Kubuntu patches:
    - kubuntu_04_qt_ia32_library_path.patch
    - kubuntu_07_phonon_4.3.95.diff
    - kubuntu_08_add_missing_bold_style.diff
    - kubuntu_09_use_ft_glyph_embolden_to_fake_bold.diff

[ Zhengpeng Hou ]
* Add kubuntu_08_add_missing_bold_style.diff and
  kubuntu_09_use_ft_glyph_embolden_to_fake_bold.diff
  to make qt support bold style CJK fonts

[ Jonathan Riddell ]
* Add kubuntu_10_ibus_input_method.diff to change default input method

96. By Jonathan Riddell

* Add patch kubuntu_05_powerpc_build.diff to fix build on powerpc,
  apply in debian/rules
* Rename 93_jsvalue64_on_ia64.diff to kubuntu_06_jsvalue64_on_ia64.diff
* Rename updated-phonon.diff to kubuntu_07_phonon_4.3.80.diff

95. By Scott Kitterman

Add missing #endif to debian/patches/93_jsvalue64_on_ia64.diff

94. By Steve Langasek

* debian/patches/92_powerpc_no_gc_sections.diff: Don't pass
  -Wl,--gc-sections on powerpc when building libQtWebKit.so; works around
  a binutils bug that results in a segfault.
* debian/patches/93_jsvalue64_on_ia64.diff: make sure we're setting
  WTF_USE_JSVALUE64 on ia64, as in previous releases.
* fix override_dh_clean target to not *completely bypass* dh_clean

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp://qastaging/ubuntu/maverick/qt4-x11
This branch contains Public information 
Everyone can see this information.

Subscribers