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/debian/README.source b/debian/README.source deleted file mode 100644 index 65712579..00000000 --- a/debian/README.source +++ /dev/null @@ -1,4 +0,0 @@ -This package uses CDBS simple patchsys. dpkg-source -x does produce source -ready for building with dpkg-buildpackage. It does not procude source ready -for editing. To edit or update a patch, use cdbs-edit-patch. -See cdbs-edit-patch(1) manual page for details. diff --git a/debian/changelog b/debian/changelog index 3cef91c4..da9adda2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,19 @@ -terminator (0.98) trusty; urgency=low +terminator (0.98) precise; urgency=medium * New upstream release of 0.98 + * 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. - -- Stephen Boddy Wed, 26 Aug 2015 20:28:10 +0200 + -- Bryce Harrington Sat, 19 Sep 2015 18:41:57 -0700 terminator (0.97~ppa3) saucy; urgency=low 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 f22104b9..5e892963 100644 --- a/debian/control +++ b/debian/control @@ -1,25 +1,32 @@ 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), python-psutil, gconf2, libgtk2.0-bin, hicolor-icon-theme -XB-Python-Version: ${python:Versions} +Depends: gconf2, + python-dbus, + python-gobject, + python-gtk2 (>= 2.14.0), + python-vte, + ${misc:Depends}, + ${python:Depends} Provides: x-terminal-emulator -Recommends: xdg-utils, python-gnome2, python-keybinder +Recommends: python-gnome2, python-keybinder, python-notify, 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..697bdcd7 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: Chris Jones +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 0727a862..c9d2c37c 100755 --- a/debian/terminator.postinst +++ b/debian/terminator.postinst @@ -1,20 +1,13 @@ -#!/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 \ + x-terminal-emulator /usr/bin/terminator 50 \ --slave /usr/share/man/man1/x-terminal-emulator.1.gz \ x-terminal-emulator.1.gz /usr/share/man/man1/terminator.1.gz fi -for dname in `find /usr/share/doc/terminator/html*/_static/fonts/ -type d` /usr/share/doc/terminator/apidoc/_static/fonts/; do - if [ -d ${dname} ]; then - gunzip -f ${dname}/*.gz - fi -done - #DEBHELPER# 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..d22e97b9 100644 --- a/debian/terminator.prerm +++ b/debian/terminator.prerm @@ -1,10 +1,10 @@ -#!/bin/sh -e +#!/bin/sh + +set -e if [ "$1" = remove ]; then update-alternatives --remove terminator /usr/bin/terminator || true update-alternatives --remove x-terminal-emulator /usr/bin/terminator - update-alternatives --remove terminator.wrapper /usr/bin/terminator.wrapper || true - update-alternatives --remove x-terminal-emulator /usr/bin/terminator.wrapper fi #DEBHELPER# 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