From 07c8dee9ebf14073e04b60be623a9c15dc3048d7 Mon Sep 17 00:00:00 2001 From: bryce Date: Sat, 19 Sep 2015 23:18:23 -0700 Subject: [PATCH] debian: Change packaging from cdbs to debhelper + 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. --- debian/README.source | 4 ---- debian/changelog | 6 ++++++ debian/compat | 2 +- debian/control | 10 ++++------ debian/pycompat | 1 - debian/rules | 29 ++++++++++++++++++----------- debian/source/format | 1 + debian/terminator.links | 1 + debian/terminator.postinst | 11 +---------- debian/terminator.prerm | 2 -- 10 files changed, 32 insertions(+), 35 deletions(-) delete mode 100644 debian/README.source delete mode 100644 debian/pycompat create mode 100644 debian/source/format create mode 100644 debian/terminator.links 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 8cf25fc4..da9adda2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,12 @@ terminator (0.98) precise; urgency=medium + 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. -- Bryce Harrington Sat, 19 Sep 2015 18:41:57 -0700 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 78bba2a7..5e892963 100644 --- a/debian/control +++ b/debian/control @@ -5,11 +5,10 @@ Maintainer: Nicolas Valcárcel Scerpella Uploaders: Rudy Godoy Guillén , Python Applications Packaging Team , Julián Moreno Patiño -Build-Depends: debhelper (>= 5.0.62), cdbs (>= 0.4.49), +Build-Depends: debhelper (>= 9), intltool, - python + python (>= 2.6.6-3~) X-Python-Version: >= 2.5 -Build-Depends-Indep: python-support (>= 0.5.3) 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/ @@ -18,15 +17,14 @@ Homepage: http://gnometerminator.blogspot.com/p/introduction.html Package: terminator Architecture: all Depends: gconf2, - python-psutil, libgtk2.0-bin, hicolor-icon-theme, + python-dbus, python-gobject, python-gtk2 (>= 2.14.0), python-vte, ${misc:Depends}, ${python:Depends} -XB-Python-Version: ${python:Versions} Provides: x-terminal-emulator -Recommends: python-gnome2, python-keybinder, xdg-utils +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 filling a large area of screen space with terminals. 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 1f5bbe6c..c9d2c37c 100755 --- a/debian/terminator.postinst +++ b/debian/terminator.postinst @@ -3,20 +3,11 @@ 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.prerm b/debian/terminator.prerm index 57ae39cf..d22e97b9 100644 --- a/debian/terminator.prerm +++ b/debian/terminator.prerm @@ -5,8 +5,6 @@ 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#