Source: cen64-qt
Version: 20150915-alpha-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.

cen64-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 cen64-qt-20150915-alpha/debian/changelog cen64-qt-20150915-alpha/debian/changelog
--- cen64-qt-20150915-alpha/debian/changelog	2015-10-28 14:29:56.000000000 +0100
+++ cen64-qt-20150915-alpha/debian/changelog	2016-01-10 12:38:36.000000000 +0100
@@ -1,3 +1,10 @@
+cen64-qt (20150915-alpha-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Update libquazip build dependency to libquazip5-dev.
+
+ -- Bas Couwenberg <[email protected]>  Sun, 10 Jan 2016 12:38:21 +0100
+
 cen64-qt (20150915-alpha-1) unstable; urgency=low
 
   * Initial release (Closes: #798523).
diff -Nru cen64-qt-20150915-alpha/debian/control cen64-qt-20150915-alpha/debian/control
--- cen64-qt-20150915-alpha/debian/control	2015-10-28 14:30:45.000000000 +0100
+++ cen64-qt-20150915-alpha/debian/control	2016-01-10 12:38:20.000000000 +0100
@@ -2,7 +2,7 @@
 Section: otherosfs
 Priority: optional
 Maintainer: John Paul Adrian Glaubitz <[email protected]>
-Build-Depends: debhelper (>= 9), qtbase5-dev, libquazip-qt5-dev, libqt5sql5-sqlite
+Build-Depends: debhelper (>= 9), qtbase5-dev, libquazip5-dev, libqt5sql5-sqlite
 Standards-Version: 3.9.6
 Homepage: https://github.com/dh4/cen64-qt
 Vcs-Git: git://github.com/glaubitz/cen64-qt-debian.git
diff -Nru cen64-qt-20150915-alpha/debian/patches/quazip.patch cen64-qt-20150915-alpha/debian/patches/quazip.patch
--- cen64-qt-20150915-alpha/debian/patches/quazip.patch	1970-01-01 01:00:00.000000000 +0100
+++ cen64-qt-20150915-alpha/debian/patches/quazip.patch	2016-01-10 12:54:41.000000000 +0100
@@ -0,0 +1,18 @@
+Description: Support both libquazip-qt5-dev (old) and libquazip5-dev (new).
+Author: Bas Couwenberg <[email protected]>
+
+--- a/cen64-qt.pro
++++ b/cen64-qt.pro
+@@ -63,7 +63,11 @@ win32|macx|linux_quazip_static {
+     } 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 cen64-qt-20150915-alpha/debian/patches/series cen64-qt-20150915-alpha/debian/patches/series
--- cen64-qt-20150915-alpha/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ cen64-qt-20150915-alpha/debian/patches/series	2016-01-10 12:40:29.000000000 +0100
@@ -0,0 +1 @@
+quazip.patch

Reply via email to