[Pkg-xfce-commits] r7294 - in desktop/trunk/orage/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2013-02-02 09:16:58 +0000 (Sat, 02 Feb 2013)
New Revision: 7294

Removed:
   desktop/trunk/orage/debian/patches/0001-4.8.3.1-Fixed-Bug-8525-Orage-keeps-notifying-every-s.patch
   desktop/trunk/orage/debian/patches/series
Modified:
   desktop/trunk/orage/debian/changelog
Log:
* New upstream release.
* debian/patches
  - 0001-4.8.3.1-Fixed-Bug-8525-Orage-keeps-notifying-every-s dropped,
    included upstream.

Modified: desktop/trunk/orage/debian/changelog
===================================================================
--- desktop/trunk/orage/debian/changelog	2013-01-21 10:01:30 UTC (rev 7293)
+++ desktop/trunk/orage/debian/changelog	2013-02-02 09:16:58 UTC (rev 7294)
@@ -1,3 +1,12 @@
+orage (4.8.4-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/patches
+    - 0001-4.8.3.1-Fixed-Bug-8525-Orage-keeps-notifying-every-s dropped,
+      included upstream.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 02 Feb 2013 10:16:03 +0100
+
 orage (4.8.3-2) unstable; urgency=low
 
   * debian/patches:

Deleted: desktop/trunk/orage/debian/patches/0001-4.8.3.1-Fixed-Bug-8525-Orage-keeps-notifying-every-s.patch
===================================================================
--- desktop/trunk/orage/debian/patches/0001-4.8.3.1-Fixed-Bug-8525-Orage-keeps-notifying-every-s.patch	2013-01-21 10:01:30 UTC (rev 7293)
+++ desktop/trunk/orage/debian/patches/0001-4.8.3.1-Fixed-Bug-8525-Orage-keeps-notifying-every-s.patch	2013-02-02 09:16:58 UTC (rev 7294)
@@ -1,55 +0,0 @@
-From 9759f4fdaf49ba03b916a2d93221794d9ff02917 Mon Sep 17 00:00:00 2001
-From: Juha Kautto <juha at xfce.org>
-Date: Sun, 4 Mar 2012 14:11:49 +0200
-Subject: [PATCH] 4.8.3.1: Fixed Bug 8525 Orage keeps notifying every second
- on "All day events"
-
-There was a bug in handling full day alarms.
----
- configure.in.in |    2 +-
- src/ical-code.c |   22 ++++++++++++++++++++++
- 2 files changed, 23 insertions(+), 1 deletion(-)
-
-diff --git a/src/ical-code.c b/src/ical-code.c
-index 70181bf..95fce2a 100644
---- a/src/ical-code.c
-+++ b/src/ical-code.c
-@@ -2720,6 +2720,17 @@ static alarm_struct *process_alarm_trigger(icalcomponent *c
-     per = ic_get_period(c, TRUE);
-     next_alarm_time = count_first_alarm_time(per, trg.duration, rel);
-     alarm_start_diff = icaltime_subtract(next_alarm_time, per.stime);
-+    /* Due to the hack in date time calculation in count_first_alarm_time,
-+       we need to set next_alarm_time to local timezone so that 
-+       icaltime_compare works. Fix for Bug 8525
-+     */
-+    if (icaltime_is_date(per.stime)) {
-+        if (local_icaltimezone != utc_icaltimezone) {
-+            next_alarm_time.is_utc        = 0;
-+            next_alarm_time.is_daylight   = 0;
-+            next_alarm_time.zone          = local_icaltimezone;
-+        }
-+    }
-     /*
- orage_message(120, P_N "current %s %s", icaltime_as_ical_string(cur_time), icaltime_get_tzid(cur_time));
- orage_message(120, P_N "Start %s %s", icaltime_as_ical_string(per.stime), icaltime_get_tzid(per.stime));
-@@ -2791,6 +2802,17 @@ orage_message(120, P_N "Alarm rec loop next_start:%s next_alarm:%s per.stime:%s"
- */
-         }
-         icalrecur_iterator_free(ri);
-+        /* Due to the hack in date time calculation in count_first_alarm_time,
-+           we need to set next_alarm_time to local timezone so that 
-+           icaltime_compare works. Fix for Bug 8525
-+         */
-+        if (icaltime_is_date(per.stime)) {
-+            if (local_icaltimezone != utc_icaltimezone) {
-+                next_alarm_time.is_utc        = 0;
-+                next_alarm_time.is_daylight   = 0;
-+                next_alarm_time.zone          = local_icaltimezone;
-+            }
-+        }
-         if (icaltime_compare(cur_time, next_alarm_time) <= 0) {
-             trg_active = TRUE;
-         }
--- 
-1.7.10.4
-

Deleted: desktop/trunk/orage/debian/patches/series
===================================================================
--- desktop/trunk/orage/debian/patches/series	2013-01-21 10:01:30 UTC (rev 7293)
+++ desktop/trunk/orage/debian/patches/series	2013-02-02 09:16:58 UTC (rev 7294)
@@ -1 +0,0 @@
-0001-4.8.3.1-Fixed-Bug-8525-Orage-keeps-notifying-every-s.patch