[mupen64plus-qt] 01/01: Use the new libquazip5 instead the old libquazip-qt5

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository mupen64plus-qt.

commit 6b5ba2357c01d2c4b4df13773acb31712dee369b
Author: Andreas Tille <tille at debian.org>
Date:   Mon Jan 11 22:30:48 2016 +0100

    Use the new libquazip5 instead the old libquazip-qt5
---
 debian/changelog               |  3 +++
 debian/control                 |  2 +-
 debian/patches/libquazip.patch | 18 ++++++++++++++++++
 debian/patches/series          |  1 +
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f9c83f9..85b14af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ mupen64plus-qt (1.8-2) UNRELEASED; urgency=medium
 
   * Team upload
   * Maintain package in pkg-games Git
+  * Use the new libquazip5 instead the old libquazip-qt5 (thanks for the
+    patch to Bas Couwenberg <sebastic at xs4all.nl>)
+    Closes: #810610
 
  -- Andreas Tille <tille at debian.org>  Mon, 11 Jan 2016 22:23:37 +0100
 
diff --git a/debian/control b/debian/control
index 79cc526..447d657 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Section: games
 Priority: optional
 Build-Depends: debhelper (>= 9),
                libqt5sql5-sqlite,
-               libquazip-qt5-dev,
+               libquazip5-dev,
                qt5-qmake,
                qtbase5-dev
 Standards-Version: 3.9.6
diff --git a/debian/patches/libquazip.patch b/debian/patches/libquazip.patch
new file mode 100644
index 0000000..cf91af5
--- /dev/null
+++ b/debian/patches/libquazip.patch
@@ -0,0 +1,18 @@
+Description: Support both libquazip-qt5-dev (old) and libquazip5-dev (new).
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- 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 --git a/debian/patches/series b/debian/patches/series
index e76df84..5797519 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_fix_man_section.patch
+libquazip.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-qt.git