From 5a884b7a815c33b64bca709def5d145aa0b15b40 Mon Sep 17 00:00:00 2001 From: Stephen Boddy Date: Thu, 3 Nov 2016 04:03:51 +0100 Subject: [PATCH] * Update version numbers for GTK branch to something that makes sense * Add back the visible_bell config option to the man page * Bring the outdated packaging files into line with trunk * Added AUTHORS and RELEASING as per trunk --- AUTHORS | 32 +++++++++ ChangeLog | 142 +++++++++++++++++++++++++++++++++++++ RELEASING | 39 ++++++++++ debian/changelog | 44 ++++++++++++ debian/compat | 2 +- debian/control | 35 +++++---- debian/copyright | 103 +++++++++++---------------- debian/pycompat | 1 - debian/rules | 29 +++++--- debian/source/format | 1 + debian/terminator.links | 1 + debian/terminator.postinst | 5 +- debian/terminator.preinst | 4 +- debian/terminator.prerm | 4 +- debian/watch | 3 +- doc/terminator_config.5 | 6 +- remotinator | 2 +- terminator.spec | 2 +- terminatorlib/version.py | 2 +- 19 files changed, 363 insertions(+), 94 deletions(-) create mode 100644 AUTHORS create mode 100644 RELEASING delete mode 100644 debian/pycompat create mode 100644 debian/source/format create mode 100644 debian/terminator.links diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 00000000..5753dcd9 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,32 @@ +Upstream Authors (in no discernible order): + + Chris Jones + Huang He + Kees Cook + Thomas Meire + Nicolas Valcarcel + Emmanuel Bretelle + Chris Oattes + Markus Korn + Mackenzie Morgan + Daniel T Chen + Nicolas Roman + Takao Fujiwara + Jordan Callicoat + Stephen Boddy + Bryce Harrington + +Artwork: + Cory Kontros - Produced our current icon under the CC-by-SA licence + Cristian Grada - Drew our original icon and licenced it to us under GPL + +Translations: + Thomas Meire + Maxim Derkach + Nicolas Valcárcel + Mats Henrikson + Nizar Kerkeni + "Data" + Cristian Grada + "zhuqin" + and many others. diff --git a/ChangeLog b/ChangeLog index 1a232065..dcc7acb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -86,6 +86,148 @@ terminator GTK3: * Minor fix to readd hypens as a word char (Steve Boddy, LP#1598800) +terminator 0.98: + * Features + * Layout launcher with option or shortcut (Steve Boddy) + * An all-new manual! Default to F1 key (Steve Boddy) + * An initial separate port to gtk3 is available for the brave, which + is having all trunk changes applied to it while the issues get + shaken out (Egmont Koblinger & Steve Boddy) + * Enhancements + * Layout launcher reloads config when opened to be sure it has the + latest layouts (Steve Boddy) + * Reload the config before we write to it or we could overwrite + something from another instance (Steve Boddy) + * When saving, a layout now remembers: + * maximised and fullscreen status (Steve Boddy) + * window titles (Steve Boddy, LP#1192960) + * which tab was active (Steve Boddy) + * which terminal was active (Steve Boddy, LP#858268) + * working directory for each terminal (MoMaT, LP#1157422) plus + additional GUI code (Steve Boddy) + * Add vertical scrollbar to the layout launcher and make mouse + wheel scrolling work (Steve Boddy) + * Add vertical scrollbars to the Profiles and Layouts tabs in + Preferences (Steve Boddy, LP#1396843) + * Add options for non-homogenous tabs and scroll arrows (Grizzly + Smit) + * Add shortcuts for scrolling up/down by line/half-page/page + (nanikata, LP#332267) + * Improve consistency of Custom Commands menu (David Caro, LP#684340) + * New distinct icons for non terminal windows (Steve Boddy) + * Active terminal per tab is remembered (Steve Boddy, LP#315956) + * Add shortcuts/code to toggle All/Tab grouping (Steve Boddy, + LP#1097347) + * Improve watcher plugin (Joseph Crosland) with additional fixup + (Steve Boddy) + * Add Ctrl+MouseWheel Zoom in/out and Shift+MouseWheel page scroll + up/down (Steve Boddy) + * Add Ctrl+Shift+MouseWheel and Ctrl+Super+MouseWheel to zoom + receivers or all terminals (Steve Boddy) + * Add search bar wrap toggle (Christophe Bourez) + * Add default broadcast behaviour selection (Jiri, LP#1288835) + * Improve testing, distcheck, setup.py (Bryce Harrington) + * Major cleanup and reorganisation of the preferences window (Steve + Boddy) + * Complete revamp of the Global tab + * Splitters added on the 'Profiles', 'Layouts' and 'Plugins' tabs + for resizing lists + * Made the 'Layouts' tab and the 'Profile' sub-tabs more consistent + style wise + * Included a new 'About' tab with some project links + * Add global setting for changing the titlebar font (Eli Zor) + expanded and improved (Steve Boddy) + * Add shortcuts for next/prev profile (Peter E Lind, LP#1314734) + * Improve DnD to handle multiple files (Schplurtz le Déboulonné) + and (Steve Boddy) + * Add 'Save' button for saving to the selected Layout (Ariel + Zelivansky) + * Preselect the current layout when opening Prefs window, and also + save config after using the layout 'Save' button (Steve Boddy) + * Add default shortcuts for some actions by my preference (Steve + Boddy) + * Added HighContrast icons, and fix all window/menu icons to respect + theme changes (Steve Boddy, LP#305579) + * Add option to set how long ActivityWatcher plugin is quiet for + (Steve Boddy) + * Big tidy up and improvements to translation strings, although it + will require additional work by translators (Steve Boddy) + * Make the menu mnemonics a bit more consistent, or add them where + they were missing (Steve Boddy) + * Add fallback to psutils to discover the cwd of a terminal (Heon + Jeong, LP#1261293) with additional fixup (Steve Boddy) + * Slight improvement (IMO) to the zoom terminal font scaling (Steve + Boddy, LP#329158) + * Add an internationalised AppData file for software installers + (Steve Boddy, LP#1323785) + * Bug fixes + * Fix +double-click to not rebalance splitters (Steve Boddy, + LP#1192679) + * Fix closing a group to no longer leaves strays (Steve Boddy, + LP#1193484) + * Fix shader so it works for background images too (Steve Boddy, + LP#1202109) + * Fix x-terminal-emulator option (Neal Fultz, LP#366644) + * Fix lost geom when using -H option (Steve Boddy, LP#1035617) + * Fix maximise in Fluxbox. Possibly also Windows w/Xming too (Steve + Boddy, LP#1201454) + * Fix lack of focus on unhide with patch from (Pavel Khlebovich, + LP#805870) + * Fix the Group All/Tab shortcuts where titlebars were not updated + (Steve Boddy, LP#1242675) + * Fix splits not being central mith multiple tabs (Justin Ossevoort, + LP#1186953) + * Fix closing of tab with multiple terminals not closing (Steve + Boddy, 1253995) + * Fix custom commands broadcast to grouped terminals (Mauro S M + Rodrigues, LP#1414332) + * Fix libc loading in freebsd.py. Restores pwd detection. (Thomas + Hurst) + * Fix scrollbar doubleclick rebalancing (Bryce Harrington, LP#1423686) + and (Steve Boddy) + * Fix crash when capslock pressed while editing a tab title (wizwiz50, + LP#1313761) + * Fix navigation between terminals (Julián Moreno Patiño LP#1433810) + and (Steve Boddy, LP#328235, LP#1433810) + * Fix option --new-tab to show application (Pavel Roschin, LP#1367680) + and (Steve Boddy) + * Fix xterm color palette to match xterm (Casper Ti. Vector, + LP#1260924) + * Fix (unconfirmed) for Fedora messing up prompts in gtk2 vte if + gtk3 vte is also installed (Steve Boddy, LP-Q#268135) + * Fix to make the debugserver work with two or more -d flags as per + docs, not three or more (Steve Boddy) + * Fix unwanted newline on DnD file (Schplurtz le Déboulonné, + LP#1311481) + * Fix DnD filenames with sh-quote, even those with ' (Schplurtz le + Déboulonné) + * Fix multi-line DnD to full text block, not just first line (Steve + Boddy) + * Fix slightly uneven splits on shortcut due to handle size, though + this will make previously saved layouts off by a few pixels (Steve + Boddy, LP#1089162) + * Man page typo (Michael Eller, LP#1296725) + * Fix new tab labels when adding a tab to a window with splits (Steve + Boddy) + * Minor visual fix for slider in prefs filling whole trough (Steve + Boddy) + * Buttons in Prefs>Layouts tab cannot be hidden by slider (Steve + Boddy) + * Fix Super+double-click on splitter within tabs (Steve Boddy) + * Fix composed characters for receivers (Takao Fujiwara, LP#1463704) + * Fix launcher opening after a dbus enabled window is already open + (Steve Boddy, LP#1283002) + * Sort entries in config file, so they don't jump around every time + config is saved for easier troubleshooting (Steve Boddy) + * Start 'New Layout #' from 1. Looked strange starting at 2 (Steve + Boddy) + * Fix the renaming of Layouts/Profiles sometimes corrupting what + appears in the config file (Steve Boddy, LP#1262709) + * Fix the way alternatives are set up that cures blurry/incorrect + icons in task switchers (Steve Boddy, LP#1067287) + * Fix the tab switching if a terminal on another tab exits (Steve + Boddy, LP#943311) + terminator 0.97: * Allow font dimming in inactive terminals * Allow URL handler plugins to override label text for URL context diff --git a/RELEASING b/RELEASING new file mode 100644 index 00000000..66d9c4c9 --- /dev/null +++ b/RELEASING @@ -0,0 +1,39 @@ +Here are the steps to follow to create a new terminator release: + +1. Ensure there are no local, uncommitted/unpushed modifications. + + $ bzr status + +2. Verify the code passes checks and tests + + $ python setup.py test + $ python setup.py check + +3. Update version number. Edit terminatorlib/version.py and set the + version number. Also edit terminator.spec and set it there. + +4. Create the source distribution package + + $ python setup.py sdist + +5. Sign the tarball + + $ gpg -u bryce@bryceharrington.org --armor --output + terminator-0.98.tar.gz.asc --detach-sig terminator-0.98.tar.gz + +6. Upload to Launchpad + + + Create the appropriate Milestone + + Create a matching Release + + Upload the tarball and gpg signature to the Release + +7. Tag the release in trunk + + $ bzr tag 0.98 + $ bzr push + +8. Post announcements + + + Write a blog post + + Create an Announcement on the Launchpad page. + Include a link to the blog post URL diff --git a/debian/changelog b/debian/changelog index d6e222e3..1d11c14b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,47 @@ +terminator (1.90) trusty; urgency=medium + + * Initial GTK3 version packaging + + -- Steve Boddy Thu, 27 October 2016 14:06:00 +0100 + +terminator (0.98~ppa8) wily; urgency=medium + + * No-change upload for wily + + -- Bryce Harrington Mon, 21 Sep 2015 22:09:34 -0700 + +terminator (0.98~ppa7) vivid; urgency=medium + + * No-change upload for vivid + + -- Bryce Harrington Mon, 21 Sep 2015 22:08:58 -0700 + +terminator (0.98~ppa6) trusty; urgency=medium + + * copyright: Change upstream maintainer to Stephen Boddy + + -- Bryce Harrington Sun, 20 Sep 2015 14:21:38 -0700 + +terminator (0.98) precise; urgency=medium + + * New upstream release of 0.98. Remaining changes: + + Add missing dependency on psutil to check for IBus running. + + Workaround debian compression of font files. + + Add terminator.wrapper to fix blurry/incorrect icons in task switchers. + * Sync up with Debian packaging + + Update homepage + + Revise copyright file + + Use canonical URIs for Vcs-* fields + + Update regular expression in watch + + Bump Standards-Version to 3.9.5 (no changes). + + Migrate from cdbs to dh. + + Add python-dbus to Depends. + + Bump Standards Version to 3.9.4. + + Bump debhelper version to 9. + + Bump compat level 5 to 9. + + -- Bryce Harrington Sat, 19 Sep 2015 18:41:57 -0700 + terminator (0.97~ppa3) saucy; urgency=low * No-change upload for saucy diff --git a/debian/compat b/debian/compat index 7ed6ff82..ec635144 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/debian/control b/debian/control index acf1d843..a66316fd 100644 --- a/debian/control +++ b/debian/control @@ -1,25 +1,34 @@ Source: terminator Section: misc -XS-Python-Version: >=2.5 Priority: optional -Maintainer: Nicolas Valcárcel Scerpella +Maintainer: Nicolas Valcárcel Scerpella Uploaders: Rudy Godoy Guillén , - Python Applications Packaging Team -Build-Depends: debhelper (>= 5.0.62), python, cdbs (>= 0.4.49), intltool -Build-Depends-Indep: python-support (>= 0.5.3) -Standards-Version: 3.8.2 -Vcs-Svn: svn://svn.debian.org/python-apps/packages/terminator/trunk/ -Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/terminator/trunk/ -Homepage: http://www.tenshu.net/terminator/ + Python Applications Packaging Team , + Julián Moreno Patiño +Build-Depends: debhelper (>= 9), + intltool, + python (>= 2.6.6-3~) +X-Python-Version: >= 2.5 +Standards-Version: 3.9.5 +Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/terminator/trunk/ +Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/terminator/trunk/ +Homepage: http://gnometerminator.blogspot.com/p/introduction.html Package: terminator Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, python-vte, python-gobject, python-gtk2 (>= 2.14.0), gconf2, libgtk2.0-bin, hicolor-icon-theme -XB-Python-Version: ${python:Versions} +Depends: gconf2, + libdbus-1-3, + libgtk-3-0, + libnotify4, + libvte-2.91-0, + python-psutil, + python-gobject, + ${misc:Depends}, + ${python:Depends} Provides: x-terminal-emulator -Recommends: xdg-utils, python-gnome2, python-keybinder +Recommends: xdg-utils Description: multiple GNOME terminals in one window - Terminator is a little project to produce an efficient way of + Terminator is a little project to produce an efficient way of filling a large area of screen space with terminals. . The user can have multiple terminals in one window and use diff --git a/debian/copyright b/debian/copyright index 26437c9f..4b0d989d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,65 +1,48 @@ -This package was debianized by Chris Jones on -Sat, 28 Jul 2007 04:12:30 +0100. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: terminator +Upstream-Contact: Stephen Boddy +Source: https://launchpad.net/terminator/+download -It was downloaded from https://launchpad.net/terminator/+download +Files: * +Copyright: Chris Jones and others + 2006-2011 Chris Jones + 2008 Thomas Hurst + 2010 Julien Nicoulaud + 2006-2010 Emmanuel Bretelle chantra@debuntu.org + 2005-2010 Michael Foord, Mark Andrews, Nicola Larosa +License: GPL-2.0 -Upstream Authors (in no discernible order): +Files: po/* +Copyright: 2008-2011 Rosetta Contributors and Canonical Ltd + 2007 Nicolas Valcárcel + 2008 Cris Grada + 2010 Vytautas Bačiulis + 2008 Thomas Meire + 2009 Lucian Adrian Grijincu +License: GPL-2.0 - Chris Jones - Huang He - Kees Cook - Thomas Meire - Nicolas Valcarcel - Emmanuel Bretelle - Chris Oattes - Markus Korn - Mackenzie Morgan - Daniel T Chen - Nicolas Roman - Takao Fujiwara - Jordan Callicoat - Stephen Boddy +Files: doc/terminator_config.5 +Copyright: 2008 Nicolas Valcarcel +License: GPL-2.0 -Artwork: - Cory Kontros - Produced our current icon under the CC-by-SA licence - Cristian Grada - Drew our original icon and licenced it to us under this licence - -Translations: - Thomas Meire - Maxim Derkach - Nicolas Valcárcel - Mats Henrikson - Nizar Kerkeni - "Data" - Cristian Grada - "zhuqin" - and many others. - - Seriously, thank you very much to the translators. A few minutes of - their dedication opens up userbases like nothing else. - -Copyright: - - - -License: - - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation version 2. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL-2'. - -The Debian packaging is (C) 2007, Chris Jones and -is licensed under the GPL, see above. +Files: debian/* +Copyright: 2007 Chris Jones + 2008-2012 Nicolas Valcárcel Scerpella + 2012-2014 Julián Moreno Patiño +License: GPL-2.0 +License: GPL-2.0 + This program is free software; you can redistribute it + and/or modify it under the terms of the GNU General Public + License as published by the Free Software Foundation, version + 2 of the License. + . + This program is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the implied + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the GNU General Public License for more + details. + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2' diff --git a/debian/pycompat b/debian/pycompat deleted file mode 100644 index 0cfbf088..00000000 --- a/debian/pycompat +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/debian/rules b/debian/rules index 77275948..478add72 100755 --- a/debian/rules +++ b/debian/rules @@ -1,18 +1,25 @@ #!/usr/bin/make -f # -*- makefile -*- -DEB_PYTHON_SYSTEM = pysupport +#export DH_VERBOSE=1 -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/python-distutils.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +%: + dh $@ --with python2 -DEB_INSTALL_CHANGELOGS_ALL := ChangeLog -DEB_PYTHON_INSTALL_ARGS_ALL +=--install-lib=/usr/share/terminator --install-scripts=/usr/share/terminator +override_dh_auto_install: + python setup.py \ + --without-icon-cache \ + install \ + --install-lib=usr/share/terminator/ \ + --install-data=usr/ \ + --install-scripts=usr/share/terminator/ \ + --root=$(CURDIR)/debian/terminator/ \ + --no-compile -O0 -binary-install/terminator:: - dh_icons -pterminator - dh_link /usr/share/terminator/terminator /usr/bin/terminator - dh_link /usr/share/terminator/remotinator /usr/bin/remotinator +override_dh_installchangelogs: + dh_installchangelogs ChangeLog -clean:: +override_dh_clean: rm -rf build/ + rm -f data/terminator.desktop + rm -f po/.intltool-merge-cache + find . -name '*.pyc' -delete diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/terminator.links b/debian/terminator.links new file mode 100644 index 00000000..f8c78ef7 --- /dev/null +++ b/debian/terminator.links @@ -0,0 +1 @@ +/usr/share/terminator/terminator /usr/bin/terminator diff --git a/debian/terminator.postinst b/debian/terminator.postinst index c30ae2b2..fb49f172 100755 --- a/debian/terminator.postinst +++ b/debian/terminator.postinst @@ -1,9 +1,12 @@ -#!/bin/sh -e +#!/bin/sh + +set -e if [ "$1" = "configure" ]; then # Ensure the old alternative is removed update-alternatives --remove terminator /usr/bin/terminator || true update-alternatives --remove x-terminal-emulator /usr/bin/terminator + # Add an alternative for x-terminal-emulator update-alternatives --install /usr/bin/x-terminal-emulator \ x-terminal-emulator /usr/bin/terminator.wrapper 50 \ diff --git a/debian/terminator.preinst b/debian/terminator.preinst index 6e5f3892..635340b5 100644 --- a/debian/terminator.preinst +++ b/debian/terminator.preinst @@ -1,4 +1,6 @@ -#!/bin/sh -e +#!/bin/sh + +set -e if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt 0.13+ds1; then pycentral pkgremove terminator diff --git a/debian/terminator.prerm b/debian/terminator.prerm index 7f525d60..57ae39cf 100644 --- a/debian/terminator.prerm +++ b/debian/terminator.prerm @@ -1,4 +1,6 @@ -#!/bin/sh -e +#!/bin/sh + +set -e if [ "$1" = remove ]; then update-alternatives --remove terminator /usr/bin/terminator || true diff --git a/debian/watch b/debian/watch index 8e68abdf..57fc8838 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,3 @@ version=3 -http://launchpad.net/terminator/+download .*/terminator_(.+)\.tar\.gz +opts=dversionmangle=s/\+ds\d+$// \ +http://launchpad.net/terminator/+download .*/terminator[:?_|-](.+)\.tar\.gz diff --git a/doc/terminator_config.5 b/doc/terminator_config.5 index 6dd7d139..85994f36 100644 --- a/doc/terminator_config.5 +++ b/doc/terminator_config.5 @@ -350,6 +350,10 @@ Default value: \fBTrue\fR If true, make a noise when applications send the escape sequence for the terminal bell. Default value: \fBFalse\fR .TP +.B visible_bell\fR (boolean) +If true, flash the terminal when applications send the escape sequence for the terminal bell. +Default value: \fBFalse\fR +.TP .B urgent_bell\fR (boolean) If true, set the window manager "urgent" hint when applications send the escale sequence for the terminal bell. Any keypress will cancel the urgent status. Default value: \fBFalse\fR @@ -463,7 +467,7 @@ Default value: \fBclose\fR Terminals have a 16-colour palette that applications inside the terminal can use. This is that palette, in the form of a colon-separated list of colour names. Colour names should be in hex format e.g. "#FF00FF". .TP .B word_chars -These characters are included when selecting text by double clicking. +When selecting text by word, sequences of these characters are also considered members of single words. The hypen and alphanumerics do not need to be specified. Ranges can be given as "A-Z". Default value: \fB',./?%&#:_'\fR .TP .B mouse_autohide \fR(boolean) diff --git a/remotinator b/remotinator index 91371fd7..0a8f1997 100755 --- a/remotinator +++ b/remotinator @@ -31,7 +31,7 @@ except ImportError: from terminatorlib.translation import _ APP_NAME='remotinator' -APP_VERSION='0.97' +APP_VERSION='1.90' COMMANDS={ # Command uuid req. Description diff --git a/terminator.spec b/terminator.spec index 731b1d55..697268f2 100644 --- a/terminator.spec +++ b/terminator.spec @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: terminator -Version: 0.97 +Version: 1.90 Release: 1%{?dist} Summary: Store and run multiple GNOME terminals in one window diff --git a/terminatorlib/version.py b/terminatorlib/version.py index 413d5bb8..93d82935 100644 --- a/terminatorlib/version.py +++ b/terminatorlib/version.py @@ -21,4 +21,4 @@ TerminatorVersion supplies our version number. """ APP_NAME = 'terminator' -APP_VERSION = '0.97' +APP_VERSION = '1.90'