[Pkg-xfce-commits] r4155 - in goodies/trunk/xfce4-notifyd/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2010-07-07 12:12:36 +0000 (Wed, 07 Jul 2010)
New Revision: 4155

Added:
   goodies/trunk/xfce4-notifyd/debian/patches/02_add-spec-version-to-GetServerInformation.patch
Modified:
   goodies/trunk/xfce4-notifyd/debian/changelog
   goodies/trunk/xfce4-notifyd/debian/patches/series
   goodies/trunk/xfce4-notifyd/debian/rules
Log:
* debian/patches:
  - 02_add-spec-version-to-GetServerInformation added, returns spec version
  information even if it's not part of 0.9.                  closes: #588272
* debian/rules:
  - add quilt .pc files to POTFILES.skip.

Modified: goodies/trunk/xfce4-notifyd/debian/changelog
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/changelog	2010-06-29 07:35:29 UTC (rev 4154)
+++ goodies/trunk/xfce4-notifyd/debian/changelog	2010-07-07 12:12:36 UTC (rev 4155)
@@ -1,9 +1,17 @@
 xfce4-notifyd (0.1.0-5) UNRELEASED; urgency=low
 
+  [ Evgeni Golov ]
   * Fix Vcs-* fields, they were missing 'trunk' in the path.
 
- -- Evgeni Golov <evgeni at debian.org>  Thu, 11 Jun 2009 10:14:07 +0200
+  [ Yves-Alexis Perez ]
+  * debian/patches:
+    - 02_add-spec-version-to-GetServerInformation added, returns spec version
+    information even if it's not part of 0.9.                  closes: #588272
+  * debian/rules:
+    - add quilt .pc files to POTFILES.skip.
 
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 07 Jul 2010 14:10:10 +0200
+
 xfce4-notifyd (0.1.0-4) unstable; urgency=low
 
   * debian/patches/01_send-second-arg-notification-closed.patch:

Added: goodies/trunk/xfce4-notifyd/debian/patches/02_add-spec-version-to-GetServerInformation.patch
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/patches/02_add-spec-version-to-GetServerInformation.patch	                        (rev 0)
+++ goodies/trunk/xfce4-notifyd/debian/patches/02_add-spec-version-to-GetServerInformation.patch	2010-07-07 12:12:36 UTC (rev 4155)
@@ -0,0 +1,50 @@
+diff --git a/xfce4-notifyd/notify-dbus.xml b/xfce4-notifyd/notify-dbus.xml
+index 832d7b9..98a82ef 100644
+--- a/xfce4-notifyd/notify-dbus.xml
++++ b/xfce4-notifyd/notify-dbus.xml
+@@ -27,6 +27,7 @@
+             <arg direction="out" name="name" type="s"/>
+             <arg direction="out" name="vendor" type="s"/>
+             <arg direction="out" name="version" type="s"/>
++            <arg direction="out" name="spec_version" type="s"/>
+         </method>
+ 
+         <signal name="NotificationClosed">
+diff --git a/xfce4-notifyd/xfce-notify-daemon.c b/xfce4-notifyd/xfce-notify-daemon.c
+index 9a14e30..946aa10 100644
+--- a/xfce4-notifyd/xfce-notify-daemon.c
++++ b/xfce4-notifyd/xfce-notify-daemon.c
+@@ -98,6 +98,7 @@ static gboolean notify_get_server_information(XfceNotifyDaemon *daemon,
+                                               gchar **OUT_name,
+                                               gchar **OUT_vendor,
+                                               gchar **OUT_version,
++                                              gchar **OUT_spec_version,
+                                               GError **error);
+ 
+ static gboolean notify_quit(XfceNotifyDaemon *daemon,
+@@ -419,11 +420,13 @@ notify_get_server_information(XfceNotifyDaemon *daemon,
+                               gchar **OUT_name,
+                               gchar **OUT_vendor,
+                               gchar **OUT_version,
++                              gchar **OUT_spec_version,
+                               GError **error)
+ {
+     *OUT_name = g_strdup("Xfce Notify Daemon");
+     *OUT_vendor = g_strdup("Xfce");
+     *OUT_version = g_strdup(VERSION);
++    *OUT_spec_version = g_strdup(NOTIFICATIONS_SPEC_VERSION);
+ 
+     return TRUE;
+ }
+diff --git a/xfce4-notifyd/xfce-notify-daemon.h b/xfce4-notifyd/xfce-notify-daemon.h
+index 9b9efe6..5a94c38 100644
+--- a/xfce4-notifyd/xfce-notify-daemon.h
++++ b/xfce4-notifyd/xfce-notify-daemon.h
+@@ -25,6 +25,7 @@
+ #define XFCE_TYPE_NOTIFY_DAEMON     (xfce_notify_daemon_get_type())
+ #define XFCE_NOTIFY_DAEMON(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), XFCE_TYPE_NOTIFY_DAEMON, XfceNotifyDaemon))
+ #define XFCE_IS_NOTIFY_DAEMON(obj)  (G_TYPE_CHECK_INSTANCE_TYPE((obj), XFCE_TYPE_NOTIFY_DAEMON))
++#define NOTIFICATIONS_SPEC_VERSION "0.9"
+ 
+ G_BEGIN_DECLS
+ 

Modified: goodies/trunk/xfce4-notifyd/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/patches/series	2010-06-29 07:35:29 UTC (rev 4154)
+++ goodies/trunk/xfce4-notifyd/debian/patches/series	2010-07-07 12:12:36 UTC (rev 4155)
@@ -1 +1,2 @@
 01_send-second-arg-notification-closed.patch
+02_add-spec-version-to-GetServerInformation.patch

Modified: goodies/trunk/xfce4-notifyd/debian/rules
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/rules	2010-06-29 07:35:29 UTC (rev 4154)
+++ goodies/trunk/xfce4-notifyd/debian/rules	2010-07-07 12:12:36 UTC (rev 4155)
@@ -3,5 +3,13 @@
 
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
+override_dh_auto_configure:
+	dh_auto_configure -- --enable-maintainer-mode
+	find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
+
+override_dh_auto_clean:
+	rm -f po/POTFILES.skip
+	dh_auto_clean
+
 %:
 	dh --with quilt $@