-
Committer:
Package Import Robot
-
Author(s):
Jonathan Riddell, Jonathan Riddell, Felix Geyer
-
Date:
2011-11-01 16:23:55 UTC
-
mfrom:
(15.3.22 sid)
-
Revision ID:
package-import@ubuntu.com-20111101162355-4dhsj6563ii8enl6
Tags: 4:4.7.4-1ubuntu1
[ Jonathan Riddell ]
* Merge from Debian Git packaging. Remaining Ubuntu 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
- 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 armel (Debian does this for
armhf)
+ 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
- Pass extra_configure_opts += -arch armv6 on both armel and armhf and not
just armhf
- In debian/rules Move documentation building to override_dh_auto_install where
dh_listpackages works as expected with dpkg-buildpackage. (LP: #857377)
- debian/compat is 9 and build-depend on newer debhelper for multiarch
* debian/patches/blacklist-diginotar-certs.diff is now
debian/patches/blacklist-diginotar-cert.diff to match Debian
* Add prefix to some patches to clarify they come from Ubuntu rather than Debian
- kubuntu_97_a11y_qt_and_qml_backport.diff
- kubuntu_98_fix_accessible_menu.diff
- kubuntu_99_notify_qml_name_description_change.diff
[ Felix Geyer ]
* Use DEB_*_MAINT_APPEND instead of setting CXXFLAGS and LDFLAGS.