* 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.
This commit is contained in:
bryce 2015-09-20 00:10:30 -07:00
commit 092e68791c
14 changed files with 141 additions and 108 deletions

32
AUTHORS Normal file
View File

@ -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.

View File

@ -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.

15
debian/changelog vendored
View File

@ -1,8 +1,19 @@
terminator (0.98) trusty; urgency=low terminator (0.98) precise; urgency=medium
* New upstream release of 0.98 * 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 <stephen.j.boddy@gmail.com> Wed, 26 Aug 2015 20:28:10 +0200 -- Bryce Harrington <bryce@ubuntu.com> Sat, 19 Sep 2015 18:41:57 -0700
terminator (0.97~ppa3) saucy; urgency=low terminator (0.97~ppa3) saucy; urgency=low

2
debian/compat vendored
View File

@ -1 +1 @@
5 9

31
debian/control vendored
View File

@ -1,23 +1,30 @@
Source: terminator Source: terminator
Section: misc Section: misc
XS-Python-Version: >=2.5
Priority: optional Priority: optional
Maintainer: Nicolas Valcárcel Scerpella <nvalcarcel@canonical.com> Maintainer: Nicolas Valcárcel Scerpella <nvalcarcel@gmail.com>
Uploaders: Rudy Godoy Guillén <rudy@debian.org>, Uploaders: Rudy Godoy Guillén <rudy@debian.org>,
Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org> Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>,
Build-Depends: debhelper (>= 5.0.62), python, cdbs (>= 0.4.49), intltool Julián Moreno Patiño <julian@debian.org>
Build-Depends-Indep: python-support (>= 0.5.3) Build-Depends: debhelper (>= 9),
Standards-Version: 3.8.2 intltool,
Vcs-Svn: svn://svn.debian.org/python-apps/packages/terminator/trunk/ python (>= 2.6.6-3~)
Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/terminator/trunk/ X-Python-Version: >= 2.5
Homepage: http://www.tenshu.net/terminator/ 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 Package: terminator
Architecture: all 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 Depends: gconf2,
XB-Python-Version: ${python:Versions} python-dbus,
python-gobject,
python-gtk2 (>= 2.14.0),
python-vte,
${misc:Depends},
${python:Depends}
Provides: x-terminal-emulator 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 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. filling a large area of screen space with terminals.

103
debian/copyright vendored
View File

@ -1,65 +1,48 @@
This package was debianized by Chris Jones <cmsj@tenshu.net> on Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Sat, 28 Jul 2007 04:12:30 +0100. Upstream-Name: terminator
Upstream-Contact: Chris Jones <cmsj@tenshu.net>
Source: https://launchpad.net/terminator/+download
It was downloaded from https://launchpad.net/terminator/+download Files: *
Copyright: Chris Jones <cmsj@tenshu.net> and others
2006-2011 Chris Jones <cmsj@tenshu.net>
2008 Thomas Hurst <tom@hur.st>
2010 Julien Nicoulaud <julien.nicoulaud@gmail.com>
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 <nvalcarcel@ubuntu-pe.org>
2008 Cris Grada <krig@tiscali.it>
2010 Vytautas Bačiulis <info@infosoft.lt>
2008 Thomas Meire <blackskad@gmail.com>
2009 Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
License: GPL-2.0
Chris Jones Files: doc/terminator_config.5
Huang He Copyright: 2008 Nicolas Valcarcel <nvalcarcel@ubuntu.com>
Kees Cook License: GPL-2.0
Thomas Meire
Nicolas Valcarcel
Emmanuel Bretelle
Chris Oattes
Markus Korn
Mackenzie Morgan
Daniel T Chen
Nicolas Roman
Takao Fujiwara
Jordan Callicoat
Stephen Boddy
Artwork: Files: debian/*
Cory Kontros - Produced our current icon under the CC-by-SA licence Copyright: 2007 Chris Jones <cmsj@tenshu.net>
Cristian Grada - Drew our original icon and licenced it to us under this licence 2008-2012 Nicolas Valcárcel Scerpella <nvalcarcel@gmail.com>
2012-2014 Julián Moreno Patiño <julian@debian.org>
Translations: License: GPL-2.0
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:
<Copyright (C) 2006-2010 Chris Jones and others>
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 <cmsj@tenshu.net> and
is licensed under the GPL, see above.
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'

1
debian/pycompat vendored
View File

@ -1 +0,0 @@
2

29
debian/rules vendored
View File

@ -1,18 +1,25 @@
#!/usr/bin/make -f #!/usr/bin/make -f
# -*- makefile -*- # -*- 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 dh $@ --with python2
include /usr/share/cdbs/1/rules/simple-patchsys.mk
DEB_INSTALL_CHANGELOGS_ALL := ChangeLog override_dh_auto_install:
DEB_PYTHON_INSTALL_ARGS_ALL +=--install-lib=/usr/share/terminator --install-scripts=/usr/share/terminator 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:: override_dh_installchangelogs:
dh_icons -pterminator dh_installchangelogs ChangeLog
dh_link /usr/share/terminator/terminator /usr/bin/terminator
dh_link /usr/share/terminator/remotinator /usr/bin/remotinator
clean:: override_dh_clean:
rm -rf build/ rm -rf build/
rm -f data/terminator.desktop
rm -f po/.intltool-merge-cache
find . -name '*.pyc' -delete

1
debian/source/format vendored Normal file
View File

@ -0,0 +1 @@
3.0 (quilt)

1
debian/terminator.links vendored Normal file
View File

@ -0,0 +1 @@
/usr/share/terminator/terminator /usr/bin/terminator

View File

@ -1,20 +1,13 @@
#!/bin/sh -e #!/bin/sh
set -e
if [ "$1" = "configure" ]; then 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 # Add an alternative for x-terminal-emulator
update-alternatives --install /usr/bin/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 \ --slave /usr/share/man/man1/x-terminal-emulator.1.gz \
x-terminal-emulator.1.gz /usr/share/man/man1/terminator.1.gz x-terminal-emulator.1.gz /usr/share/man/man1/terminator.1.gz
fi 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# #DEBHELPER#

View File

@ -1,4 +1,6 @@
#!/bin/sh -e #!/bin/sh
set -e
if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt 0.13+ds1; then if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt 0.13+ds1; then
pycentral pkgremove terminator pycentral pkgremove terminator

View File

@ -1,10 +1,10 @@
#!/bin/sh -e #!/bin/sh
set -e
if [ "$1" = remove ]; then if [ "$1" = remove ]; then
update-alternatives --remove terminator /usr/bin/terminator || true update-alternatives --remove terminator /usr/bin/terminator || true
update-alternatives --remove x-terminal-emulator /usr/bin/terminator 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 fi
#DEBHELPER# #DEBHELPER#

3
debian/watch vendored
View File

@ -1,2 +1,3 @@
version=3 version=3
http://launchpad.net/terminator/+download .*/terminator_(.+)\.tar\.gz opts=dversionmangle=s/\+ds\d+$// \
http://launchpad.net/terminator/+download .*/terminator[:?_|-](.+)\.tar\.gz