Source: mupen64plus-qt Version: 1.8-1 Severity: important Tags: upstream 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. mupen64plus-qt.pro has special handling for the old libquazip-qt5 on Debian/Ubuntu, and needs to use -lquazip5 for libquazip 0.7.1 too. The attached debdiff updates the libquazip build dependency, and adds a patch to handle both the old and new libquazip name on Debian/Ubuntu. Kind Regards, Bas
diff -Nru mupen64plus-qt-1.8/debian/changelog mupen64plus-qt-1.8/debian/changelog --- mupen64plus-qt-1.8/debian/changelog 2015-09-11 23:29:09.000000000 +0200 +++ mupen64plus-qt-1.8/debian/changelog 2016-01-10 13:40:16.000000000 +0100 @@ -1,3 +1,10 @@ +mupen64plus-qt (1.8-1.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:39:32 +0100 + mupen64plus-qt (1.8-1) unstable; urgency=low * Initial release (Closes: #787381). diff -Nru mupen64plus-qt-1.8/debian/control mupen64plus-qt-1.8/debian/control --- mupen64plus-qt-1.8/debian/control 2015-09-17 16:27:51.000000000 +0200 +++ mupen64plus-qt-1.8/debian/control 2016-01-10 13:37:39.000000000 +0100 @@ -5,7 +5,7 @@ Uploaders: Debian Games Team <[email protected]> Build-Depends: debhelper (>= 9), libqt5sql5-sqlite, - libquazip-qt5-dev, + libquazip5-dev, qt5-qmake, qtbase5-dev Standards-Version: 3.9.6 diff -Nru mupen64plus-qt-1.8/debian/patches/libquazip.patch mupen64plus-qt-1.8/debian/patches/libquazip.patch --- mupen64plus-qt-1.8/debian/patches/libquazip.patch 1970-01-01 01:00:00.000000000 +0100 +++ mupen64plus-qt-1.8/debian/patches/libquazip.patch 2016-01-10 13:39:27.000000000 +0100 @@ -0,0 +1,18 @@ +Description: Support both libquazip-qt5-dev (old) and libquazip5-dev (new). +Author: Bas Couwenberg <[email protected]> + +--- a/mupen64plus-qt.pro ++++ b/mupen64plus-qt.pro +@@ -63,7 +63,11 @@ win32|macx { + } else { + # Debian distributions use a different library name for Qt5 quazip + system("uname -a | grep -E 'Debian|Ubuntu' > /dev/null") { +- LIBS += -lquazip-qt5 ++ system("dpkg -l | grep libquazip5-dev | grep ^ii > /dev/null") { ++ LIBS += -lquazip5 ++ } else { ++ LIBS += -lquazip-qt5 ++ } + } else { + LIBS += -lquazip5 + } diff -Nru mupen64plus-qt-1.8/debian/patches/series mupen64plus-qt-1.8/debian/patches/series --- mupen64plus-qt-1.8/debian/patches/series 2015-09-17 16:34:49.000000000 +0200 +++ mupen64plus-qt-1.8/debian/patches/series 2016-01-10 13:38:06.000000000 +0100 @@ -1 +1,2 @@ 01_fix_man_section.patch +libquazip.patch
