[SCM] marble packaging branch, master, updated. debian/4.13.1-2-10-g1122faf

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/marble.git;a=commitdiff;h=5afc884

The following commit has been merged in the master branch:
commit 5afc8840507140f20a45201a209b0a28ae1d51b8
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sun Jul 27 00:15:41 2014 +0200

    Remove patch: upstream_tests-fix-build-when-qreal-double.patch applied upstream.
---
 debian/changelog                                   |  2 ++
 debian/patches/series                              |  1 -
 ...pstream_tests-fix-build-when-qreal-double.patch | 28 ----------------------
 3 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4f84503..9788894 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 marble (4:4.13.3-1) UNRELEASED; urgency=medium
 
   * New upstream release. (Closes: #746880)
+  * Remove patch: upstream_tests-fix-build-when-qreal-double.patch
+    applied upstream.
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Jul 2014 13:15:55 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index b69f2bd..a2ff3c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 fix_qmake_fallback.diff
 do_not_install_private_headers
-upstream_tests-fix-build-when-qreal-double.patch
diff --git a/debian/patches/upstream_tests-fix-build-when-qreal-double.patch b/debian/patches/upstream_tests-fix-build-when-qreal-double.patch
deleted file mode 100644
index f77da15..0000000
--- a/debian/patches/upstream_tests-fix-build-when-qreal-double.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d74ea1c8f4e983329bdae96b04e6958d207043c4 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Sun, 1 Jun 2014 15:52:40 +0200
-Subject: [PATCH] tests: fix build when qreal!=double
-
-Just use qreal when a qreal& argument is expected.
-
-(cherry picked from commit 54f86b39d7e8d14d0ce915b9e98087f1d4d20b74)
----
- tests/GeoUriParserTest.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/GeoUriParserTest.cpp b/tests/GeoUriParserTest.cpp
-index 20268e9..c0d91d3 100644
---- a/tests/GeoUriParserTest.cpp
-+++ b/tests/GeoUriParserTest.cpp
-@@ -71,7 +71,7 @@ void GeoUriParserTest::testGeoUri()
- 
-     GeoDataCoordinates coords = parser.coordinates();
- 
--    double cLat = 0.0, cLon = 0.0, cAlt = 0.0;
-+    qreal cLat = 0.0, cLon = 0.0, cAlt = 0.0;
-     coords.geoCoordinates(cLon, cLat, cAlt, GeoDataCoordinates::Degree);
- 
-     QCOMPARE(ret, valid);
--- 
-2.0.0.rc2
-

-- 
marble packaging