* Sync up with Debian packaging

+ Update homepage
  + Revise copyright file
  + Use canonical URIs for Vcs-* fields
  + Update regular expression in watch

debian/changelog

@@ -1,8 +1,13 @@
-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
 
- -- 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
 

debian/control

@@ -1,25 +1,34 @@
 Source: terminator
 Section: misc
-XS-Python-Version: >=2.5 
 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>,
- 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: debhelper (>= 5.0.62), cdbs (>= 0.4.49),
+ intltool,
+ python
+X-Python-Version: >= 2.5
 Build-Depends-Indep: python-support (>= 0.5.3) 
-Standards-Version: 3.8.2
+Standards-Version: 3.9.5
-Vcs-Svn: svn://svn.debian.org/python-apps/packages/terminator/trunk/
+Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/terminator/trunk/
-Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/terminator/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/terminator/trunk/
-Homepage: http://www.tenshu.net/terminator/
+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
+Depends: gconf2,
+ python-psutil, libgtk2.0-bin, hicolor-icon-theme,
+ python-gobject,
+ python-gtk2 (>= 2.14.0),
+ python-vte,
+ ${misc:Depends},
+ ${python:Depends}
 XB-Python-Version: ${python:Versions}
 Provides: x-terminal-emulator
-Recommends: xdg-utils, python-gnome2, python-keybinder
+Recommends: python-gnome2, python-keybinder, 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

debian/copyright

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

debian/terminator.postinst

@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 if [ "$1" = "configure" ]; then
         # Ensure the old alternative is removed

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 

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

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