-
Committer:
Dmitry Shachnev
-
Date:
2014-04-25 10:22:59 UTC
-
Revision ID:
mitya57@ubuntu.com-20140425102259-3yy1pvpk2zhqwb72
* Merge from Debian unstable. Remaining changes:
- Pass list-missing to dh_install instead of fail-missing, since we don't
install the QtWebkit headers
- Make sure libqt4-opengl-dev depends on gles libs for armel and armhf
- Do not package ibase/firebird and sqlite2 package
+ remove from debian/control
+ libqt4-sql doesn't recommend libqt4-sql-ibase and libqt4-sql-sqlite2
- 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
- Also exclude webkit examples from dh_shlibdeps
- Do not build libqt4-phonon, disable in debian/control
- Add debian/Trolltech.conf and install it in libqtcore4.install
- On armel and armhf, build with -gstabs instead of -g in an effort to get
the link step for QtWebkit to complete before timed out by the builders
- Build with -no-neon on armel and armhf
- Build with -no-javascript-jit on arm64
- Install qatomic_aarch64.h
- Add patches:
+ kubuntu_10_ibus_input_method.diff
+ kubuntu_12_fix_stack_protector.diff
+ kubuntu_14_systemtrayicon.diff
+ kubuntu_17_enable_qtwebkit_for_qtassistant.diff
+ kubuntu_28_xi2.1.patch
+ kubuntu_30_translucent_drag_pixmap.diff
+ kubuntu_31_unity_workarea_atom.diff
+ kubuntu_37_cups_settings.diff
+ kubuntu_39_fix_medium_font.diff
+ kubuntu_40_disable_neon.patch
+ kubuntu_93_disable_overlay_scrollbars.diff
+ kubuntu_94_xinput_valuators_fix.diff
+ kubuntu_95_qt_disable_bounce.diff
+ kubuntu_97_a11y_qt_and_qml_backport.diff
+ kubuntu_glib-honor-ExcludeSocketNotifiers-flag.diff
+ aarch64.patch
+ ppc64el.patch
- Drop powerpc_designer_gstabs.diff, it breaks powerpc
- Use Kubuntu Vcs fields
* Drop kubuntu_34_no_gold_check.diff, applied upstream.
* Drop aarch64_fix_jsc.patch, no longer needed.
* Drop aarch64_fix_atomic_set.patch, instead of patching a patch
apply changes directly in aarch64.patch.
* Refresh and rebase other patches.