[med-svn] [sleepyhead] 01/03: Adjust paths when including headers from "libquazip5".

[Sergio Durigan Junior]

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

sergiodj-guest pushed a commit to branch master
in repository sleepyhead.

commit c0e33407db844f6cfbc93c89b8b4ce8cfbd6cf6b
Author: Sergio Durigan Junior <sergiodj at sergiodj.net>
Date:   Mon Jan 8 01:13:05 2018 -0500

    Adjust paths when including headers from "libquazip5".
    
    Debian installs headers for "libquazip5" under "/usr/include/quazip5",
    but upstream references them using "quazip/FILE".  We need to patch
    the source files and make them include "quazip5/FILE" instead.
    
    Closes: #886330
---
 debian/control                                     |  1 +
 ...-instead-of-quazip-when-including-header-.patch | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/control b/debian/control
index a40a13c..f65be7a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 10),
                qt5-qmake,
                libqt5serialport5-dev,
                libquazip5-dev,
+	       libquazip5-headers,
                libqt5webkit5-dev,
                libqt5opengl5-dev,
                libglu1-mesa-dev | libglu-dev,
diff --git a/debian/patches/0005-Use-quazip5-instead-of-quazip-when-including-header-.patch b/debian/patches/0005-Use-quazip5-instead-of-quazip-when-including-header-.patch
new file mode 100644
index 0000000..172b374
--- /dev/null
+++ b/debian/patches/0005-Use-quazip5-instead-of-quazip-when-including-header-.patch
@@ -0,0 +1,26 @@
+From: Sergio Durigan Junior <sergiodj at sergiodj.net>
+Date: Mon, 8 Jan 2018 01:11:02 -0500
+Subject: Use "quazip5/" instead of "quazip/" when including header files
+
+Debian installs header files for libquazip5 (the Qt 5.1 version) under
+/usr/include/quazip5/, so we need to adjust the paths when including
+the files.
+---
+ sleepyhead/UpdaterWindow.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sleepyhead/UpdaterWindow.cpp b/sleepyhead/UpdaterWindow.cpp
+index 90217bc..cae3405 100644
+--- a/sleepyhead/UpdaterWindow.cpp
++++ b/sleepyhead/UpdaterWindow.cpp
+@@ -23,8 +23,8 @@
+ #include <QProcess>
+ 
+ #include "SleepLib/profiles.h"
+-#include <quazip/quazip.h>
+-#include <quazip/quazipfile.h>
++#include <quazip5/quazip.h>
++#include <quazip5/quazipfile.h>
+ #include "UpdaterWindow.h"
+ #include "ui_UpdaterWindow.h"
+ #include "version.h"
diff --git a/debian/patches/series b/debian/patches/series
index c768a90..6857101 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Create-install-rule-on-Makefile.patch
 0003-Adapt-source-code-to-generate-reproducible-builds.patch
 0004-Fix-compiling-against-Qt-5.8.patch
+0005-Use-quazip5-instead-of-quazip-when-including-header-.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/sleepyhead.git