[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#682269: marked as done (unblock: orage/4.8.3-2)

Your message dated Sat, 21 Jul 2012 14:23:59 +0200
with message-id <20120721122359.GQ14156@mraw.org>
and subject line Re: [Pkg-xfce-devel] Bug#682269: unblock: orage/4.8.3-2
has caused the Debian Bug report #682269,
regarding unblock: orage/4.8.3-2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
682269: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=682269
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
Owner: pkg-xfce-devel@lists.alioth.debian.org
User: release.debian.org@packages.debian.org
Usertags: unblock

Hi,

this is actually a pre-upload request for Orage. I'd like to upload a
new version to unstable for inclusion in Wheezy.

This version fix a quite annoying bug for those using Orage reminders
(notifications poping every second). Debdiff is attached.

unblock orage/4.8.3-2

Thanks in advance,
-- 
Yves-Alexis

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Differences in orage between 4.8.3-1 and 4.8.3-2
diff -Nru orage-4.8.3/debian/changelog orage-4.8.3/debian/changelog
--- orage-4.8.3/debian/changelog	2012-01-05 15:01:59.000000000 +0100
+++ orage-4.8.3/debian/changelog	2012-07-20 21:36:19.000000000 +0200
@@ -1,3 +1,12 @@
+orage (4.8.3-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 0001-4.8.3.1-Fixed-Bug-8525-Orage-keeps-notifying-every-s added, fix
+      alarm notification every second.                          closes: #666420
+
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Fri, 20 Jul 2012 21:35:34 +0200
+
 orage (4.8.3-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru orage-4.8.3/debian/patches/0001-4.8.3.1-Fixed-Bug-8525-Orage-keeps-notifying-every-s.patch orage-4.8.3/debian/patches/0001-4.8.3.1-Fixed-Bug-8525-Orage-keeps-notifying-every-s.patch
--- orage-4.8.3/debian/patches/0001-4.8.3.1-Fixed-Bug-8525-Orage-keeps-notifying-every-s.patch	1970-01-01 01:00:00.000000000 +0100
+++ orage-4.8.3/debian/patches/0001-4.8.3.1-Fixed-Bug-8525-Orage-keeps-notifying-every-s.patch	2012-07-20 21:36:44.000000000 +0200
@@ -0,0 +1,55 @@
+From 9759f4fdaf49ba03b916a2d93221794d9ff02917 Mon Sep 17 00:00:00 2001
+From: Juha Kautto <juha@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
+
diff -Nru orage-4.8.3/debian/patches/series orage-4.8.3/debian/patches/series
--- orage-4.8.3/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ orage-4.8.3/debian/patches/series	2012-07-20 21:35:25.000000000 +0200
@@ -0,0 +1 @@
+0001-4.8.3.1-Fixed-Bug-8525-Orage-keeps-notifying-every-s.patch

--- End Message ---
--- Begin Message --- 
Yves-Alexis Perez <corsac@debian.org> (21/07/2012):
> On ven., 2012-07-20 at 22:53 +0100, Adam D. Barratt wrote:
> > … and ping us when that's done so we review the final diff and
> > unblock orage.
> 
> 4.8.3-2 is now in unstable, thanks.

Thanks for the bug fix; unblocked.

Mraw,
KiBi.

Attachment: signature.asc
Description: Digital signature


--- End Message ---
Reply to: