[qlandkartegt] 11/16: Drop 04-fix_kfreebsd_build.patch, obsolete.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository qlandkartegt.

commit 83fef3b8960da9aa04d594faea0cfbef87715303
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Feb 12 20:55:48 2015 +0100

    Drop 04-fix_kfreebsd_build.patch, obsolete.
---
 debian/changelog                           |  1 +
 debian/patches/04-fix_kfreebsd_build.patch | 48 ------------------------------
 debian/patches/series                      |  1 -
 3 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0790fdb..cf6cbb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ qlandkartegt (1.8.0-1) UNRELEASED; urgency=medium
   * Update Vcs-Browser URL to use cgit instead of gitweb.
   * Override dh_installchangelogs to install upstream changelog.
   * Enable parallel builds.
+  * Drop 04-fix_kfreebsd_build.patch, obsolete.
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 12 Feb 2015 09:00:46 +0100
 
diff --git a/debian/patches/04-fix_kfreebsd_build.patch b/debian/patches/04-fix_kfreebsd_build.patch
deleted file mode 100644
index b545101..0000000
--- a/debian/patches/04-fix_kfreebsd_build.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: Fix kfreebsd build.
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: no
-
-Index: qlandkartegt/CMakeLists.txt
-===================================================================
---- qlandkartegt.orig/CMakeLists.txt
-+++ qlandkartegt/CMakeLists.txt
-@@ -94,7 +94,7 @@ endif (NOT QK_QT5_SERIAL_PORT)
- 
- add_subdirectory(3rdparty/QZip)
- add_subdirectory(3rdparty/QTextHtmlExporter)
--add_subdirectory(3rdparty/QDeviceWatcher)
-+#add_subdirectory(3rdparty/QDeviceWatcher)
- add_subdirectory(3rdparty/getopt)
- add_subdirectory(3rdparty/map2gcm)
- add_subdirectory(3rdparty/map2rmap)
-Index: qlandkartegt/src/CDeviceGarminBulk.cpp
-===================================================================
---- qlandkartegt.orig/src/CDeviceGarminBulk.cpp
-+++ qlandkartegt/src/CDeviceGarminBulk.cpp
-@@ -37,11 +37,11 @@
- CDeviceGarminBulk::CDeviceGarminBulk(QObject * parent)
- : IDevice("Garmin Mass Storage", parent)
- {
--    deviceWatcher = new QDeviceWatcher(this);
-+//    deviceWatcher = new QDeviceWatcher(this);
-     connect(deviceWatcher, SIGNAL(deviceAdded(QString)), SLOT(slotDevice(QString)));
-     connect(deviceWatcher, SIGNAL(deviceChanged(QString)), SLOT(slotDevice(QString)));
-     connect(deviceWatcher, SIGNAL(deviceRemoved(QString)), SLOT(slotDevice(QString)));
--    deviceWatcher->start();
-+//    deviceWatcher->start();
- 
-     qDebug() << "***************************************CDeviceGarminBulk";
- }
-Index: qlandkartegt/src/CMakeLists.txt
-===================================================================
---- qlandkartegt.orig/src/CMakeLists.txt
-+++ qlandkartegt/src/CMakeLists.txt
-@@ -800,7 +800,7 @@ set(qlandkarte_link_libs
-     ${GPSD_LIBRARIES}
-     qzip
-     qtexthtmlexporter
--    qdevicewatcher
-+ #   qdevicewatcher
-     getopt
-     ${QTSOAP_LIBRARIES}
-     ${PROFILING_LIBRARIES}
diff --git a/debian/patches/series b/debian/patches/series
index 33ca598..8f222f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01-no-updates-check.patch
 02-restore_mapnik_and_user_agent.patch
 03-set_user_agent.patch
-04-fix_kfreebsd_build.patch

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