diff -Nru qtfeedback-opensource-src-5.0~git20130529/debian/changelog qtfeedback-opensource-src-5.0~git20130529/debian/changelog --- qtfeedback-opensource-src-5.0~git20130529/debian/changelog 2014-02-28 10:15:22.000000000 +0000 +++ qtfeedback-opensource-src-5.0~git20130529/debian/changelog 2014-06-13 08:16:43.000000000 +0000 @@ -1,3 +1,12 @@ +qtfeedback-opensource-src (5.0~git20130529-0ubuntu4) utopic; urgency=medium + + * Rebuild against Qt 5.3, bump dependencies + * Move include directories + * debian/patches/fix_qt530_compilation.patch: + - Define MODULE_PLUGIN_TYPES to fix compilation + + -- Timo Jyrinki Mon, 12 May 2014 05:23:02 +0000 + qtfeedback-opensource-src (5.0~git20130529-0ubuntu3) trusty; urgency=medium * Rebuild against Qt 5.2.1, bump dependencies diff -Nru qtfeedback-opensource-src-5.0~git20130529/debian/control qtfeedback-opensource-src-5.0~git20130529/debian/control --- qtfeedback-opensource-src-5.0~git20130529/debian/control 2014-02-28 10:15:22.000000000 +0000 +++ qtfeedback-opensource-src-5.0~git20130529/debian/control 2014-06-13 08:16:43.000000000 +0000 @@ -6,10 +6,10 @@ libpulse-dev, pkg-kde-tools, qt5-default, - qtbase5-dev (>= 5.2.1+dfsg~), - qtdeclarative5-dev (>= 5.2.1~), - qtdeclarative5-qtquick2-plugin (>= 5.2.1~), - qtmultimedia5-dev (>= 5.2.1~), + qtbase5-dev (>= 5.3.0~), + qtdeclarative5-dev (>= 5.3.0~), + qtdeclarative5-qtquick2-plugin (>= 5.3.0~), + qtmultimedia5-dev (>= 5.3.0~), xauth, xvfb, Standards-Version: 3.9.4 diff -Nru qtfeedback-opensource-src-5.0~git20130529/debian/patches/fix_qt530_compilation.patch qtfeedback-opensource-src-5.0~git20130529/debian/patches/fix_qt530_compilation.patch --- qtfeedback-opensource-src-5.0~git20130529/debian/patches/fix_qt530_compilation.patch 1970-01-01 00:00:00.000000000 +0000 +++ qtfeedback-opensource-src-5.0~git20130529/debian/patches/fix_qt530_compilation.patch 2014-06-13 08:16:43.000000000 +0000 @@ -0,0 +1,23 @@ +diff -urN old/src/feedback/feedback.pro new/src/feedback/feedback.pro +--- old/src/feedback/feedback.pro 2013-05-29 16:40:33.000000000 +0000 ++++ new/src/feedback/feedback.pro 2014-05-12 05:46:07.647168035 +0000 +@@ -1,9 +1,10 @@ + TARGET = QtFeedback + QT = core + +-QMAKE_DOCS = $$PWD/../../doc/qtfeedback.qdocconf ++MODULE_PLUGIN_TYPES = \ ++ feedback + +-load(qt_module) ++QMAKE_DOCS = $$PWD/../../doc/qtfeedback.qdocconf + + PUBLIC_HEADERS += qfeedbackglobal.h \ + qfeedbackactuator.h \ +@@ -19,3 +20,6 @@ + SOURCES += qfeedbackactuator.cpp \ + qfeedbackeffect.cpp \ + qfeedbackplugin.cpp ++ ++load(qt_module) ++ diff -Nru qtfeedback-opensource-src-5.0~git20130529/debian/patches/series qtfeedback-opensource-src-5.0~git20130529/debian/patches/series --- qtfeedback-opensource-src-5.0~git20130529/debian/patches/series 2014-02-28 10:15:22.000000000 +0000 +++ qtfeedback-opensource-src-5.0~git20130529/debian/patches/series 2014-06-13 08:16:43.000000000 +0000 @@ -1,2 +1,3 @@ revert_module_version.patch disable_audio_playback_test.patch +fix_qt530_compilation.patch diff -Nru qtfeedback-opensource-src-5.0~git20130529/debian/qtfeedback5-dev.install qtfeedback-opensource-src-5.0~git20130529/debian/qtfeedback5-dev.install --- qtfeedback-opensource-src-5.0~git20130529/debian/qtfeedback5-dev.install 2014-02-28 10:15:22.000000000 +0000 +++ qtfeedback-opensource-src-5.0~git20130529/debian/qtfeedback5-dev.install 2014-06-13 08:16:43.000000000 +0000 @@ -1,19 +1,19 @@ -usr/include/qt5/QtFeedback/QFeedbackActuator -usr/include/qt5/QtFeedback/QFeedbackEffect -usr/include/qt5/QtFeedback/QFeedbackFileEffect -usr/include/qt5/QtFeedback/QFeedbackFileInterface -usr/include/qt5/QtFeedback/QFeedbackHapticsEffect -usr/include/qt5/QtFeedback/QFeedbackHapticsInterface -usr/include/qt5/QtFeedback/QFeedbackInterface -usr/include/qt5/QtFeedback/QFeedbackThemeInterface -usr/include/qt5/QtFeedback/QtFeedback -usr/include/qt5/QtFeedback/QtFeedbackVersion -usr/include/qt5/QtFeedback/qfeedbackactuator.h -usr/include/qt5/QtFeedback/qfeedbackeffect.h -usr/include/qt5/QtFeedback/qfeedbackglobal.h -usr/include/qt5/QtFeedback/qfeedbackplugininterfaces.h -usr/include/qt5/QtFeedback/qfeedbackpluginsearch.h -usr/include/qt5/QtFeedback/qtfeedbackversion.h +usr/include/*/qt5/QtFeedback/QFeedbackActuator +usr/include/*/qt5/QtFeedback/QFeedbackEffect +usr/include/*/qt5/QtFeedback/QFeedbackFileEffect +usr/include/*/qt5/QtFeedback/QFeedbackFileInterface +usr/include/*/qt5/QtFeedback/QFeedbackHapticsEffect +usr/include/*/qt5/QtFeedback/QFeedbackHapticsInterface +usr/include/*/qt5/QtFeedback/QFeedbackInterface +usr/include/*/qt5/QtFeedback/QFeedbackThemeInterface +usr/include/*/qt5/QtFeedback/QtFeedback +usr/include/*/qt5/QtFeedback/QtFeedbackVersion +usr/include/*/qt5/QtFeedback/qfeedbackactuator.h +usr/include/*/qt5/QtFeedback/qfeedbackeffect.h +usr/include/*/qt5/QtFeedback/qfeedbackglobal.h +usr/include/*/qt5/QtFeedback/qfeedbackplugininterfaces.h +usr/include/*/qt5/QtFeedback/qfeedbackpluginsearch.h +usr/include/*/qt5/QtFeedback/qtfeedbackversion.h usr/lib/*/*.prl usr/lib/*/*.so usr/lib/*/cmake/* diff -Nru qtfeedback-opensource-src-5.0~git20130529/debian/rules qtfeedback-opensource-src-5.0~git20130529/debian/rules --- qtfeedback-opensource-src-5.0~git20130529/debian/rules 2014-02-28 10:15:22.000000000 +0000 +++ qtfeedback-opensource-src-5.0~git20130529/debian/rules 2014-06-13 08:16:43.000000000 +0000 @@ -21,7 +21,7 @@ -exec sed -i -e 's/$(DEB_HOST_MULTIARCH)\/$(DEB_HOST_MULTIARCH)/$(DEB_HOST_MULTIARCH)/g' {} \; # Remove private stuff - rm -rfv debian/tmp/usr/include/qt5/QtFeedback/*/QtFeedback/private/ + rm -rfv debian/tmp/usr/include/*/qt5/QtFeedback/*/QtFeedback/private/ rm -fv $(CURDIR)/debian/tmp/usr/lib/*/qt5/mkspecs/modules/qt_lib_*_private.pri # Remove libtool-like files