[Python-apps-commits] r14128 - in packages/terminator/trunk/debian (5 files)

[pochu at users.alioth.debian.org]

    Date: Thursday, June 29, 2017 @ 18:21:38
  Author: pochu
Revision: 14128

* debian/patches/add-keywords-entry.diff,
  debian/patches/gi-require-exception.diff,
  debian/patches/subwindows-zero-size.patch:
  + Delete patches merged upstream.

Modified:
  packages/terminator/trunk/debian/changelog
  packages/terminator/trunk/debian/patches/series
Deleted:
  packages/terminator/trunk/debian/patches/add-keywords-entry.diff
  packages/terminator/trunk/debian/patches/gi-require-exception.diff
  packages/terminator/trunk/debian/patches/subwindows-zero-size.patch

Modified: packages/terminator/trunk/debian/changelog
===================================================================
--- packages/terminator/trunk/debian/changelog	2017-06-29 18:20:50 UTC (rev 14127)
+++ packages/terminator/trunk/debian/changelog	2017-06-29 18:21:38 UTC (rev 14128)
@@ -3,6 +3,10 @@
   * New upstream release. Closes: #858168.
   * debian/upstream/signing-key.asc:
     + Add new upstream key.
+  * debian/patches/add-keywords-entry.diff,
+    debian/patches/gi-require-exception.diff,
+    debian/patches/subwindows-zero-size.patch:
+    + Delete patches merged upstream.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 27 Jun 2017 20:50:35 +0200
 

Deleted: packages/terminator/trunk/debian/patches/add-keywords-entry.diff
===================================================================
--- packages/terminator/trunk/debian/patches/add-keywords-entry.diff	2017-06-29 18:20:50 UTC (rev 14127)
+++ packages/terminator/trunk/debian/patches/add-keywords-entry.diff	2017-06-29 18:21:38 UTC (rev 14128)
@@ -1,16 +0,0 @@
-Description: Add Keywords entry to the desktop file.
-Forwarded: https://bugs.launchpad.net/bugs/1241052
-Author: Julián Moreno Patiño <julian at debian.org>
-Last-Update: 2013-10-17
---- a/data/terminator.desktop.in
-+++ b/data/terminator.desktop.in
-@@ -9,8 +9,8 @@
- StartupNotify=true
- X-Ubuntu-Gettext-Domain=terminator
- X-Ayatana-Desktop-Shortcuts=NewWindow;
-+Keywords=terminal;shell;prompt;command;commandline;
- [NewWindow Shortcut Group]
- Name=Open a New Window
- Exec=terminator
- TargetEnvironment=Unity
--

Deleted: packages/terminator/trunk/debian/patches/gi-require-exception.diff
===================================================================
--- packages/terminator/trunk/debian/patches/gi-require-exception.diff	2017-06-29 18:20:50 UTC (rev 14127)
+++ packages/terminator/trunk/debian/patches/gi-require-exception.diff	2017-06-29 18:21:38 UTC (rev 14128)
@@ -1,28 +0,0 @@
-Author: Emilio Pozuelo Monfort <pochu at debian.org>
-Bug: https://bugs.launchpad.net/terminator/+bug/1574399
-Description: catch all exceptions
-
-As gi.require_version throws ValueErrors
-
---- a/terminatorlib/window.py
-+++ b/terminatorlib/window.py
-@@ -23,7 +23,7 @@
-         gi.require_version('Keybinder', '3.0')
-         from gi.repository import Keybinder
-         Keybinder.init()
--    except ImportError:
-+    except:
-         err('Warning: python-keybinder is not installed. This means the \
- hide_window shortcut will be unavailable')
- 
---- a/terminatorlib/plugins/activitywatch.py
-+++ b/terminatorlib/plugins/activitywatch.py
-@@ -21,7 +21,7 @@
-     # This is inside this try so we only make the plugin available if pynotify
-     #  is present on this computer.
-     AVAILABLE = ['ActivityWatch', 'InactivityWatch']
--except ImportError:
-+except:
-     err(_('ActivityWatch plugin unavailable: please install python-notify'))
- 
- config = Config()

Modified: packages/terminator/trunk/debian/patches/series
===================================================================
--- packages/terminator/trunk/debian/patches/series	2017-06-29 18:20:50 UTC (rev 14127)
+++ packages/terminator/trunk/debian/patches/series	2017-06-29 18:21:38 UTC (rev 14128)
@@ -1,4 +1 @@
 not-install-terminator-wrapper.diff
-add-keywords-entry.diff
-gi-require-exception.diff
-subwindows-zero-size.patch

Deleted: packages/terminator/trunk/debian/patches/subwindows-zero-size.patch
===================================================================
--- packages/terminator/trunk/debian/patches/subwindows-zero-size.patch	2017-06-29 18:20:50 UTC (rev 14127)
+++ packages/terminator/trunk/debian/patches/subwindows-zero-size.patch	2017-06-29 18:21:38 UTC (rev 14128)
@@ -1,38 +0,0 @@
-From: Emilio Pozuelo Monfort <pochu at debian.org>
-
-https://bugs.launchpad.net/terminator/+bug/1646257
-
-=== modified file 'terminatorlib/paned.py'
---- a/terminatorlib/paned.py	2016-11-25 01:29:55 +0000
-+++ b/terminatorlib/paned.py	2017-01-17 21:16:58 +0000
-@@ -502,13 +502,13 @@
-         self.register_signals(HPaned)
-         self.cnxids.new(self, 'button-press-event', self.on_button_press)
-         self.cnxids.new(self, 'button-release-event', self.on_button_release)
--        self.set_property('position-set',  True)
- 
-     def get_length(self):
-         return(self.get_allocated_width())
- 
-     def set_pos(self, pos):
-         Gtk.HPaned.set_position(self, pos)
-+        self.set_property('position-set',  True)
- 
- class VPaned(Paned, Gtk.VPaned):
-     """Merge Gtk.VPaned into our base Paned Container"""
-@@ -519,13 +519,13 @@
-         self.register_signals(VPaned)
-         self.cnxids.new(self, 'button-press-event', self.on_button_press)
-         self.cnxids.new(self, 'button-release-event', self.on_button_release)
--        self.set_property('position-set',  True)
- 
-     def get_length(self):
-         return(self.get_allocated_height())
- 
-     def set_pos(self, pos):
-         Gtk.VPaned.set_position(self, pos)
-+        self.set_property('position-set',  True)
- 
- GObject.type_register(HPaned)
- GObject.type_register(VPaned)
-