From 961e5368f204cdc4f6601046e6edd602b749047d Mon Sep 17 00:00:00 2001 From: bryce Date: Mon, 21 Sep 2015 23:20:18 -0700 Subject: [PATCH] * No-change upload for wily * No-change upload for vivid * copyright: Change upstream maintainer to Stephen Boddy * New upstream release of 0.98. Remaining changes: + Add missing dependency on psutil to check for IBus running. + Workaround debian compression of font files. + Add terminator.wrapper to fix blurry/incorrect icons in task switchers. --- debian/changelog | 23 ++++++++++++++++++++++- debian/control | 1 + debian/copyright | 2 +- debian/terminator.postinst | 12 +++++++++++- debian/terminator.prerm | 2 ++ 5 files changed, 37 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index da9adda2..00d0770f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,27 @@ +terminator (0.98~ppa8) wily; urgency=medium + + * No-change upload for wily + + -- Bryce Harrington Mon, 21 Sep 2015 22:09:34 -0700 + +terminator (0.98~ppa7) vivid; urgency=medium + + * No-change upload for vivid + + -- Bryce Harrington Mon, 21 Sep 2015 22:08:58 -0700 + +terminator (0.98~ppa6) trusty; urgency=medium + + * copyright: Change upstream maintainer to Stephen Boddy + + -- Bryce Harrington Sun, 20 Sep 2015 14:21:38 -0700 + terminator (0.98) precise; urgency=medium - * New upstream release of 0.98 + * New upstream release of 0.98. Remaining changes: + + Add missing dependency on psutil to check for IBus running. + + Workaround debian compression of font files. + + Add terminator.wrapper to fix blurry/incorrect icons in task switchers. * Sync up with Debian packaging + Update homepage + Revise copyright file diff --git a/debian/control b/debian/control index 5e892963..888bd541 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ Package: terminator Architecture: all Depends: gconf2, python-dbus, + python-psutil, python-gobject, python-gtk2 (>= 2.14.0), python-vte, diff --git a/debian/copyright b/debian/copyright index 697bdcd7..4b0d989d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: terminator -Upstream-Contact: Chris Jones +Upstream-Contact: Stephen Boddy Source: https://launchpad.net/terminator/+download Files: * diff --git a/debian/terminator.postinst b/debian/terminator.postinst index c9d2c37c..03614ce8 100755 --- a/debian/terminator.postinst +++ b/debian/terminator.postinst @@ -3,11 +3,21 @@ 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 50 \ + x-terminal-emulator /usr/bin/terminator.wrapper 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.prerm b/debian/terminator.prerm index d22e97b9..57ae39cf 100644 --- a/debian/terminator.prerm +++ b/debian/terminator.prerm @@ -5,6 +5,8 @@ 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#