Merge changes from debian package

debian/README.source

@@ -0,0 +1,4 @@
+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.

debian/control

@@ -2,7 +2,9 @@ Source: terminator
 Section: misc
 XS-Python-Version: all
 Priority: optional
-Maintainer: Nicolas Valcárcel <nvalcarcel@gmail.com> 
+Maintainer: Nicolas Valcárcel Scerpella <nvalcarcel@canonical.com>
+Uploaders: Rudy Godoy Guillén <rudy@debian.org>,
+ Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
 Build-Depends: debhelper (>= 5.0.62), python, cdbs (>= 0.4.49)
 Build-Depends-Indep: python-central (>= 0.5.6)
 Standards-Version: 3.8.0

debian/terminator.postinst

@@ -1,8 +1,6 @@
 #!/bin/sh -e
 
 if [ "$1" = "configure" ]; then
-        # Add an alternative for aterm
-        update-alternatives --install /usr/bin/terminator terminator /usr/bin/terminator 30
         # Add an alternative for x-terminal-emulator
         update-alternatives --install /usr/bin/x-terminal-emulator \
                 x-terminal-emulator /usr/bin/terminator 50 \

terminatorlib/configfile.py

@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/usr/bin/python
 
 import re
 from terminatorlib.config import dbg, debug

terminatorlib/debugserver.py

@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/usr/bin/python
 #
 # Copyright (c) 2008, Thomas Hurst <tom@hur.st>
 #

terminatorlib/freebsd.py

@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/usr/bin/python
 #
 # Copyright (c) 2008, Thomas Hurst <tom@hur.st>
 #