[SCM] Grantlee template engine packaging branch, master, updated. debian/0.3.0-5-5-gad9e77b

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/grantlee.git;a=commitdiff;h=ad9e77b

The following commit has been merged in the master branch:
commit ad9e77b2fa2e9545f864536cccb986cc973f1a2c
Author: Pino Toscano <pino at debian.org>
Date:   Sun Dec 8 10:16:31 2013 +0100

    testinternationalization-qreal.diff: remove, applied upstream
---
 debian/changelog                                   |  1 +
 debian/patches/series                              |  1 -
 debian/patches/testinternationalization-qreal.diff | 21 ---------------------
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index be6a61b..c7d7636 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ grantlee (0.4.0-0r1) UNRELEASED; urgency=low
   * Bump the cmake build dependency to 2.8.9.
   * Update the patches:
     - variantIsTrue-float-fix.diff: remove applied parts
+    - testinternationalization-qreal.diff: remove, applied upstream
 
  -- Debian Krap Maintainers <debian-qt-kde at lists.debian.org>  Sun, 08 Dec 2013 09:56:01 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index f3b7f64..e97c964 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 variantIsTrue-float-fix.diff
-testinternationalization-qreal.diff
diff --git a/debian/patches/testinternationalization-qreal.diff b/debian/patches/testinternationalization-qreal.diff
deleted file mode 100644
index 07daddd..0000000
--- a/debian/patches/testinternationalization-qreal.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-Author: Pino Toscano <toscano.pino at tiscali.it>
-Description: TestInternationalization: fix the double data in testFloats
- 7.4 is a double value, and the data expected is qreal; while this is
- not an issue on platforms where qreal is double, this causes a type
- mismatch where qreal is float (for example on arm and sh).
- .
- The easy fix is just to cast 4.2 as qreal.
-Last-Update: 2013-05-15
-Forwarded: https://www.gitorious.org/grantlee/grantlee/merge_requests/10
-
---- a/templates/tests/testinternationalization.cpp
-+++ b/templates/tests/testinternationalization.cpp
-@@ -798,7 +798,7 @@ void TestInternationalization::testFloat
-   QTest::addColumn<QString>("frFloatingPoint");
- 
-   QTest::newRow("float-01")
--    << 7.4
-+    << qreal(7.4)
-     << QString::fromLatin1("7.4")
-     << QString::fromLatin1("7.40")
-     << QString::fromLatin1("7.40")

-- 
Grantlee template engine packaging