diff options
| author | Fathi Boudra <fabo@debian.org> | 2010-07-14 09:04:52 +0300 |
|---|---|---|
| committer | Fathi Boudra <fabo@debian.org> | 2010-07-14 09:04:52 +0300 |
| commit | f1599492f6997fc14c2a0bc35bff77963d1f0847 (patch) | |
| tree | e70a87f4340e05b056f5345f31c700c0bfddbcfb | |
| parent | 2eaf72180b6e30c35b3ddbf0408e6c66da96a040 (diff) | |
| download | qt4-x11-f1599492f6997fc14c2a0bc35bff77963d1f0847.tar.gz | |
Drop qt_webkit_version.pri patch. It doesn't work as expected.debian/4.7.0-beta2-2
Remove the file ourself until it's fixed upstream.
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/0001_qt_webkit_version.pri_conflict.diff | 17 | ||||
| -rw-r--r-- | debian/patches/series | 3 | ||||
| -rwxr-xr-x | debian/rules | 3 |
4 files changed, 5 insertions, 22 deletions
diff --git a/debian/changelog b/debian/changelog index f3a10c8..442d2d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ qt4-x11 (4:4.7.0~beta2-2) experimental; urgency=low [ Fathi Boudra ] - * Add 0001_qt_webkit_version.pri_conflict.diff: - Fix qt_webkit_version.pri conflict, installed inconditionaly. + * Remove qt_webkit_version.pri file, installed inconditionaly. + It conflicts with qt_webkit_version.pri shipped in Qt WebKit. [ Modestas Vainius ] * Make libqt4-dev conflict with libqtwebkit-dev less broad: (<< 2.0~). The diff --git a/debian/patches/0001_qt_webkit_version.pri_conflict.diff b/debian/patches/0001_qt_webkit_version.pri_conflict.diff deleted file mode 100644 index 6330e1d..0000000 --- a/debian/patches/0001_qt_webkit_version.pri_conflict.diff +++ /dev/null @@ -1,17 +0,0 @@ -Description: qt_webkit_version.pri is installed inconditionaly. - the file conficts when Qt WebKit is standalone. -Author: Simon Hausmann <simon.hausmann@nokia.com> - ---- a/projects.pro -+++ b/projects.pro -@@ -163,7 +163,9 @@ mkspecs.files=$$QT_BUILD_TREE/mkspecs/qc - unix { - DEFAULT_QMAKESPEC = $$QMAKESPEC - DEFAULT_QMAKESPEC ~= s,^.*mkspecs/,,g -- mkspecs.commands += $(DEL_FILE) $(INSTALL_ROOT)$$mkspecs.path/default; $(SYMLINK) $$DEFAULT_QMAKESPEC $(INSTALL_ROOT)$$mkspecs.path/default -+ mkspecs.commands += $(DEL_FILE) $(INSTALL_ROOT)$$mkspecs.path/default; \ -+ $(SYMLINK) $$DEFAULT_QMAKESPEC $(INSTALL_ROOT)$$mkspecs.path/default; -+ !contains(QT_CONFIG, webkit): mkspecs.commands += $(DEL_FILE) $(INSTALL_ROOT)$$mkspecs.path/modules/qt_webkit_version.pri; - } - win32:!equals(QT_BUILD_TREE, $$QT_SOURCE_TREE) { - # When shadow building on Windows, the default mkspec only exists in the build tree. diff --git a/debian/patches/series b/debian/patches/series index 493438b..ab367e1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,3 @@ -# upstream patches -0001_qt_webkit_version.pri_conflict.diff - # qt-copy patches 0180-window-role.diff 0195-compositing-properties.diff diff --git a/debian/rules b/debian/rules index db6ea8a..1bf6aa1 100755 --- a/debian/rules +++ b/debian/rules @@ -240,6 +240,9 @@ override_dh_auto_install: install -D -p -m0644 debian/desktop/qtconfig.png \ debian/qt4-qtconfig/usr/share/pixmaps/qtconfig.png + # QTBUG-12159 workaround + rm -f debian/tmp//usr/share/qt4/mkspecs/modules/qt_webkit_version.pri + # Remove phonon development files rm -f debian/tmp/usr/lib/libphonon.la rm -f debian/tmp/usr/lib/libphonon.prl |