r30940 - in /packages/unstable/ontv/debian: changelog patches/01_shebang.patch patches/02_vte_reaper.patch patches/series
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Sat Oct 22 11:33:18 UTC 2011
Author: biebl
Date: Sat Oct 22 11:33:18 2011
New Revision: 30940
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30940
Log:
* debian/patches/01_shebang.patch:
- Removed, fixed upstream.
* debian/patches/02_vte_reaper.patch:
- Refreshed.
Removed:
packages/unstable/ontv/debian/patches/01_shebang.patch
Modified:
packages/unstable/ontv/debian/changelog
packages/unstable/ontv/debian/patches/02_vte_reaper.patch
packages/unstable/ontv/debian/patches/series
Modified: packages/unstable/ontv/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/ontv/debian/changelog?rev=30940&op=diff
==============================================================================
--- packages/unstable/ontv/debian/changelog [utf-8] (original)
+++ packages/unstable/ontv/debian/changelog [utf-8] Sat Oct 22 11:33:18 2011
@@ -2,6 +2,10 @@
* New upstream release.
* Switch to dpkg source format 3.0 (quilt).
+ * debian/patches/01_shebang.patch:
+ - Removed, fixed upstream.
+ * debian/patches/02_vte_reaper.patch:
+ - Refreshed.
-- Michael Biebl <biebl at debian.org> Sat, 22 Oct 2011 13:20:29 +0200
Modified: packages/unstable/ontv/debian/patches/02_vte_reaper.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/ontv/debian/patches/02_vte_reaper.patch?rev=30940&op=diff
==============================================================================
--- packages/unstable/ontv/debian/patches/02_vte_reaper.patch [utf-8] (original)
+++ packages/unstable/ontv/debian/patches/02_vte_reaper.patch [utf-8] Sat Oct 22 11:33:18 2011
@@ -1,16 +1,17 @@
-From aaec9feb06f30b7a1f049f16010305281ca662b2 Mon Sep 17 00:00:00 2001
-From: Olof Kindgren <olki at src.gnome.org>
-Date: Wed, 02 Feb 2011 22:04:55 +0000
-Subject: Stop using deprecated reaper object
+commit aaec9feb06f30b7a1f049f16010305281ca662b2
+Author: Olof Kindgren <olki at src.gnome.org>
+Date: Wed Feb 2 23:04:55 2011 +0100
-The reaper object is deprecated and has been removed in recent python vte
-bindings. Use get_child_exit_status() instead. Fixes bgo#636354
----
-diff --git a/ontv/XMLTVAssistant.py b/ontv/XMLTVAssistant.py
-index 8c8a519..5b12406 100644
---- a/ontv/XMLTVAssistant.py
-+++ b/ontv/XMLTVAssistant.py
-@@ -328,9 +328,8 @@ class XMLTVAssistant(gtk.Assistant):
+ Stop using deprecated reaper object
+
+ The reaper object is deprecated and has been removed in recent python vte
+ bindings. Use get_child_exit_status() instead. Fixes bgo#636354
+
+Index: ontv-3.2.0/ontv/assistant.py
+===================================================================
+--- ontv-3.2.0.orig/ontv/assistant.py 2010-07-27 01:20:48.000000000 +0200
++++ ontv-3.2.0/ontv/assistant.py 2011-10-22 13:28:39.056908369 +0200
+@@ -339,9 +339,8 @@
page = self.get_nth_page(page_number)
if self.__previous_page == page_number + 1:
@@ -22,7 +23,7 @@
if page_number == 1:
if self.installed_button.get_active() and self.country:
-@@ -349,8 +348,7 @@ class XMLTVAssistant(gtk.Assistant):
+@@ -360,8 +359,7 @@
self.__setup_terminal()
self.terminal.reset(full=True, clear_history=True)
@@ -32,7 +33,7 @@
page)
grabber = self.grabber_command.split()[0]
configure_command = [grabber, "--configure", "--quiet"]
-@@ -374,8 +372,7 @@ class XMLTVAssistant(gtk.Assistant):
+@@ -385,8 +383,7 @@
self.terminal.reset(full=True, clear_history=True)
id = gobject.timeout_add(250, self.__pulse_progressbar,
self.progressbar)
@@ -42,17 +43,19 @@
self.__grabber_command_exited,
(self.progressbar, id, page))
-@@ -410,20 +407,21 @@ class XMLTVAssistant(gtk.Assistant):
+@@ -421,21 +418,22 @@
return grabber_command
- def __terminal_exited(self, reaper, pid, status, page):
- if reaper.handler_is_connected(self.id):
- reaper.disconnect(self.id)
+- if status == 0:
+ def __terminal_exited(self, term, page):
+ if term.handler_is_connected(self.id):
+ term.disconnect(self.id)
- self.set_page_complete(page, True)
++ if term.get_child_exit_status() == 0:
+ self.set_page_complete(page, True)
def __pulse_progressbar(self, progressbar):
progressbar.pulse()
@@ -70,7 +73,7 @@
if os.WEXITSTATUS(status) != 0:
gobject.source_remove(id)
progressbar.modify_fg(gtk.STATE_NORMAL,
-@@ -441,8 +439,7 @@ class XMLTVAssistant(gtk.Assistant):
+@@ -452,8 +450,7 @@
arguments = self.grabber_command.split()
sort_command = "tv_sort %s --output %s" % (self.xmltvfile_path,
self.xmltvfile_path)
@@ -80,7 +83,7 @@
self.__sort_command_exited,
(self.progressbar, id, page))
pid = self.terminal.fork_command(sort_command.split()[0],
-@@ -451,10 +448,10 @@ class XMLTVAssistant(gtk.Assistant):
+@@ -462,10 +459,10 @@
else:
self.__set_page_4_done(progressbar, id, page)
@@ -94,5 +97,3 @@
self.xmltvfile.props.path = self.xmltvfile_path
self.xmltvfile.load()
---
-cgit v0.8.3.1
Modified: packages/unstable/ontv/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/ontv/debian/patches/series?rev=30940&op=diff
==============================================================================
--- packages/unstable/ontv/debian/patches/series [utf-8] (original)
+++ packages/unstable/ontv/debian/patches/series [utf-8] Sat Oct 22 11:33:18 2011
@@ -1,2 +1,1 @@
-01_shebang.patch
02_vte_reaper.patch
More information about the pkg-gnome-commits
mailing list