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

Evgeni Golov evgeni at alioth.debian.org
Thu May 23 06:02:57 UTC 2013 

Author: evgeni
Date: 2013-05-23 06:02:57 +0000 (Thu, 23 May 2013)
New Revision: 7557

Removed:
   goodies/trunk/xfce4-notifyd/debian/patches/01_fix-dismiss-notifications.patch
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/patches/02_add_XfceNotifyWindow-summary-bold_option.diff
   goodies/trunk/xfce4-notifyd/debian/patches/series
   goodies/trunk/xfce4-notifyd/debian/rules
   goodies/trunk/xfce4-notifyd/debian/xfce4-notifyd.lintian-overrides
Log:
merge experimental and trunk and prepare 0.2.4


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

Modified: goodies/trunk/xfce4-notifyd/debian/changelog
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/changelog	2013-05-23 05:58:31 UTC (rev 7556)
+++ goodies/trunk/xfce4-notifyd/debian/changelog	2013-05-23 06:02:57 UTC (rev 7557)
@@ -1,6 +1,6 @@
-xfce4-notifyd (0.2.2-3) UNRELEASED; urgency=low
+xfce4-notifyd (0.2.4-1) UNRELEASED; urgency=low
 
-  * Team Upload.
+  [ Daniel Echeverry ]
   * Add XfceNotifyWindow::summary-bold option. 			closes: #687441
   * debian/control
     + Update homepage field. 					closes: #685737
@@ -8,8 +8,36 @@
   * debian/copyright
     + Update copyright file to DEP5
 
- -- Daniel Echeverry <epsilon77 at gmail.com>  Thu, 13 Sep 2012 14:44:46 -0500
+  [ Evgeni Golov ]
+  * New upstream release.
 
+ -- Evgeni Golov <evgeni at debian.org>  Thu, 23 May 2013 07:59:35 +0200
+
+xfce4-notifyd (0.2.3-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/patches:
+    - 01_fix-dismiss-notifications and 02_fix-desktop-category dropped,
+      included upstream.
+  * debian/rules:
+    - enable all hardening options.
+  * debian/control:
+    - add build-dep on libnotify-dev.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 21 Apr 2013 13:37:26 +0200
+
+xfce4-notifyd (0.2.2-3) experimental; urgency=low
+
+  [ Lionel Le Folgoc ]
+  * debian/patches:
+    - 02_fix-desktop-category.patch: added, let xfce4-notifyd-config appear
+      in xfce4-settings 4.9.x/4.10.
+
+  [ Yves-Alexis Perez ]
+  * debian/xfce4-notifyd.lintian-overrides: XFCE is now a valid category.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sat, 13 Oct 2012 15:56:05 +0200
+
 xfce4-notifyd (0.2.2-2) unstable; urgency=low
 
   * debian/patches:

Modified: goodies/trunk/xfce4-notifyd/debian/control
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/control	2013-05-23 05:58:31 UTC (rev 7556)
+++ goodies/trunk/xfce4-notifyd/debian/control	2013-05-23 06:02:57 UTC (rev 7557)
@@ -6,7 +6,8 @@
  Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 9), intltool, dpkg-dev (>= 1.16.1),
  libxfce4ui-1-dev, libxfce4util-dev (>= 4.8.0), libdbus-1-dev,
- libdbus-glib-1-dev, exo-utils, libxfconf-0-dev (>= 4.8.0)
+ libdbus-glib-1-dev, exo-utils, libxfconf-0-dev (>= 4.8.0),
+ libnotify-dev (>= 0.7.0)
 Standards-Version: 3.9.3
 Homepage: http://goodies.xfce.org/projects/applications/xfce4-notifyd
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-notifyd/

Modified: goodies/trunk/xfce4-notifyd/debian/copyright
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/copyright	2013-05-23 05:58:31 UTC (rev 7556)
+++ goodies/trunk/xfce4-notifyd/debian/copyright	2013-05-23 06:02:57 UTC (rev 7557)
@@ -1,25 +1,25 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Xfce4-notifyd
 Upstream-Contact: Brian Tarricone <bjt23 at cornell.edu>
-Source: http://goodies.xfce.org
+Source: http://goodies.xfce.org/projects/applications/xfce4-notifyd
 
 Files: *
 Copyright: © 2008 Brian Tarricone <bjt23 at cornell.edu>
 License: GPL-2
 
 Files: xfce4-notifyd/xfce-notify-window.c xfce4-notifyd/xfce-notify-window.h
