vcs.maemo.org Git - oespirit1/blob - alarmd-patches/mer-changes.patch

   1 --- alarmd-0.5.20/rpc-mce.c
   2 +++ alarmd-0.5.20/rpc-mce.c
   3 @@ -29,39 +29,39 @@
   4
   5  void mce_set_alarm_visibility(DBusConnection *system_bus, gboolean visible)
   6  {
   7 -       const gchar *mode = visible ? MCE_ALARM_VISIBLE : MCE_ALARM_OFF;
   8 +/*     const gchar *mode = visible ? MCE_ALARM_VISIBLE : MCE_ALARM_OFF; */
   9         ENTER_FUNC;
  10
  11         DEBUG("Telling mce alarm is %s", visible ? "visible" : "off");
  12
  13 -       dbus_do_call(system_bus, NULL, FALSE,
  14 +/*     dbus_do_call(system_bus, NULL, FALSE,
  15                         MCE_SERVICE, MCE_REQUEST_PATH, MCE_REQUEST_IF,
  16                         MCE_ALARM_MODE_CHANGE_REQ,
  17                         DBUS_TYPE_STRING, &mode,
  18 -                       DBUS_TYPE_INVALID);
  19 +                       DBUS_TYPE_INVALID); */
  20         LEAVE_FUNC;
  21  }
  22
  23  void mce_request_powerup(DBusConnection *system_bus)
  24  {
  25         ENTER_FUNC;
  26 -       dbus_do_call(system_bus, NULL, FALSE,
  27 +/*     dbus_do_call(system_bus, NULL, FALSE,
  28                         MCE_SERVICE,
  29                         MCE_REQUEST_PATH,
  30                         MCE_REQUEST_IF,
  31                         MCE_POWERUP_REQ,
  32 -                       DBUS_TYPE_INVALID);
  33 +                       DBUS_TYPE_INVALID); */
  34         LEAVE_FUNC;
  35  }
  36
  37  void mce_request_shutdown(DBusConnection *system_bus)
  38  {
  39         ENTER_FUNC;
  40 -       dbus_do_call(system_bus, NULL, FALSE,
  41 +/*     dbus_do_call(system_bus, NULL, FALSE,
  42                         MCE_SERVICE,
  43                         MCE_REQUEST_PATH,
  44                         MCE_REQUEST_IF,
  45                         MCE_SHUTDOWN_REQ,
  46 -                       DBUS_TYPE_INVALID);
  47 +                       DBUS_TYPE_INVALID); */
  48         LEAVE_FUNC;
  49  }
  50 --- alarmd-0.5.20/libalarm.pc
  51 +++ alarmd-0.5.20/libalarm.pc
  52 @@ -0,0 +1,9 @@
  53 +includedir=/usr/include/alarmd
  54 +libdir=/usr/lib
  55 +
  56 +Name: libalarm
  57 +Description: Alarm API.
  58 +Version: 0.5.20mer2
  59 +
  60 +Libs: -L${libdir} -lalarm
  61 +Cflags: -I${includedir}
  62 --- alarmd-0.5.20/alarmd.sh
  63 +++ alarmd-0.5.20/alarmd.sh
  64 @@ -0,0 +1,5 @@
  65 +#!/bin/sh
  66 +
  67 +rm -f /var/lib/alarmd/alarm_queue.xml
  68 +rm -f /var/lib/alarmd/next_alarm_time
  69 +rm -f /var/lib/alarmd/next_alarm_mode
  70 --- alarmd-0.5.20/alarmd.conf
  71 +++ alarmd-0.5.20/alarmd.conf
  72 @@ -0,0 +1,7 @@
  73 +<backup-configuration>
  74 + <locations>
  75 +  <location type="file" category="settings" auto="true">
  76 +   /var/lib/alarmd/alarm_queue.xml
  77 +  </location>
  78 + </locations>
  79 +</backup-configuration>
  80 --- alarmd-0.5.20/Makefile
  81 +++ alarmd-0.5.20/Makefile
  82 @@ -40,7 +40,6 @@
  83  PACKAGE=alarmd
  84  TARGETS=alarmd libalarm.la libgtimeout.la libretu.la alarmtool apitest dbustest
  85
  86 -WARNINGS += -Werror
  87  WARNINGS += -W -Wall -Wpointer-arith -Wundef -Wcast-align
  88  WARNINGS += -Wbad-function-cast -Wwrite-strings -Wsign-compare
  89  WARNINGS += -Waggregate-return -Wmissing-noreturn -Wnested-externs
  90 @@ -113,12 +112,12 @@
  91  alarmtool_SOURCES := alarmtool.c
  92
  93  apitest_CFLAGS += -I`pwd`/include
  94 -apitest_DIR := /usr/share/alarmd/tests
  95 +apitest_DIR := ${DESTDIR}/usr/share/alarmd/tests
  96  apitest_LDFLAGS += libalarm.la
  97  apitest_SOURCES := tests/apitest.c
  98
  99  dbustest_CFLAGS += -I`pwd`/include `pkg-config dbus-glib-1 glib-2.0 --cflags`
 100 -dbustest_DIR := /usr/share/alarmd/tests
 101 +dbustest_DIR := ${DESTDIR}/usr/share/alarmd/tests
 102  dbustest_LDFLAGS += libalarm.la `pkg-config dbus-glib-1 glib-2.0 --libs`
 103  dbustest_SOURCES := tests/dbustest.c
 104
 105 --- alarmd-0.5.20/debian/changelog
 106 +++ alarmd-0.5.20/debian/changelog
 107 @@ -1,3 +1,15 @@
 108 +alarmd (0.5.20-mer4) jaunty; urgency=low
 109 +
 110 +  * Removed obsolete MCE statements (XXX)
 111 +
 112 + -- Carsten V. Munk <cvm@cs.au.dk>  Thu, 07 May 2009 10:13:48 +0000
 113 +
 114 +alarmd (0.5.20-mer1) jaunty; urgency=low
 115 +
 116 +  * Removed -Werror.
 117 +
 118 + -- Carsten V. Munk <cvm@cs.au.dk>  Sat, 10 Jan 2009 14:46:33 +0000
 119 +
 120  alarmd (0.5.20) unstable; urgency=low
 121
 122    * Fix alarmd busylooping. Fixes: NB#83269