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

[Yves-Alexis Perez]

Author: corsac
Date: 2009-05-10 16:08:19 +0000 (Sun, 10 May 2009)
New Revision: 3223

Added:
   goodies/trunk/xfce4-notifyd/debian/patches/
   goodies/trunk/xfce4-notifyd/debian/patches/01_send-second-arg-notification-closed.patch
   goodies/trunk/xfce4-notifyd/debian/patches/series
Modified:
   goodies/trunk/xfce4-notifyd/debian/changelog
   goodies/trunk/xfce4-notifyd/debian/control
   goodies/trunk/xfce4-notifyd/debian/rules
Log:
* debian/patches
  - 01_send-second-arg-notification-closed added, correctly send two
    arguments with NotificationClosed.                         closes: 522729
* debian/rules:
  - simplify tiny.rules for debhelper 7.
* debian/control:
  - add build-dep on quilt (with --with-quilt support in the rule).

Modified: goodies/trunk/xfce4-notifyd/debian/changelog
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/changelog	2009-05-07 14:01:21 UTC (rev 3222)
+++ goodies/trunk/xfce4-notifyd/debian/changelog	2009-05-10 16:08:19 UTC (rev 3223)
@@ -1,9 +1,19 @@
 xfce4-notifyd (0.1.0-3) UNRELEASED; urgency=low
 
+  [ Evgeni Golov ]
   * Update my e-mail address.
 
- -- Evgeni Golov <evgeni at debian.org>  Mon, 20 Apr 2009 18:34:14 +0200
+  [ Yves-Alexis Perez ]
+  * debian/patches
+    - 01_send-second-arg-notification-closed added, correctly send two
+      arguments with NotificationClosed.                         closes: 522729
+  * debian/rules:
+    - simplify tiny.rules for debhelper 7.
+  * debian/control:
+    - add build-dep on quilt (with --with-quilt support in the rule).
 
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 10 May 2009 17:31:28 +0200
+
 xfce4-notifyd (0.1.0-2) unstable; urgency=low
 
   * Upload to unstable.

Modified: goodies/trunk/xfce4-notifyd/debian/control
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/control	2009-05-07 14:01:21 UTC (rev 3222)
+++ goodies/trunk/xfce4-notifyd/debian/control	2009-05-10 16:08:19 UTC (rev 3223)
@@ -8,7 +8,7 @@
 Build-Depends: debhelper (>= 7), 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
+ exo-utils, libxfconf-0-dev, quilt (>= 0.46-7)
 Standards-Version: 3.8.1
 Homepage: http://spuriousinterrupt.org/projects/xfce4-notifyd
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/xfce4-notifyd/

Added: 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	                        (rev 0)
+++ goodies/trunk/xfce4-notifyd/debian/patches/01_send-second-arg-notification-closed.patch	2009-05-10 16:08:19 UTC (rev 3223)
@@ -0,0 +1,22 @@
+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
+@@ -127,8 +127,8 @@ xfce_notify_daemon_class_init(XfceNotifyDaemonClass *klass)
+                                                     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 */
++                                                    G_TYPE_UINT,
++#if 1  /* it seems libnotify now supports the close-reason arg */
+                                                     xfce_notify_marshal_VOID__UINT_UINT,
+                                                     G_TYPE_NONE, 2,
+                                                     G_TYPE_UINT,

Added: goodies/trunk/xfce4-notifyd/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/patches/series	                        (rev 0)
+++ goodies/trunk/xfce4-notifyd/debian/patches/series	2009-05-10 16:08:19 UTC (rev 3223)
@@ -0,0 +1 @@
+01_send-second-arg-notification-closed.patch

Modified: goodies/trunk/xfce4-notifyd/debian/rules
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/rules	2009-05-07 14:01:21 UTC (rev 3222)
+++ goodies/trunk/xfce4-notifyd/debian/rules	2009-05-10 16:08:19 UTC (rev 3223)
@@ -1,24 +1,7 @@
 #!/usr/bin/make -f
+include /usr/share/quilt/quilt.make
 
-build: build-stamp
-build-stamp:
-	dh build --before configure
-	dh_auto_configure -- LDFLAGS="-Wl,-z,defs -Wl,--as-needed"
-	dh build --after configure
-	touch $@
+LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-clean:
-	dh clean
-
-install: build
-	dh install
-
-binary-arch: install
-	dh binary-arch
-
-binary-indep: install
-	dh binary-indep
-
-binary: binary-arch binary-indep
-
-.PHONY: build clean install binary binary-arch binary-indep
+%:
+	dh --with quilt $@