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

Lionel Le Folgoc mrpouit-guest at alioth.debian.org
Sat Apr 2 10:09:56 UTC 2011


Author: mrpouit-guest
Date: 2011-04-02 22:09:52 +0000 (Sat, 02 Apr 2011)
New Revision: 5297

Removed:
   goodies/trunk/xfce4-notifyd/debian/patches/01_send-second-arg-notification-closed.patch
   goodies/trunk/xfce4-notifyd/debian/patches/02_add-spec-version-to-GetServerInformation.patch
   goodies/trunk/xfce4-notifyd/debian/patches/series
Modified:
   goodies/trunk/xfce4-notifyd/
   goodies/trunk/xfce4-notifyd/debian/changelog
   goodies/trunk/xfce4-notifyd/debian/control
   goodies/trunk/xfce4-notifyd/debian/copyright
   goodies/trunk/xfce4-notifyd/debian/rules
Log:
merge experimental changes into trunk


Property changes on: goodies/trunk/xfce4-notifyd
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfce4-notifyd:4573-5296
/goodies/tags/xfce4-notifyd/0.1.0-5:4153-4572

Modified: goodies/trunk/xfce4-notifyd/debian/changelog
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/changelog	2011-04-02 21:53:40 UTC (rev 5296)
+++ goodies/trunk/xfce4-notifyd/debian/changelog	2011-04-02 22:09:52 UTC (rev 5297)
@@ -1,3 +1,25 @@
+xfce4-notifyd (0.2.1-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - convert libxfcegui4-dev build-dep to libxfce4ui-dev.
+    - update standards version to 3.9.1.
+    - add build-dep on hardening-includes.
+    - drop libsexy and libglade from build-deps.
+  * debian/rules:
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add -z,defs, --as-needed and -O1 to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS
+    - drop the overrides since we don't need to patch POTFILES.skip anymore.
+  * debian/patches:
+    - 01_send-second-arg-notification-closed dropped, xfce4-notifyd has been
+      ported to libnotify 0.4.5.
+    - 02_add-spec-version-to-GetServerInformation dropped as well, included
+      upstream.
+  * debian/copyright updated for new release.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 27 Feb 2011 15:10:42 +0100
+
 xfce4-notifyd (0.1.0-5) unstable; urgency=low
 
   [ Evgeni Golov ]

Modified: goodies/trunk/xfce4-notifyd/debian/control
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/control	2011-04-02 21:53:40 UTC (rev 5296)
+++ goodies/trunk/xfce4-notifyd/debian/control	2011-04-02 22:09:52 UTC (rev 5297)
@@ -6,10 +6,10 @@
  Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>, 
  Simon Huggins <huggie at earth.li>          
 Build-Depends: debhelper (>= 7.0.50~), intltool,
- libxfcegui4-dev (>= 4.6.0), libxfce4util-dev (>= 4.6.0),
- libdbus-1-dev, libdbus-glib-1-dev, libglade2-dev, libsexy-dev,
- exo-utils, libxfconf-0-dev
-Standards-Version: 3.9.0
+ libxfce4ui-1-dev, libxfce4util-dev (>= 4.6.0),
+ libdbus-1-dev, libdbus-glib-1-dev, exo-utils, libxfconf-0-dev, 
+ hardening-includes
+Standards-Version: 3.9.1
 Homepage: http://spuriousinterrupt.org/projects/xfce4-notifyd
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-notifyd/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-notifyd/

Modified: goodies/trunk/xfce4-notifyd/debian/copyright
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/copyright	2011-04-02 21:53:40 UTC (rev 5296)
+++ goodies/trunk/xfce4-notifyd/debian/copyright	2011-04-02 22:09:52 UTC (rev 5297)
@@ -8,8 +8,19 @@
 Copyright: © 2008 Brian Tarricone <bjt23 at cornell.edu>
 License: GPL-2
 
+Files: ./xfce4-notifyd/xfce-notify-window.{c,h}
+Copyright: © 2008 Brian Tarricone <bjt23 at cornell.edu>
+Copyright: © 2010 Jérôme Guelfucci <jeromeg at xfce.org>
+License: GPL-2
+
+Files: ./xfce4-notifyd/xfce-notify-daemon.c
+Copyright: © 2008 Brian Tarricone <bjt23 at cornell.edu>
+Copyright: © 2010 Jérôme Guelfucci <jeromeg at xfce.org>
+License: GPL-2
+
 Files: debian/*
 Copyright: © 2008 Evgeni Golov <sargentd at die-welt.net>
+Copyright: © 2010 Yves-Alexis Perez <corsac at debian.org>
 License: GPL-2
 
 License: GPL-2

Deleted: goodies/trunk/xfce4-notifyd/debian/patches/01_send-second-arg-notification-closed.patch
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/patches/01_send-second-arg-notification-closed.patch	2011-04-02 21:53:40 UTC (rev 5296)
+++ goodies/trunk/xfce4-notifyd/debian/patches/01_send-second-arg-notification-closed.patch	2011-04-02 22:09:52 UTC (rev 5297)
@@ -1,41 +0,0 @@
-Revert e5e86376c5824b74073ab1ab2a332ee9c3bb64fc
-We want to send the reason as libnotify 0.4.5 does support the reason arg.
-
-diff --git a/po/POTFILES.skip b/po/POTFILES.skip
-new file mode 100644
-index 0000000..4afffb8
---- /dev/null
-+++ b/po/POTFILES.skip
-@@ -0,0 +1 @@
-+.pc/01_send-second-arg-notification-closed.patch/xfce4-notifyd/xfce-notify-daemon.c
-diff --git a/xfce4-notifyd/xfce-notify-daemon.c b/xfce4-notifyd/xfce-notify-daemon.c
-index 9a14e30..cd71cbb 100644
---- a/xfce4-notifyd/xfce-notify-daemon.c
-+++ b/xfce4-notifyd/xfce-notify-daemon.c
-@@ -125,15 +125,10 @@
-                                                     G_SIGNAL_RUN_LAST,
-                                                     0,
-                                                     NULL, NULL,
--                                                    g_cclosure_marshal_VOID__UINT,
--                                                    G_TYPE_NONE, 1,
--                                                    G_TYPE_UINT);
--#if 0  /* it seems libnotify doesn't support the close-reason arg */
-                                                     xfce_notify_marshal_VOID__UINT_UINT,
-                                                     G_TYPE_NONE, 2,
-                                                     G_TYPE_UINT,
-                                                     G_TYPE_UINT);
--#endif
-     signals[SIG_ACTION_INVOKED] = g_signal_new("action-invoked",
-                                                XFCE_TYPE_NOTIFY_DAEMON,
-                                                G_SIGNAL_RUN_LAST,
-@@ -215,9 +210,7 @@
- 
-     g_tree_remove(daemon->active_notifications, id_p);
-     g_signal_emit(G_OBJECT(daemon), signals[SIG_NOTIFICATION_CLOSED], 0,
--                  GPOINTER_TO_UINT(id_p));
--    /* NOTE: libnotify doesn't support the close-reason argument to
--     * the signal.  not sure why. */
-+                  GPOINTER_TO_UINT(id_p), reason);
- }
- 
- static void

Deleted: 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	2011-04-02 21:53:40 UTC (rev 5296)
+++ goodies/trunk/xfce4-notifyd/debian/patches/02_add-spec-version-to-GetServerInformation.patch	2011-04-02 22:09:52 UTC (rev 5297)
@@ -1,50 +0,0 @@
-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 "1.0"
- 
- G_BEGIN_DECLS
- 

Deleted: goodies/trunk/xfce4-notifyd/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/patches/series	2011-04-02 21:53:40 UTC (rev 5296)
+++ goodies/trunk/xfce4-notifyd/debian/patches/series	2011-04-02 22:09:52 UTC (rev 5297)
@@ -1,2 +0,0 @@
-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	2011-04-02 21:53:40 UTC (rev 5296)
+++ goodies/trunk/xfce4-notifyd/debian/rules	2011-04-02 22:09:52 UTC (rev 5297)
@@ -1,13 +1,13 @@
 #!/usr/bin/make -f
-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 \;
+include /usr/share/hardening-includes/hardening.make
 
-override_dh_auto_clean:
-	rm -f po/POTFILES.skip
-	dh_auto_clean
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
 
+export CFLAGS LDFLAGS
+
 %:
 	dh $@




More information about the Pkg-xfce-commits mailing list