Source: plume-creator Version: 0.66+dfsg1-3 Severity: important Tags: patch
Dear Maintainer, libquazip (0.7.1-1) was uploaded to unstable recently, and it has renamed the qt5 library to libquazip5 (#805087). The -dev package has also been renamed to libquazip5-dev for which the marble build dependencies need to be updated. The attached debdiff updates the libquazip build dependency, and built-in-Qt5.patch to link quazip5 instead of quazip-qt5. Kind Regards, Bas
diff -Nru plume-creator-0.66+dfsg1/debian/changelog plume-creator-0.66+dfsg1/debian/changelog --- plume-creator-0.66+dfsg1/debian/changelog 2015-12-03 01:42:15.000000000 +0100 +++ plume-creator-0.66+dfsg1/debian/changelog 2016-01-10 13:08:30.000000000 +0100 @@ -1,3 +1,10 @@ +plume-creator (0.66+dfsg1-3.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Use the new libquazip5 instead the old libquazip-qt5. + + -- Bas Couwenberg <[email protected]> Sun, 10 Jan 2016 13:08:00 +0100 + plume-creator (0.66+dfsg1-3) unstable; urgency=medium * Built with Qt5 diff -Nru plume-creator-0.66+dfsg1/debian/control plume-creator-0.66+dfsg1/debian/control --- plume-creator-0.66+dfsg1/debian/control 2015-12-03 01:49:56.000000000 +0100 +++ plume-creator-0.66+dfsg1/debian/control 2016-01-10 13:05:14.000000000 +0100 @@ -4,7 +4,7 @@ Maintainer: Miriam Ruiz <[email protected]> Build-Depends: debhelper (>= 9), dh-buildinfo, quilt, qtchooser, qttools5-dev-tools, qtbase5-dev, qtbase5-dev-tools, qt5-qmake, - qtbase5-dev, libzip-dev, libquazip-qt5-dev, qtmultimedia5-dev, + qtbase5-dev, libzip-dev, libquazip5-dev, qtmultimedia5-dev, libhunspell-dev Standards-Version: 3.9.6 Homepage: http://www.plume-creator.eu diff -Nru plume-creator-0.66+dfsg1/debian/patches/built-in-Qt5.patch plume-creator-0.66+dfsg1/debian/patches/built-in-Qt5.patch --- plume-creator-0.66+dfsg1/debian/patches/built-in-Qt5.patch 2015-12-03 01:10:50.000000000 +0100 +++ plume-creator-0.66+dfsg1/debian/patches/built-in-Qt5.patch 2016-01-10 13:07:45.000000000 +0100 @@ -12,10 +12,8 @@ 5 files changed, 54 insertions(+), 395 deletions(-) delete mode 100644 plume-creator-all.pro.user -Index: plume-creator-0.66+dfsg1/externals/qtsingleapplication/src/qtlocalpeer.cpp -=================================================================== ---- plume-creator-0.66+dfsg1.orig/externals/qtsingleapplication/src/qtlocalpeer.cpp -+++ plume-creator-0.66+dfsg1/externals/qtsingleapplication/src/qtlocalpeer.cpp +--- a/externals/qtsingleapplication/src/qtlocalpeer.cpp ++++ b/externals/qtsingleapplication/src/qtlocalpeer.cpp @@ -41,6 +41,7 @@ #include "qtlocalpeer.h" @@ -24,9 +22,7 @@ #include <QTime> #if defined(Q_OS_WIN) -Index: plume-creator-0.66+dfsg1/plume-creator-all.pro.user -=================================================================== ---- plume-creator-0.66+dfsg1.orig/plume-creator-all.pro.user +--- a/plume-creator-all.pro.user +++ /dev/null @@ -1,312 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> @@ -341,10 +337,8 @@ - <value type="int">15</value> - </data> -</qtcreator> -Index: plume-creator-0.66+dfsg1/plume-creator.pro -=================================================================== ---- plume-creator-0.66+dfsg1.orig/plume-creator.pro -+++ plume-creator-0.66+dfsg1/plume-creator.pro +--- a/plume-creator.pro ++++ b/plume-creator.pro @@ -38,34 +38,17 @@ CONFIG(beta_release) { TARGET = $$join(TARGET,,,_beta) } @@ -380,17 +374,15 @@ + LIBS += -lquazip +} +greaterThan(QT_MAJOR_VERSION, 4) { -+ LIBS += -lquazip-qt5 ++ LIBS += -lquazip5 +} +LIBS += -lhunspell macx { -Index: plume-creator-0.66+dfsg1/plume-creator.pro.user -=================================================================== ---- plume-creator-0.66+dfsg1.orig/plume-creator.pro.user -+++ plume-creator-0.66+dfsg1/plume-creator.pro.user +--- a/plume-creator.pro.user ++++ b/plume-creator.pro.user @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE QtCreatorProject> @@ -602,10 +594,8 @@ + <value type="int">18</value> </data> </qtcreator> -Index: plume-creator-0.66+dfsg1/src/common/utils.cpp -=================================================================== ---- plume-creator-0.66+dfsg1.orig/src/common/utils.cpp -+++ plume-creator-0.66+dfsg1/src/common/utils.cpp +--- a/src/common/utils.cpp ++++ b/src/common/utils.cpp @@ -536,11 +536,25 @@ QString Utils::projectRealName(QString f // creation date : QString realName;
