[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#770879: marked as done (unblock: meld/3.12.1-2)

Your message dated Mon, 24 Nov 2014 22:25:45 +0000
with message-id <20141124222545.GE8764@lupin.home.powdarrmonkey.net>
and subject line Re: Bug#770879: unblock: meld/3.12.1-2
has caused the Debian Bug report #770879,
regarding unblock: meld/3.12.1-2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
770879: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=770879
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: unblock
Severity: normal


Dear Release Team,

Please unblock meld to let it migrate to Jessie.
The update contains only a single fix for a regression compared to
Wheezy-s version.

Changes:
 meld (3.12.1-2) unstable; urgency=medium
 .
   * Fix SIGINT handling by cherry-picking patch from upstream
     (Closes: #768180)


Thanks:
Balint


diff -Nru meld-3.12.1/debian/changelog meld-3.12.1/debian/changelog
--- meld-3.12.1/debian/changelog	2014-10-28 00:46:24.000000000 +0100
+++ meld-3.12.1/debian/changelog	2014-11-14 22:26:00.000000000 +0100
@@ -1,3 +1,10 @@
+meld (3.12.1-2) unstable; urgency=medium
+
+  * Fix SIGINT handling by cherry-picking patch from upstream
+    (Closes: #768180)
+
+ -- Balint Reczey <balint@balintreczey.hu>  Tue, 28 Oct 2014 00:52:16 +0100
+
 meld (3.12.1-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru meld-3.12.1/debian/patches/0002-bin-meld-Hook-SIGINT-using-GLib-instead-of-Python-fo.patch meld-3.12.1/debian/patches/0002-bin-meld-Hook-SIGINT-using-GLib-instead-of-Python-fo.patch
--- meld-3.12.1/debian/patches/0002-bin-meld-Hook-SIGINT-using-GLib-instead-of-Python-fo.patch	1970-01-01 01:00:00.000000000 +0100
+++ meld-3.12.1/debian/patches/0002-bin-meld-Hook-SIGINT-using-GLib-instead-of-Python-fo.patch	2014-11-24 22:17:28.000000000 +0100
@@ -0,0 +1,42 @@
+From 74e15dda8536b1b381e91496527ead06c3182c35 Mon Sep 17 00:00:00 2001
+From: Kai Willadsen <kai.willadsen@gmail.com>
+Date: Sat, 22 Nov 2014 08:07:16 +1000
+Subject: [PATCH] bin/meld: Hook SIGINT using GLib instead of Python for
+ instant quitting
+
+The previous solution worked, but waited until the window got focus,
+repainted or we otherwise ran the event loop, which was weird. This
+just works straight away.
+---
+ bin/meld | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/bin/meld
++++ b/bin/meld
+@@ -21,6 +21,7 @@
+ import locale
+ import logging
+ import os
++import signal
+ import subprocess
+ import sys
+ 
+@@ -130,7 +131,7 @@
+ 
+     pyver = (2, 7)
+     gtk_requirement = (3, 6)
+-    glib_requirement = (2, 34, 0)
++    glib_requirement = (2, 36, 0)
+     gtksourceview_requirement = (3, 6, 0)
+ 
+     def missing_reqs(mod, ver, exception=None):
+@@ -243,5 +244,9 @@
+     setup_resources()
+ 
+     import meld.meldapp
++    if sys.platform != 'win32':
++        from gi.repository import GLib
++        GLib.unix_signal_add(GLib.PRIORITY_DEFAULT, signal.SIGINT,
++                             lambda *args: meld.meldapp.app.quit(), None)
+     status = meld.meldapp.app.run(sys.argv)
+     sys.exit(status)
diff -Nru meld-3.12.1/debian/patches/series meld-3.12.1/debian/patches/series
--- meld-3.12.1/debian/patches/series	2014-10-27 10:13:21.000000000 +0100
+++ meld-3.12.1/debian/patches/series	2014-11-24 22:13:33.000000000 +0100
@@ -1,2 +1,3 @@
 01_skip_compile_schema_and_icon_cache_update.patch
 0001-meld.vc.svn-Make-repository-validity-check-relative-.patch
+0002-bin-meld-Hook-SIGINT-using-GLib-instead-of-Python-fo.patch

--- End Message ---
--- Begin Message --- 
On Mon, Nov 24, 2014 at 10:39:49PM +0100, Balint Reczey wrote:
> Please unblock meld to let it migrate to Jessie.
> The update contains only a single fix for a regression compared to
> Wheezy-s version.
> 
> Changes:
>  meld (3.12.1-2) unstable; urgency=medium
>  .
>    * Fix SIGINT handling by cherry-picking patch from upstream
>      (Closes: #768180)

Unblocked.

-- 
Jonathan Wiltshire                                      jmw@debian.org
Debian Developer                         http://people.debian.org/~jmw

4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC  74C3 5394 479D D352 4C51

Attachment: signature.asc
Description: Digital signature


--- End Message ---
Reply to: