[qmapshack] 05/06: Drop devicewatcher-hurd-kfreebsd.patch, applied upstream.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository qmapshack.

commit fd34e5f057961a78537e85c908b5947d0d7a8021
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Mar 19 21:06:26 2015 +0100

    Drop devicewatcher-hurd-kfreebsd.patch, applied upstream.
---
 debian/changelog                                 |  1 +
 debian/patches/devicewatcher-hurd-kfreebsd.patch | 27 ------------------------
 debian/patches/series                            |  1 -
 3 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4109a05..e24c567 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qmapshack (1.0.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Drop upstream tarball repacking, no longer required.
+  * Drop devicewatcher-hurd-kfreebsd.patch, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 19 Mar 2015 20:57:39 +0100
 
diff --git a/debian/patches/devicewatcher-hurd-kfreebsd.patch b/debian/patches/devicewatcher-hurd-kfreebsd.patch
deleted file mode 100644
index e42a0d8..0000000
--- a/debian/patches/devicewatcher-hurd-kfreebsd.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Disable deviceWatcher on Hurd & kFreeBSD.
-Origin: https://bitbucket.org/maproom/qmapshack/commits/c2658a9460b5ff4a50329381670c86627cdb4788
-Bug: https://bitbucket.org/maproom/qmapshack/issue/10/build-failure-on-hurd-kfreebsd
-Author: Oliver Eichler <oliver.eichler at gmx.de>
-
---- a/src/gis/CGisListWks.cpp
-+++ b/src/gis/CGisListWks.cpp
-@@ -155,16 +155,15 @@ CGisListWks::CGisListWks(QWidget *parent
-     {
-         QTimer::singleShot(saveEvery * 60000, this, SLOT(slotSaveWorkspace()));
-     }
-+
- #ifdef Q_OS_LINUX
-     deviceWatcher = new CDeviceWatcherLinux(this);
-+    connect(deviceWatcher, SIGNAL(sigChanged()), SIGNAL(sigChanged()));
- #endif
- #ifdef Q_OS_WIN
-     deviceWatcher = new CDeviceWatcherWindows(this);
-+    connect(deviceWatcher, SIGNAL(sigChanged()), SIGNAL(sigChanged()));
- #endif
--    if(deviceWatcher)
--    {
--        connect(deviceWatcher, SIGNAL(sigChanged()), SIGNAL(sigChanged()));
--    }
- 
-     QTimer::singleShot(500, this, SLOT(slotLoadWorkspace()));
- }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d466892..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-devicewatcher-hurd-kfreebsd.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git