[Pkg-xfce-commits] r3893 - in desktop/trunk/orage/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Sat Mar 6 09:59:03 UTC 2010
Author: corsac
Date: 2010-03-06 09:59:02 +0000 (Sat, 06 Mar 2010)
New Revision: 3893
Added:
desktop/trunk/orage/debian/patches/01_fix-build-with-external-ical.patch
Removed:
desktop/trunk/orage/debian/patches/01-dont-duplicate.patch
Modified:
desktop/trunk/orage/debian/changelog
desktop/trunk/orage/debian/control
desktop/trunk/orage/debian/rules
desktop/trunk/orage/debian/watch
Log:
- add build-dep on libical-dev and libpopt-dev.
* debian/patches
- 01-dont-duplicate dropped.
* debian/watch updated to track upstream repository reorganization.
* debian/rules:
- update configure flags.
- drop useless call to dh_desktop.
* debian/patches
- 01_fix-build-with-external-ical added, update includes to correctly pick
system libical.
Modified: desktop/trunk/orage/debian/changelog
===================================================================
--- desktop/trunk/orage/debian/changelog 2010-03-04 13:10:59 UTC (rev 3892)
+++ desktop/trunk/orage/debian/changelog 2010-03-06 09:59:02 UTC (rev 3893)
@@ -3,8 +3,18 @@
* New upstream release.
* debian/control:
- update standards version to 3.8.4.
+ - add build-dep on libical-dev and libpopt-dev.
+ * debian/patches
+ - 01-dont-duplicate dropped.
+ * debian/watch updated to track upstream repository reorganization.
+ * debian/rules:
+ - update configure flags.
+ - drop useless call to dh_desktop.
+ * debian/patches
+ - 01_fix-build-with-external-ical added, update includes to correctly pick
+ system libical.
- -- Yves-Alexis Perez <corsac at debian.org> Thu, 04 Mar 2010 14:10:47 +0100
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 06 Mar 2010 10:58:45 +0100
orage (4.6.1-1) unstable; urgency=low
Modified: desktop/trunk/orage/debian/control
===================================================================
--- desktop/trunk/orage/debian/control 2010-03-04 13:10:59 UTC (rev 3892)
+++ desktop/trunk/orage/debian/control 2010-03-06 09:59:02 UTC (rev 3893)
@@ -6,7 +6,7 @@
Build-Depends: debhelper (>= 7), cdbs, libxml-parser-perl,
libgtk2.0-dev (>= 2.10.1), xfce4-panel-dev (>= 4.6.0), chrpath,
libxfcegui4-dev (>= 4.6.0), libnotify-dev, libdbus-1-dev, intltool,
- libdbus-1-dev
+ libdbus-1-dev, libical-dev, libpopt-dev
Standards-Version: 3.8.4
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/orage/
Deleted: desktop/trunk/orage/debian/patches/01-dont-duplicate.patch
===================================================================
--- desktop/trunk/orage/debian/patches/01-dont-duplicate.patch 2010-03-04 13:10:59 UTC (rev 3892)
+++ desktop/trunk/orage/debian/patches/01-dont-duplicate.patch 2010-03-06 09:59:02 UTC (rev 3893)
@@ -1,76 +0,0 @@
---- src/ical-code.c 2009-03-01 21:30:23.000000000 +0100
-+++ src/ical-code.c.new 2009-03-01 22:03:31.000000000 +0100
-@@ -3919,14 +3919,50 @@
- return(TRUE);
- }
-
-+icalcomponent *component_with_uid(char *uid)
-+{
-+ icalcomponent *c1;
-+ const char *text;
-+
-+ if (xfical_file_open(FALSE)) {
-+ for (c1 = icalcomponent_get_first_component(ical, ICAL_VEVENT_COMPONENT);
-+ c1 != 0;
-+ c1 = icalcomponent_get_next_component(ical, ICAL_VEVENT_COMPONENT)) {
-+ text = icalcomponent_get_uid(c1);
-+
-+ if ((ORAGE_STR_EXISTS(text) && strcmp(text, uid) == 0)
-+ && ((icalcomponent_isa(c1) == ICAL_VEVENT_COMPONENT)
-+ || (icalcomponent_isa(c1) == ICAL_VTODO_COMPONENT)
-+ || (icalcomponent_isa(c1) == ICAL_VJOURNAL_COMPONENT))) {
-+ return (c1);
-+ }
-+ }
-+ }
-+
-+ return (NULL);
-+}
-+
-+icaltimetype component_lmtime(icalcomponent *c)
-+{
-+ icalproperty *p = NULL;
-+
-+for (p = icalcomponent_get_first_property(c, ICAL_ANY_PROPERTY);
-+ p != 0;
-+ p = icalcomponent_get_next_property(c, ICAL_ANY_PROPERTY)) {
-+ if (icalproperty_isa(p) == ICAL_LASTMODIFIED_PROPERTY)
-+ return icalvalue_get_datetime(icalproperty_get_value(p));
-+ }
-+}
-+
- gboolean xfical_import_file(char *file_name)
- {
- #undef P_N
- #define P_N "xfical_import_file: "
- icalset *file_ical = NULL;
-- char *ical_file_name = NULL;
-- icalcomponent *c1, *c2;
-+ char *ical_file_name = NULL, *uid = NULL;
-+ icalcomponent *c1, *c2, *c3;
- int cnt1 = 0, cnt2 = 0;
-+ icaltimetype ilmtime, elmtime;
-
- #ifdef ORAGE_DEBUG
- orage_message(-100, P_N);
-@@ -3951,8 +3987,19 @@
- if ((icalcomponent_isa(c2) == ICAL_VEVENT_COMPONENT)
- || (icalcomponent_isa(c2) == ICAL_VTODO_COMPONENT)
- || (icalcomponent_isa(c2) == ICAL_VJOURNAL_COMPONENT)) {
-+ uid = icalcomponent_get_uid(c2);
-+ c3 = component_with_uid(uid);
- cnt2++;
-- add_event(c2);
-+ if ( c3 == NULL)
-+ add_event(c2);
-+ else {
-+ ilmtime = component_lmtime(c3);
-+ elmtime = component_lmtime(c2);
-+ if (icaltime_compare(ilmtime, elmtime) < 0) {
-+ xfical_appt_del(g_strconcat("O00.", uid, NULL));
-+ add_event(c2);
-+ }
-+ }
- }
- /* we ignore TIMEZONE component; Orage only uses internal
- * timezones from libical */
Added: desktop/trunk/orage/debian/patches/01_fix-build-with-external-ical.patch
===================================================================
--- desktop/trunk/orage/debian/patches/01_fix-build-with-external-ical.patch (rev 0)
+++ desktop/trunk/orage/debian/patches/01_fix-build-with-external-ical.patch 2010-03-06 09:59:02 UTC (rev 3893)
@@ -0,0 +1,45 @@
+diff --git a/src/ical-archive.c b/src/ical-archive.c
+index 100be99..084c01f 100644
+--- a/src/ical-archive.c
++++ b/src/ical-archive.c
+@@ -51,8 +51,8 @@
+ #include <gtk/gtk.h>
+ #include <glib/gprintf.h>
+ #include <glib/gstdio.h>
+-#include <ical.h>
+-#include <icalss.h>
++#include <libical/ical.h>
++#include <libical/icalss.h>
+
+ #include "orage-i18n.h"
+ #include "functions.h"
+diff --git a/src/ical-code.c b/src/ical-code.c
+index 6f058ac..788ccbf 100644
+--- a/src/ical-code.c
++++ b/src/ical-code.c
+@@ -51,8 +51,8 @@
+ #include <gtk/gtk.h>
+ #include <glib/gprintf.h>
+ #include <glib/gstdio.h>
+-#include <ical.h>
+-#include <icalss.h>
++#include <libical/ical.h>
++#include <libical/icalss.h>
+
+ #include "orage-i18n.h"
+ #include "functions.h"
+diff --git a/src/ical-expimp.c b/src/ical-expimp.c
+index 9bda162..5c1380a 100644
+--- a/src/ical-expimp.c
++++ b/src/ical-expimp.c
+@@ -51,8 +51,8 @@
+ #include <gtk/gtk.h>
+ #include <glib/gprintf.h>
+ #include <glib/gstdio.h>
+-#include <ical.h>
+-#include <icalss.h>
++#include <libical/ical.h>
++#include <libical/icalss.h>
+
+ #include "orage-i18n.h"
+ #include "functions.h"
Modified: desktop/trunk/orage/debian/rules
===================================================================
--- desktop/trunk/orage/debian/rules 2010-03-04 13:10:59 UTC (rev 3892)
+++ desktop/trunk/orage/debian/rules 2010-03-06 09:59:02 UTC (rev 3893)
@@ -3,13 +3,10 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/autotools.mk
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-final --enable-dbus
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-dbus --enable-libical
LDFLAGS += -Wl,-z,defs -Wl,--as-needed
install/orage::
chrpath -d -k `pwd`/debian/orage/usr/bin/* \
`pwd`/debian/orage/usr/lib/orage/xfce4/*/*
-
-binary-post-install/orage::
- dh_desktop
Modified: desktop/trunk/orage/debian/watch
===================================================================
--- desktop/trunk/orage/debian/watch 2010-03-04 13:10:59 UTC (rev 3892)
+++ desktop/trunk/orage/debian/watch 2010-03-06 09:59:02 UTC (rev 3893)
@@ -1,3 +1,3 @@
version=3
-http://www.xfce.org/archive/xfce-(.*)/src/ \
- orage-(.*)\.tar\.bz2
+http://www.xfce.org/archive/src/apps/orage/([\d\.]+)/ \
+ orage-([\d\.]+)\.tar\.(?:gz|bz2)
More information about the Pkg-xfce-commits
mailing list