-Copyright:    © 2008 Brian Tarricone <bjt23 at cornell.edu>
-	      ©	2010 Jérôme Guelfucci <jeromeg at xfce.org>
+Copyright: © 2008 Brian Tarricone <bjt23 at cornell.edu>
+           © 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>
-	   © 2010 Jérôme Guelfucci <jeromeg at xfce.org>
+           © 2010 Jérôme Guelfucci <jeromeg at xfce.org>
 License: GPL-2
 
 Files: debian/*
-Copyright: © 2008 Evgeni Golov <sargentd at die-welt.net>
-	   © 2010 Yves-Alexis Perez <corsac at debian.org>
+Copyright: © 2008-2013 Evgeni Golov <evgeni at debian.org>
+           © 2010-2013 Yves-Alexis Perez <corsac at debian.org>
 License: GPL-2
 
 License: GPL-2

Deleted: goodies/trunk/xfce4-notifyd/debian/patches/01_fix-dismiss-notifications.patch
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/patches/01_fix-dismiss-notifications.patch	2013-05-23 05:58:31 UTC (rev 7556)
+++ goodies/trunk/xfce4-notifyd/debian/patches/01_fix-dismiss-notifications.patch	2013-05-23 06:02:57 UTC (rev 7557)
@@ -1,23 +0,0 @@
-commit ad77e8aa48201c1c10226b54f7ab006989f2f4d5
-Author: Brian J. Tarricone <brian at tarricone.org>
-Date:   Mon Sep 26 00:07:31 2011 -0700
-
-    emit closed signal on correct object
-    
-    'widget' is actually the GtkButton when an action is clicked.  this is
-    why notifications were never dismissed when an action got clicked.
-    long-standing bug finally fixed!
-
-diff --git a/xfce4-notifyd/xfce-notify-window.c b/xfce4-notifyd/xfce-notify-window.c
-index 41316b8..8364d7a 100644
---- a/xfce4-notifyd/xfce-notify-window.c
-+++ b/xfce4-notifyd/xfce-notify-window.c
-@@ -718,7 +718,7 @@ xfce_notify_window_button_clicked(GtkWidget *widget,
- 
-     g_signal_emit(G_OBJECT(window), signals[SIG_ACTION_INVOKED], 0,
-                   action_id);
--    g_signal_emit(G_OBJECT(widget), signals[SIG_CLOSED], 0,
-+    g_signal_emit(G_OBJECT(window), signals[SIG_CLOSED], 0,
-                   XFCE_NOTIFY_CLOSE_REASON_DISMISSED);
- }
- 

Modified: goodies/trunk/xfce4-notifyd/debian/patches/02_add_XfceNotifyWindow-summary-bold_option.diff
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/patches/02_add_XfceNotifyWindow-summary-bold_option.diff	2013-05-23 05:58:31 UTC (rev 7556)
+++ goodies/trunk/xfce4-notifyd/debian/patches/02_add_XfceNotifyWindow-summary-bold_option.diff	2013-05-23 06:02:57 UTC (rev 7557)
@@ -8,7 +8,7 @@
 @@ -4,6 +4,7 @@ style "smoke-window"
      XfceNotifyWindow::border-color = "#ffffff"
      XfceNotifyWindow::border-radius = 10.0
-     XfceNotifyWindow::border-width = 3.0
+     XfceNotifyWindow::border-width-hover = 3.0
 +    XfceNotifyWindow::summary-bold = 1
  }
  class "XfceNotifyWindow" style "smoke-window"

Modified: goodies/trunk/xfce4-notifyd/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/patches/series	2013-05-23 05:58:31 UTC (rev 7556)
+++ goodies/trunk/xfce4-notifyd/debian/patches/series	2013-05-23 06:02:57 UTC (rev 7557)
@@ -1,2 +1 @@
-01_fix-dismiss-notifications.patch
 02_add_XfceNotifyWindow-summary-bold_option.diff

Modified: goodies/trunk/xfce4-notifyd/debian/rules
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/rules	2013-05-23 05:58:31 UTC (rev 7556)
+++ goodies/trunk/xfce4-notifyd/debian/rules	2013-05-23 06:02:57 UTC (rev 7557)
@@ -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
 
 %:
 	dh $@ --parallel

Modified: goodies/trunk/xfce4-notifyd/debian/xfce4-notifyd.lintian-overrides
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/xfce4-notifyd.lintian-overrides	2013-05-23 05:58:31 UTC (rev 7556)
+++ goodies/trunk/xfce4-notifyd/debian/xfce4-notifyd.lintian-overrides	2013-05-23 06:02:57 UTC (rev 7557)
@@ -1,3 +1,6 @@
 # we do build with stackprotector
 xfce4-notifyd: hardening-no-stackprotector usr/bin/xfce4-notifyd-config
 xfce4-notifyd: hardening-no-stackprotector usr/lib/x86_64-linux-gnu/xfce4/notifyd/xfce4-notifyd
+
+# desktop-file-validate needs to be fixed
+xfce4-notifyd: desktop-entry-invalid-category XFCE usr/share/applications/xfce4-notifyd-config.desktop

More information about the Pkg-xfce-commits mailing list