[SCM] kholidays packaging branch, kubuntu_xenial_archive, updated. ubuntu/15.12.3-0ubuntu2-1-ge3f9b7a
Scarlett Clark
sgclark-guest at moszumanska.debian.org
Fri Apr 15 13:28:43 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kholidays.git;a=commitdiff;h=e3f9b7a
The following commit has been merged in the kubuntu_xenial_archive branch:
commit e3f9b7abbccde6948f88e0694080f92c1fdc06b1
Author: Scarlett Clark <sgclark at kubuntu.org>
Date: Fri Apr 15 06:28:03 2016 -0700
Fix whitepaces/newlines/cruft in patch.
* Fix whitepaces/newlines/cruft in patch.
* Release to archive.
---
debian/changelog | 5 ++++-
debian/patches/upstream_isnan_libc6.diff | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 792b9e4..6537dc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
-kholidays (15.12.3-0ubuntu2) UNRELEASED; urgency=medium
+kholidays (15.12.3-0ubuntu2) xenial; urgency=medium
* Add upstream patch ti fix build for new libc6.
+ * Remove newlines from patch.
+ * Fix whitepaces/newlines/cruft in patch.
+ * Release to archive.
-- Scarlett Clark <sgclark at kubuntu.org> Fri, 15 Apr 2016 05:48:11 -0700
diff --git a/debian/patches/upstream_isnan_libc6.diff b/debian/patches/upstream_isnan_libc6.diff
index 5251896..7982e4a 100644
--- a/debian/patches/upstream_isnan_libc6.diff
+++ b/debian/patches/upstream_isnan_libc6.diff
@@ -17,4 +17,4 @@
+ if (std::isnan(delta))
return timeUTC;
timeUTC = timeUTC.addSecs((720 - (4.0 * delta) - eqTime) * 60);
- return QTime(timeUTC.hour(),
+ return QTime(timeUTC.hour(),
--
kholidays packaging
More information about the pkg-kde-commits
mailing list