[Pkg-xfce-commits] r7310 - in desktop/branches/experimental/orage: . debian debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Sun Feb 17 07:12:38 UTC 2013
Author: corsac
Date: 2013-02-17 19:12:38 +0000 (Sun, 17 Feb 2013)
New Revision: 7310
Removed:
desktop/branches/experimental/orage/debian/patches/0001-4.8.3.1-Fixed-Bug-8525-Orage-keeps-notifying-every-s.patch
desktop/branches/experimental/orage/debian/patches/series
Modified:
desktop/branches/experimental/orage/
desktop/branches/experimental/orage/debian/changelog
desktop/branches/experimental/orage/debian/control
desktop/branches/experimental/orage/debian/rules
Log:
merge changes from unstable branch
Property changes on: desktop/branches/experimental/orage
___________________________________________________________________
Added: svn:mergeinfo
+ /desktop/trunk/orage:7153-7309
Modified: desktop/branches/experimental/orage/debian/changelog
===================================================================
--- desktop/branches/experimental/orage/debian/changelog 2013-02-02 13:23:56 UTC (rev 7309)
+++ desktop/branches/experimental/orage/debian/changelog 2013-02-17 19:12:38 UTC (rev 7310)
@@ -1,19 +1,27 @@
-orage (4.8.3-4) UNRELEASED; urgency=low
+orage (4.8.4-2~exp1) UNRELEASED; urgency=low
+ * Rebuild against xfce4-panel 4.10.
* debian/control:
- force build-deps for Xfce 4.10. closes: #693670
- -- Yves-Alexis Perez <corsac at debian.org> Mon, 19 Nov 2012 14:53:00 +0100
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 17 Sep 2012 23:52:46 +0200
-orage (4.8.3-3) experimental; urgency=low
+=======
+orage (4.8.4-1) unstable; urgency=low
- * Rebuild against xfce4-panel 4.10.
+ * New upstream release.
+ * debian/patches
+ - 0001-4.8.3.1-Fixed-Bug-8525-Orage-keeps-notifying-every-s dropped,
+ included upstream.
+ * debian/rules:
+ - enable 'all' hardening flags.
* debian/control:
- - update standards version to 3.9.3.
+ - update standards version to 3.9.4.
- update debhelper build-dep to 9.
- -- Yves-Alexis Perez <corsac at debian.org> Mon, 17 Sep 2012 23:52:46 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 02 Feb 2013 10:27:49 +0100
+>>>>>>> .merge-right.r7309
orage (4.8.3-2) unstable; urgency=low
* debian/patches:
Modified: desktop/branches/experimental/orage/debian/control
===================================================================
--- desktop/branches/experimental/orage/debian/control 2013-02-02 13:23:56 UTC (rev 7309)
+++ desktop/branches/experimental/orage/debian/control 2013-02-17 19:12:38 UTC (rev 7310)
@@ -9,7 +9,7 @@
libxfcegui4-dev (>= 4.10.0), libnotify-dev, libdbus-1-dev, intltool,
libdbus-1-dev, libical-dev, libpopt-dev, xfce4-dev-tools, libtool,
dpkg-dev (>= 1.16.1)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/orage/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/orage/
Deleted: desktop/branches/experimental/orage/debian/patches/0001-4.8.3.1-Fixed-Bug-8525-Orage-keeps-notifying-every-s.patch
===================================================================
--- desktop/branches/experimental/orage/debian/patches/0001-4.8.3.1-Fixed-Bug-8525-Orage-keeps-notifying-every-s.patch 2013-02-02 13:23:56 UTC (rev 7309)
+++ desktop/branches/experimental/orage/debian/patches/0001-4.8.3.1-Fixed-Bug-8525-Orage-keeps-notifying-every-s.patch 2013-02-17 19:12:38 UTC (rev 7310)
@@ -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/branches/experimental/orage/debian/patches/series
===================================================================
--- desktop/branches/experimental/orage/debian/patches/series 2013-02-02 13:23:56 UTC (rev 7309)
+++ desktop/branches/experimental/orage/debian/patches/series 2013-02-17 19:12:38 UTC (rev 7310)
@@ -1 +0,0 @@
-0001-4.8.3.1-Fixed-Bug-8525-Orage-keeps-notifying-every-s.patch
Modified: desktop/branches/experimental/orage/debian/rules
===================================================================
--- desktop/branches/experimental/orage/debian/rules 2013-02-02 13:23:56 UTC (rev 7309)
+++ desktop/branches/experimental/orage/debian/rules 2013-02-17 19:12:38 UTC (rev 7310)
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
-export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
override_dh_auto_configure:
More information about the Pkg-xfce-commits
mailing list