Qt

Merge lp:~chasedouglas/qt/fix-patch-removal into lp:~kubuntu-packagers/kubuntu-packaging/qt

  1. fix-patch-removal
  2. Merge into qt
Proposed by Chase Douglas
Status: Merged
Merged at revision: 165
Proposed branch: lp:~chasedouglas/qt/fix-patch-removal
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/qt
Diff against target: 16 lines (+0/-3)
1 file modified
debian/patches/series (+0/-3)
To merge this branch: bzr merge lp:~chasedouglas/qt/fix-patch-removal
Reviewer Review Type Date Requested Status
Michał Zając Approve
Harald Sitter Approve
Review via email: mp+61668@code.launchpad.net

Description of the change

Fix FTBFS from the packaging branch due to incomplete removal of some patches.

To post a comment you must log in.
Revision history for this message
Harald Sitter (apachelogger) wrote :

Michal, please merge and upload.
thx.

review: Approve
Revision history for this message
Michał Zając (quintasan) wrote :

No problems with that, minor mess up of mine :S

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/patches/series'
2--- debian/patches/series 2011-03-25 11:17:59 +0000
3+++ debian/patches/series 2011-05-19 21:51:28 +0000
4@@ -36,12 +36,9 @@
5 kubuntu_16_qt-designer-toplevel-mode-menubar.diff
6 kubuntu_17_enable_qtwebkit_for_qtassistant.diff
7 kubuntu_18_fix_qtreeview_regression.diff
8-kubuntu_90_webkit_htmlxml_gb_gb18030_detect.diff
9 kubuntu_22_thumb2_support.diff
10 kubuntu_23_syncqt_no_timestamp_change.diff
11-kubuntu_91_fix_qtextedit_selectall_crash.patch
12 kubuntu_24_large_qtreeview.diff
13-kubuntu_26_dbusconnection_pointer.diff
14 kubuntu_27_dbus_signal_filter_passes_not_handled.diff
15 kubuntu_28_xi2.1.patch
16 kubuntu_29_egl_qglcontext_stubs.diff

Subscribers

People subscribed via source and target branches