[med-svn] [beads] 01/02: Deactivate QDebug parts of the patch

[Andreas Tille]

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

tille pushed a commit to branch master
in repository beads.

commit 78a370d33e473ef1eea8943626e827e0f02ba70c
Author: Andreas Tille <tille at debian.org>
Date:   Fri Oct 20 12:23:55 2017 +0200

    Deactivate QDebug parts of the patch
---
 debian/patches/qt5.patch       | 52 ------------------------------------
 debian/patches/qt5_debug.patch | 60 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 52 deletions(-)

diff --git a/debian/patches/qt5.patch b/debian/patches/qt5.patch
index 111767f..26f4162 100644
--- a/debian/patches/qt5.patch
+++ b/debian/patches/qt5.patch
@@ -74,55 +74,3 @@ Description: Port from Qt4 to Qt5
    
    # we need this to be able to include headers produced by uic in our code
    # (CMAKE_BINARY_DIR holds a path to the build directory, while INCLUDE_DIRECTORIES() works just like INCLUDEPATH from qmake)
---- a/src/beads.h
-+++ b/src/beads.h
-@@ -16,7 +16,7 @@
- #ifndef BEADS_H_
- #define BEADS_H_
- 
--#include <QDebug>
-+#include <QtCore/qdebug.h>
- #include <QApplication>
- #include "config.h"
- 
---- a/src/images/imageIntensity.h
-+++ b/src/images/imageIntensity.h
-@@ -1,7 +1,7 @@
- #ifndef IMAGEINTENSITY_H_
- #define IMAGEINTENSITY_H_
- 
--#include <QDebug>
-+#include <QtCore/qdebug.h>
- #include <QString>
- 
- #include "imageCode.h"
---- a/src/qtbeads/qtbeads.cpp
-+++ b/src/qtbeads/qtbeads.cpp
-@@ -1,4 +1,4 @@
--#include <QDebug>
-+#include <QtCore/qdebug.h>
- #include <QApplication>
- #include "../config.h"
- #include "main_window.h"
---- a/src/spotDocument.h
-+++ b/src/spotDocument.h
-@@ -1,7 +1,7 @@
- #ifndef SPOTDOCUMENT_H_
- #define SPOTDOCUMENT_H_
- 
--#include <QDebug>
-+#include <QtCore/qdebug.h>
- #include <QFile>
- #include <QTextStream>
- 
---- a/src/qtbeads/properties.cpp
-+++ b/src/qtbeads/properties.cpp
-@@ -7,7 +7,7 @@
- 
- #include "properties.h"
- #include "qtbeads_error.h"
--#include <QDebug>
-+#include <QtCore/qdebug.h>
- #include <string>
- #include <iostream>
- #include <fstream>
diff --git a/debian/patches/qt5_debug.patch b/debian/patches/qt5_debug.patch
new file mode 100644
index 0000000..1044027
--- /dev/null
+++ b/debian/patches/qt5_debug.patch
@@ -0,0 +1,60 @@
+Author: Andreas Tille <tille at debian.org>
+        Wout B <wbertrums at gmail.com>
+Last-Update: Thu, 19 Oct 2017 14:58:04 +0200
+Description: There were some problems to find QDebug but this was
+ most probably due to configuration issues.
+ .
+ This patch is deactivated for the moment
+
+--- a/src/beads.h
++++ b/src/beads.h
+@@ -16,7 +16,7 @@
+ #ifndef BEADS_H_
+ #define BEADS_H_
+ 
+-#include <QDebug>
++#include <QtCore/qdebug.h>
+ #include <QApplication>
+ #include "config.h"
+ 
+--- a/src/images/imageIntensity.h
++++ b/src/images/imageIntensity.h
+@@ -1,7 +1,7 @@
+ #ifndef IMAGEINTENSITY_H_
+ #define IMAGEINTENSITY_H_
+ 
+-#include <QDebug>
++#include <QtCore/qdebug.h>
+ #include <QString>
+ 
+ #include "imageCode.h"
+--- a/src/qtbeads/qtbeads.cpp
++++ b/src/qtbeads/qtbeads.cpp
+@@ -1,4 +1,4 @@
+-#include <QDebug>
++#include <QtCore/qdebug.h>
+ #include <QApplication>
+ #include "../config.h"
+ #include "main_window.h"
+--- a/src/spotDocument.h
++++ b/src/spotDocument.h
+@@ -1,7 +1,7 @@
+ #ifndef SPOTDOCUMENT_H_
+ #define SPOTDOCUMENT_H_
+ 
+-#include <QDebug>
++#include <QtCore/qdebug.h>
+ #include <QFile>
+ #include <QTextStream>
+ 
+--- a/src/qtbeads/properties.cpp
++++ b/src/qtbeads/properties.cpp
+@@ -7,7 +7,7 @@
+ 
+ #include "properties.h"
+ #include "qtbeads_error.h"
+-#include <QDebug>
++#include <QtCore/qdebug.h>
+ #include <string>
+ #include <iostream>
+ #include <fstream>

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