From 0e82248225dd2ba5c8f148cbfd4789d94d8a68ca Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Sat, 27 Feb 2010 16:11:07 +0000
Subject: * debian/patches/01_focus_windows.patch:   - Removed, it's empty. *
 debian/patches/01_dont_quit_zenity_when_stdin_ends.patch: * debian/rules:   -
 Include simple-patchsys.mk.

---
 debian/changelog                                   |  6 ++++-
 .../01_dont_quit_zenity_when_stdin_ends.patch      | 30 ++++++++++++++++++++++
 debian/patches/01_focus_windows.patch              |  0
 .../02_dont_quit_zenity_when_stdin_ends.patch      | 30 ----------------------
 debian/rules                                       |  1 +
 5 files changed, 36 insertions(+), 31 deletions(-)
 create mode 100644 debian/patches/01_dont_quit_zenity_when_stdin_ends.patch
 delete mode 100644 debian/patches/01_focus_windows.patch
 delete mode 100644 debian/patches/02_dont_quit_zenity_when_stdin_ends.patch

diff --git a/debian/changelog b/debian/changelog
index 3c536173..8fded342 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,9 +5,13 @@ zenity (2.28.0-2) unstable; urgency=low
     - really don't B-D on scrollkeeper anymore.
 
   [ Emilio Pozuelo Monfort ]
-  * debian/patches/02_dont_quit_zenity_when_stdin_ends.patch:
+  * debian/patches/01_focus_windows.patch:
+    - Removed, it's empty.
+  * debian/patches/01_dont_quit_zenity_when_stdin_ends.patch:
     - Don't quit zenity when listening on stdin and the stream ends.
       Closes: #506425.
+  * debian/rules:
+    - Include simple-patchsys.mk.
   * debian/control.in:
     - Standards-Version is 3.8.4, no changes needed.
     - Move Uploaders right after Maintainer.
diff --git a/debian/patches/01_dont_quit_zenity_when_stdin_ends.patch b/debian/patches/01_dont_quit_zenity_when_stdin_ends.patch
new file mode 100644
index 00000000..3310189a
--- /dev/null
+++ b/debian/patches/01_dont_quit_zenity_when_stdin_ends.patch
@@ -0,0 +1,30 @@
+From fc381b5938f7235401286d4821f03d2b05d4876a Mon Sep 17 00:00:00 2001
+From: Emilio Pozuelo Monfort <pochu27@gmail.com>
+Date: Sat, 27 Feb 2010 15:32:23 +0100
+Subject: [PATCH] Don't quit zenity when the input stream is closed
+
+When using --listen for a notification, zenity quits when the stream
+ends. This makes it impossible to read commands from a pipe as in
+`echo icon:info | zenity --notification --listen'.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=525596
+---
+ src/notification.c |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/src/notification.c b/src/notification.c
+index 674eaec..ab44477 100644
+--- a/src/notification.c
++++ b/src/notification.c
+@@ -229,8 +229,6 @@ zenity_notification_handle_stdin (GIOChannel *channel,
+ 
+   if ((condition & G_IO_HUP) != 0) {
+     g_io_channel_shutdown (channel, TRUE, NULL);
+-    zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK);
+-    gtk_main_quit ();
+     return FALSE;
+   }
+ 
+-- 
+1.7.0
+
diff --git a/debian/patches/01_focus_windows.patch b/debian/patches/01_focus_windows.patch
deleted file mode 100644
index e69de29b..00000000
diff --git a/debian/patches/02_dont_quit_zenity_when_stdin_ends.patch b/debian/patches/02_dont_quit_zenity_when_stdin_ends.patch
deleted file mode 100644
index 3310189a..00000000
--- a/debian/patches/02_dont_quit_zenity_when_stdin_ends.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From fc381b5938f7235401286d4821f03d2b05d4876a Mon Sep 17 00:00:00 2001
-From: Emilio Pozuelo Monfort <pochu27@gmail.com>
-Date: Sat, 27 Feb 2010 15:32:23 +0100
-Subject: [PATCH] Don't quit zenity when the input stream is closed
-
-When using --listen for a notification, zenity quits when the stream
-ends. This makes it impossible to read commands from a pipe as in
-`echo icon:info | zenity --notification --listen'.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=525596
----
- src/notification.c |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/src/notification.c b/src/notification.c
-index 674eaec..ab44477 100644
---- a/src/notification.c
-+++ b/src/notification.c
-@@ -229,8 +229,6 @@ zenity_notification_handle_stdin (GIOChannel *channel,
- 
-   if ((condition & G_IO_HUP) != 0) {
-     g_io_channel_shutdown (channel, TRUE, NULL);
--    zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK);
--    gtk_main_quit ();
-     return FALSE;
-   }
- 
--- 
-1.7.0
-
diff --git a/debian/rules b/debian/rules
index 969dd4a3..3d35a594 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-- 
cgit