[SCM] gammaray packaging branch, master, updated. debian/1.2.1-2-9-g5a8bd1a

[Jakub Adam]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gammaray.git;a=commitdiff;h=3518e7b

The following commit has been merged in the master branch:
commit 3518e7bbff872fe36393e3de02e1980daf8ca583
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Fri Dec 21 22:43:13 2012 +0100

    Removed patches that were applied upstream
---
 debian/changelog                                   |    2 +
 debian/patches/dont-build-functionoverwriter.patch |   62 --------------------
 debian/patches/gnu-hurd-build-fix.patch            |   21 -------
 debian/patches/series                              |    2 -
 4 files changed, 2 insertions(+), 85 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 126e07b..94bb532 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 gammaray (1.2.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Removed d/patches/dont-build-functionoverwriter.patch and
+    debian/patches/gnu-hurd-build-fix.patch (applied upstream).
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Fri, 21 Dec 2012 22:39:46 +0100
 
diff --git a/debian/patches/dont-build-functionoverwriter.patch b/debian/patches/dont-build-functionoverwriter.patch
deleted file mode 100644
index 76d44bb..0000000
--- a/debian/patches/dont-build-functionoverwriter.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Wed, 5 Sep 2012 20:04:22 +0200
-Subject: dont-build-functionoverwriter
-
----
- core/CMakeLists.txt |   15 ++++++++++-----
- core/probe.cpp      |    2 ++
- 2 files changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index 6aadfbf..10d81e3 100644
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -53,11 +53,6 @@ set(gammaray_srcs
-   propertyeditor/propertypaletteeditor.cpp
-   propertyeditor/palettedialog.cpp
- 
--  hooking/abstractfunctionoverwriter.cpp
--  hooking/functionoverwriterfactory.cpp
--  hooking/winfunctionoverwriter.cpp
--  hooking/unixfunctionoverwriter.cpp
--
-   tools/modelinspector/modeltester.cpp
-   tools/modelinspector/modelmodel.cpp
-   tools/modelinspector/modelcellmodel.cpp
-@@ -105,6 +100,16 @@ set(gammaray_srcs
-   tools/styleinspector/dynamicproxystyle.cpp
- )
- 
-+if(WIN32 OR APPLE)
-+  set(gammaray_srcs
-+    ${gammaray_srcs}
-+    hooking/abstractfunctionoverwriter.cpp
-+    hooking/functionoverwriterfactory.cpp
-+    hooking/winfunctionoverwriter.cpp
-+    hooking/unixfunctionoverwriter.cpp
-+  )
-+endif()
-+
- if(HAVE_PRIVATE_QT_HEADERS)
-   set(gammaray_srcs
-     ${gammaray_srcs}
-diff --git a/core/probe.cpp b/core/probe.cpp
-index dafeb23..be32b8b 100644
---- a/core/probe.cpp
-+++ b/core/probe.cpp
-@@ -711,6 +711,7 @@ Q_DECL_EXPORT const char *myFlagLocation(const char *method)
- }
- #endif
- 
-+#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
- void overwriteQtFunctions()
- {
-   functionsOverwritten = true;
-@@ -739,6 +740,7 @@ void overwriteQtFunctions()
- #endif
- #endif
- }
-+#endif
- 
- #ifdef Q_OS_WIN
- extern "C" Q_DECL_EXPORT void gammaray_probe_inject();
diff --git a/debian/patches/gnu-hurd-build-fix.patch b/debian/patches/gnu-hurd-build-fix.patch
deleted file mode 100644
index 3f1a9c5..0000000
--- a/debian/patches/gnu-hurd-build-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Tue, 4 Sep 2012 21:25:27 +0200
-Subject: gnu-hurd-build-fix
-
----
- plugins/timertop/functioncalltimer.cpp |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/timertop/functioncalltimer.cpp b/plugins/timertop/functioncalltimer.cpp
-index 34be761..3940f64 100644
---- a/plugins/timertop/functioncalltimer.cpp
-+++ b/plugins/timertop/functioncalltimer.cpp
-@@ -26,7 +26,7 @@
- #include <Windows.h>
- #endif
- 
--#ifdef __MACH__
-+#if defined(Q_OS_MAC) && defined(__MACH__)
- #include <mach/clock.h>
- #include <mach/mach.h>
- #endif
diff --git a/debian/patches/series b/debian/patches/series
index f9c4326..d08fd35 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,3 @@ widget-export-actions-location.patch
 harfbuzz-search-path.patch
 find-widget-export-actions-when-attaching.patch
 gammaray-probe-versioned-soname.patch
-gnu-hurd-build-fix.patch
-dont-build-functionoverwriter.patch

-- 
gammaray packaging