[Python-apps-commits] r12698 - in packages/terminator/trunk/debian/patches (7 files)
julian at users.alioth.debian.org
julian at users.alioth.debian.org
Tue Jan 12 16:01:19 UTC 2016
Date: Tuesday, January 12, 2016 @ 16:01:17
Author: julian
Revision: 12698
Delete patches merge with upstream
Deleted:
packages/terminator/trunk/debian/patches/es-po.diff
packages/terminator/trunk/debian/patches/fi-po.diff
packages/terminator/trunk/debian/patches/fix-maximize.diff
packages/terminator/trunk/debian/patches/fix-split-multiple-tabs.diff
packages/terminator/trunk/debian/patches/fix-tab-with-multiple-terminals-not-closing.diff
packages/terminator/trunk/debian/patches/fix-unfocused-font-brightness.diff
packages/terminator/trunk/debian/patches/x-terminal-emulator-fix.diff
Deleted: packages/terminator/trunk/debian/patches/es-po.diff
===================================================================
--- packages/terminator/trunk/debian/patches/es-po.diff 2016-01-12 16:00:27 UTC (rev 12697)
+++ packages/terminator/trunk/debian/patches/es-po.diff 2016-01-12 16:01:17 UTC (rev 12698)
@@ -1,15 +0,0 @@
-Description: Fix typo in the es.po file.
-Forwarded: https://bugs.launchpad.net/bugs/1240690
-Author: cgalisteo <cgalisteo at k-rolus.net>
-Last-Update: 2013-07-22
---- a/po/es.po
-+++ b/po/es.po
-@@ -48,7 +48,7 @@
-
- #: ../terminatorlib/container.py:192
- msgid "Do not show this message next time"
--msgstr "No mostrar este mensaje neuvamente"
-+msgstr "No mostrar este mensaje nuevamente"
-
- #: ../terminatorlib/encoding.py:35
- msgid "Current Locale"
Deleted: packages/terminator/trunk/debian/patches/fi-po.diff
===================================================================
--- packages/terminator/trunk/debian/patches/fi-po.diff 2016-01-12 16:00:27 UTC (rev 12697)
+++ packages/terminator/trunk/debian/patches/fi-po.diff 2016-01-12 16:01:17 UTC (rev 12698)
@@ -1,15 +0,0 @@
-Description: Fix typo in the fi.po file.
-Forwarded: https://bugs.launchpad.net/bugs/1080549
-Author: Julián Moreno Patiño <julian at debian.org>
-Last-Update: 2013-05-01
---- a/po/fi.po
-+++ b/po/fi.po
-@@ -937,7 +937,7 @@
-
- #: ../terminatorlib/terminal_popup_menu.py:85
- msgid "_Copy address"
--msgstr "_Kopiois osoite"
-+msgstr "_Kopioi osoite"
-
- #: ../terminatorlib/terminal_popup_menu.py:113
- msgid "Split H_orizontally"
Deleted: packages/terminator/trunk/debian/patches/fix-maximize.diff
===================================================================
--- packages/terminator/trunk/debian/patches/fix-maximize.diff 2016-01-12 16:00:27 UTC (rev 12697)
+++ packages/terminator/trunk/debian/patches/fix-maximize.diff 2016-01-12 16:01:17 UTC (rev 12698)
@@ -1,15 +0,0 @@
-Description: Fix maximize problem on Fluxbox Desktop.
-Forwarded: https://bugs.launchpad.net/bugs/1201454
-Author: Stephen Boddy <stephen.j.boddy at gmail.com>
-Last-Update: 2013-10-16
---- a/terminatorlib/window.py
-+++ b/terminatorlib/window.py
-@@ -597,6 +597,8 @@
- def set_rough_geometry_hints(self):
- """Walk all the terminals along the top and left edges to fake up how
- many columns/rows we sort of have"""
-+ if self.ismaximised == True:
-+ return
- if not hasattr(self, 'cached_maker'):
- self.cached_maker = Factory()
- maker = self.cached_maker
Deleted: packages/terminator/trunk/debian/patches/fix-split-multiple-tabs.diff
===================================================================
--- packages/terminator/trunk/debian/patches/fix-split-multiple-tabs.diff 2016-01-12 16:00:27 UTC (rev 12697)
+++ packages/terminator/trunk/debian/patches/fix-split-multiple-tabs.diff 2016-01-12 16:01:17 UTC (rev 12698)
@@ -1,27 +0,0 @@
-Description: Fixes splits not being central mith multiple tabs
-Forwarded: https://bugs.launchpad.net/bugs/1186953
-Author: Justin Ossevoort
-Origin: http://bazaar.launchpad.net/~gnome-terminator/terminator/trunk/revision/1474
-Last-Update: 2014-07-01
---- a/terminatorlib/notebook.py
-+++ b/terminatorlib/notebook.py
-@@ -137,6 +137,8 @@
- else:
- container = maker.make('hpaned')
-
-+ self.get_toplevel().set_pos_by_ratio = True
-+
- if not sibling:
- sibling = maker.make('terminal')
- sibling.set_cwd(cwd)
-@@ -162,6 +164,10 @@
- self.show_all()
- terminal.grab_focus()
-
-+ while gtk.events_pending():
-+ gtk.main_iteration_do(False)
-+ self.get_toplevel().set_pos_by_ratio = False
-+
- def add(self, widget, metadata=None):
- """Add a widget to the container"""
- dbg('adding a new tab')
Deleted: packages/terminator/trunk/debian/patches/fix-tab-with-multiple-terminals-not-closing.diff
===================================================================
--- packages/terminator/trunk/debian/patches/fix-tab-with-multiple-terminals-not-closing.diff 2016-01-12 16:00:27 UTC (rev 12697)
+++ packages/terminator/trunk/debian/patches/fix-tab-with-multiple-terminals-not-closing.diff 2016-01-12 16:01:17 UTC (rev 12698)
@@ -1,18 +0,0 @@
-Description: Fix tab with multiple terminals not closing
-Author: Stephen Boddy <stephen.j.boddy at gmail.com>
-Origin: upstream, http://bazaar.launchpad.net/~gnome-terminator/terminator/trunk/revision/1490
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1253995
-Last-Update: 2014-07-28
---- terminator-0.97.orig/terminatorlib/notebook.py
-+++ terminator-0.97/terminatorlib/notebook.py
-@@ -313,9 +313,7 @@ class Notebook(Container, gtk.Notebook):
- return
- elif maker.isinstance(child, 'Container'):
- dbg('Notebook::closetab: child is a Container')
-- dialog = self.construct_confirm_close(self.window, _('tab'))
-- result = dialog.run()
-- dialog.destroy()
-+ result = self.construct_confirm_close(self.window, _('tab'))
-
- if result == gtk.RESPONSE_ACCEPT:
- containers = None
Deleted: packages/terminator/trunk/debian/patches/fix-unfocused-font-brightness.diff
===================================================================
--- packages/terminator/trunk/debian/patches/fix-unfocused-font-brightness.diff 2016-01-12 16:00:27 UTC (rev 12697)
+++ packages/terminator/trunk/debian/patches/fix-unfocused-font-brightness.diff 2016-01-12 16:01:17 UTC (rev 12698)
@@ -1,38 +0,0 @@
-Description: Fix unfocused font brightness.
-Forwarded: https://bugs.launchpad.net/bugs/1177506
-Author: Chris Jones <cmsj at tenshu.net>
-Last-Update: 2013-10-16
---- a/terminatorlib/prefseditor.py
-+++ b/terminatorlib/prefseditor.py
-@@ -923,6 +923,8 @@
-
- def on_inactive_color_offset_change_value(self, widget, scroll, value):
- """Inactive color offset setting changed"""
-+ if value > 1.0:
-+ value = 1.0
- self.config['inactive_color_offset'] = round(value, 2)
- self.config.save()
-
---- a/terminatorlib/terminal.py
-+++ b/terminatorlib/terminal.py
-@@ -620,12 +620,20 @@
- self.bgcolor = gtk.gdk.color_parse(self.config['background_color'])
-
- factor = self.config['inactive_color_offset']
-+ if factor > 1.0:
-+ factor = 1.0
- self.fgcolor_inactive = self.fgcolor_active.copy()
-+ dbg(("fgcolor_inactive set to: RGB(%s,%s,%s)", getattr(self.fgcolor_inactive, "red"),
-+ getattr(self.fgcolor_inactive, "green"),
-+ getattr(self.fgcolor_inactive, "blue")))
-
- for bit in ['red', 'green', 'blue']:
- setattr(self.fgcolor_inactive, bit,
- getattr(self.fgcolor_inactive, bit) * factor)
-
-+ dbg(("fgcolor_inactive set to: RGB(%s,%s,%s)", getattr(self.fgcolor_inactive, "red"),
-+ getattr(self.fgcolor_inactive, "green"),
-+ getattr(self.fgcolor_inactive, "blue")))
- colors = self.config['palette'].split(':')
- self.palette_active = []
- self.palette_inactive = []
Deleted: packages/terminator/trunk/debian/patches/x-terminal-emulator-fix.diff
===================================================================
--- packages/terminator/trunk/debian/patches/x-terminal-emulator-fix.diff 2016-01-12 16:00:27 UTC (rev 12697)
+++ packages/terminator/trunk/debian/patches/x-terminal-emulator-fix.diff 2016-01-12 16:01:17 UTC (rev 12698)
@@ -1,22 +0,0 @@
-Description: Fix -e parameter to comply Policy 11.8.3.
- Based on patch from Neal Fultz <nfultz at gmail.com>
-Forwarded: https://bugs.launchpad.net/bugs/366644
-Author: Julián Moreno Patiño <julian at debian.org>
-Origin: http://bazaar.launchpad.net/~gnome-terminator/terminator/trunk/revision/1446
-Last-Update: 2014-01-16
---- a/terminatorlib/optionparse.py
-+++ b/terminatorlib/optionparse.py
-@@ -59,8 +59,11 @@
- parser.add_option('--geometry', dest='geometry', type='string',
- help=_('Set the preferred size and position of the window'
- '(see X man page)'))
-- parser.add_option('-e', '--command', dest='command',
-- help=_('Specify a command to execute inside the terminal'))
-+ parser.add_option('--command', dest='command',
-+ help=_('Specify a command to execute inside the terminal'))
-+ parser.add_option('-e', '--execute2', dest='execute', action='callback', callback=execute_cb,
-+ help=_('Use the rest of the command line as a command to '
-+ 'execute inside the terminal, and its arguments'))
- parser.add_option('-g', '--config', dest='config',
- help=_('Specify a config file'))
- parser.add_option('-x', '--execute', dest='execute', action='callback',
More information about the Python-apps-commits
mailing list