-
Committer:
Felix Geyer
-
Date:
2011-05-31 14:09:36 UTC
-
Revision ID:
debfx@fobos.de-20110531140936-wnm74mkv8l5gbnhj
Tags: 4:4.7.3-1ubuntu1
* Merge from Debian unstable, remaining changes:
- Do not package ibase/firebird package, remove from debian/rules and
debian/control
- libqt4-sql-ibase not recommend for libqt4-sql
- build with -no-phonon
- do not build libqt4-phonon, disable in debian/control
- Build packages with lzma compression using the dh addon from pkg-kde-tools
- 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
- Make libqt4-dev depend on libx11-dev
- In debian/rules: configure with "-arch armv6" option on armel
- Add and install Trolltech.conf in libqtcore4.install
- Build QtWebkit and use it only for QtAssistant
+ Rule to put qt_webkit_version.pri in mkspecs/modules
+ Rule to remove libQtWebKit* after build
+ Exclude usr/bin/assistant-qt4 from dh_shlibdeps
- Fix Lucid upgrades: libqt4-help breaks/replaces libqtcore4 (<< 4:4.7.0)
- Change OpenGL backend from GL to GLES 2 for ARM
+ Build-depend and make libqt4-opengl-dev depend on libgles2-mesa-dev
instead of libgl1-mesa-dev and libglu1-mesa-dev
+ Pass "-opengl es2" to configure
* Drop kubuntu_23_syncqt_no_timestamp_change.diff, replaced by
02_syncqt_sane_timestamp_for_nonexisting_headers.diff.
* Drop kubuntu_02_neon_flags.patch, replaced by 95_neon_flags.patch.
* Disable x-0003-Use-GCC-intrinsics-for-armv6-atomic-operations.patch as
we use kubuntu_23_arm_memory_barriers.patch instead.
* Drop appmenu-qt from libqtgui4's Recommends since indicator-appmenu
recommends it.
* Drop kubuntu_30_blacklist_ssl_certificates.diff, applied upstream.
* Update Vcs links as the branch is owned by kubuntu-packagers now.