From a65fa136e8f63606bcc3d680b0567d537f613783 Mon Sep 17 00:00:00 2001 From: Chris Jones Date: Tue, 5 Jan 2010 10:07:35 +0000 Subject: [PATCH] Various tidying, version and packaging updates --- INSTALL | 8 +------- README | 2 +- TODO | 6 ------ debian/changelog | 6 ++++++ debian/copyright | 3 ++- doc/terminator.1 | 7 ------- doc/terminator_config.5 | 4 +++- setup.py | 1 + terminator.spec | 7 ++++++- test.py | 17 ----------------- 10 files changed, 20 insertions(+), 41 deletions(-) delete mode 100644 TODO delete mode 100755 test.py diff --git a/INSTALL b/INSTALL index 28857f8c..8776a8f4 100644 --- a/INSTALL +++ b/INSTALL @@ -7,7 +7,7 @@ for many distributions at: If you don't have this option, please make sure you satisfy Terminator's dependencies yourself: - * Python 2.4+, 2.6 recommended: + * Python 2.5+, 2.6 recommended: Debian/Ubuntu: python FreeBSD: lang/python26 @@ -15,12 +15,6 @@ dependencies yourself: Debian/Ubuntu: python-vte FreeBSD: x11-toolkits/py-vte -If you want gnome-terminal profile support, you also need: - - * Python GNOME 2 bindings: - Debian/Ubuntu: python-gnome2 - FreeBSD: x11-toolkits/py-gnome2 - If you don't care about native language support or icons, Terminator should run just fine directly from this directory, just: diff --git a/README b/README index 74c8cd9b..52522fd4 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Terminator 0.14 +Terminator 0.90 by Chris Jones and others. The goal of this project is to produce a useful tool for arranging terminals. diff --git a/TODO b/TODO deleted file mode 100644 index ae46d2fc..00000000 --- a/TODO +++ /dev/null @@ -1,6 +0,0 @@ -* menu entry/keybinding to hightlight a term upon: - * command ending - * new text in window - * when a command exits, "window-title-changed" is emitted - even though the actual title string do not change - * text-modified could be used to spy on outputs from the command diff --git a/debian/changelog b/debian/changelog index 16aea692..9d2112a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +terminator (0.90~alpha1) lucid; urgency=low + + * New upstream pre-release + + -- Chris Jones Tue, 05 Jan 2010 09:56:27 +0000 + terminator (0.14) karmic; urgency=low * New upstream release diff --git a/debian/copyright b/debian/copyright index bd2183da..26437c9f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -33,13 +33,14 @@ Translations: "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: diff --git a/doc/terminator.1 b/doc/terminator.1 index 500ca2b9..3873ab82 100644 --- a/doc/terminator.1 +++ b/doc/terminator.1 @@ -41,13 +41,6 @@ with the \fBhide_window\fR keyboard shortcut (Ctrl-Shift-Alt-a by default) Force the Terminator window to use a specific name rather than updating it dynamically based on the wishes of the child shell. .TP -.B \-\-no_gconf -Ignore the gconf settings of gnome-terminal -.TP -.B \-p, \-\-profile PROFILE -Loads the GNOME Terminal profile named PROFILE. Note that doing this will override the settings -in your Terminator config file with those from the GNOME Terminal profile. -.TP .B \-\-geometry=GEOMETRY Specifies the preferred size and position of Terminator's window; see X(7). .TP diff --git a/doc/terminator_config.5 b/doc/terminator_config.5 index b2f1ec35..6759a83f 100644 --- a/doc/terminator_config.5 +++ b/doc/terminator_config.5 @@ -3,7 +3,9 @@ ~/.config/terminator/config \- the config file for Terminator terminal emulator. .SH "DESCRIPTION" This manual page documents briefly the -.B Terminator config file. +.B Terminator +config file. +.B IT IS FULL OF LIES. THE CONFIG FILE FORMAT HAS COMPLETELY CHANGED. .PP \fBterminator/config\fP is an optional file to configure the terminator terminal emulator. It is used to control options not in gnome-terminal gconf profiles, or override gconf settings. .SH "FILE LOCATION" diff --git a/setup.py b/setup.py index 38be0b4e..aa3c7bb1 100755 --- a/setup.py +++ b/setup.py @@ -161,6 +161,7 @@ setup(name='Terminator', license='GNU GPL v2', scripts=['terminator'], data_files=[ + ('share/terminator', ['data/preferences.glade']), ('share/applications', ['data/terminator.desktop']), (os.path.join(man_dir, 'man1'), ['doc/terminator.1']), (os.path.join(man_dir, 'man5'), ['doc/terminator_config.5']), diff --git a/terminator.spec b/terminator.spec index ec51b70f..69f7d366 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.14 +Version: 0.90 Release: 3%{?dist} Summary: Store and run multiple GNOME terminals in one window @@ -52,6 +52,7 @@ rm -rf %{buildroot} %{_mandir}/man5/%{name}_config.* %{_bindir}/%{name} %{python_sitelib}/* +%{_datadir}/terminator/preferences.glade %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/*/%{name}*.png %{_datadir}/icons/hicolor/*/*/%{name}*.svg @@ -67,6 +68,10 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Tue Jan 05 2010 Chris Jones 0.90-1 +- Attempt to update for 0.90 pre-release. + Note that this specfile is untested. + * Thu Jan 15 2009 Chris Jones 0.12-1 - Remove patch application since this isn't a fedora build. Note that this specfile is untested. diff --git a/test.py b/test.py deleted file mode 100755 index 4bde29be..00000000 --- a/test.py +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/python - -import gtk -from terminatorlib.factory import Factory - -maker = Factory() -window = maker.make('Window') -term = maker.make('Terminal') - -window.add(term) -window.show() -term.spawn_child() - -try: - gtk.main() -except KeyboardInterrupt: - pass