[SCM] kholidays packaging branch, kubuntu_xenial_archive, updated. ubuntu/15.12.3-0ubuntu2

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kholidays.git;a=commitdiff;h=54bfbc4

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 54bfbc49ed11a2bfd204fcd365e7f1a8b05f86d4
Author: Scarlett Clark <sgclark at kubuntu.org>
Date:   Fri Apr 15 05:48:38 2016 -0700

    Add upstream patch ti fix build for new libc6.
---
 debian/changelog                         |  6 ++++++
 debian/patches/series                    |  2 ++
 debian/patches/upstream_isnan_libc6.diff | 20 ++++++++++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 06b6142..792b9e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kholidays (15.12.3-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Add upstream patch ti fix build for new libc6. 
+
+ -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 15 Apr 2016 05:48:11 -0700
+
 kholidays (15.12.3-0ubuntu1) xenial; urgency=medium
 
   * New upstream bugfix release
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..84ca2e0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+upstream_isnan_libc6.diff
+
diff --git a/debian/patches/upstream_isnan_libc6.diff b/debian/patches/upstream_isnan_libc6.diff
new file mode 100644
index 0000000..5251896
--- /dev/null
+++ b/debian/patches/upstream_isnan_libc6.diff
@@ -0,0 +1,20 @@
+--- a/src/sunriseset.cpp
++++ b/src/sunriseset.cpp
+@@ -180,7 +180,7 @@
+     double hourAngle = calcHourAngleSunrise(latitude, solarDec);
+     double delta = longitude + radToDeg(hourAngle);
+     QTime timeUTC(0, 0);
+-    if (isnan(delta))
++    if (std::isnan(delta))
+         return timeUTC;
+     timeUTC = timeUTC.addSecs((720 - (4.0 * delta) - eqTime) * 60);
+     return QTime(timeUTC.hour(),
+@@ -199,7 +199,7 @@
+     double hourAngle = -calcHourAngleSunrise(latitude, solarDec);
+     double delta = longitude + radToDeg(hourAngle);
+     QTime timeUTC(0, 0);
+-    if (isnan(delta))
++    if (std::isnan(delta))
+         return timeUTC;
+     timeUTC = timeUTC.addSecs((720 - (4.0 * delta) - eqTime) * 60);
+     return QTime(timeUTC.hour(), 

-- 
kholidays packaging