From be96c38db7d9147df80d52bd1549882a17dd122e Mon Sep 17 00:00:00 2001 From: Chris Jones Date: Sat, 5 Jan 2008 00:18:21 +0000 Subject: [PATCH] Apply some MOTU suggested changes and switch back to CDBS --- AUTHORS | 8 ----- debian/changelog | 3 +- debian/control | 2 +- debian/copyright | 7 +++-- debian/docs | 1 - debian/rules | 69 +++----------------------------------------- po/{es.pot => es.po} | 0 7 files changed, 11 insertions(+), 79 deletions(-) delete mode 100644 AUTHORS rename po/{es.pot => es.po} (100%) diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index c8e53dba..00000000 --- a/AUTHORS +++ /dev/null @@ -1,8 +0,0 @@ -Chris Jones - -Draws heavily from the example python-vte code and the gedit terminal plugin. - -Most excellent patches have been gratefully received from: - o Huang He - o Kees Cook - o Thomas Meire diff --git a/debian/changelog b/debian/changelog index 993be714..2eac3ae6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,6 @@ terminator (0.7-2) hardy; urgency=low - * Switch from cdbs to python-central - * Move change log details to ChangeLog and no longer be a native package + * Various changes from MOTU feedback -- Chris Jones Wed, 02 Jan 2008 22:50:18 +0000 diff --git a/debian/control b/debian/control index 8186aa5f..721992c3 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: misc XS-Python-Version: all Priority: optional Maintainer: Chris Jones -Build-Depends-Indep: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-vte +Build-Depends-Indep: debhelper (>= 5.0.38), python, python-central (>= 0.5.6), cdbs (>=0.4.49), python-vte Standards-Version: > 3.7.3 Package: terminator diff --git a/debian/copyright b/debian/copyright index b2b66ac1..aa51a09f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,11 +1,14 @@ This package was debianized by Chris Jones on Sat, 28 Jul 2007 04:12:30 +0100. -It was downloaded from https://launchpad.net/terminator/trunk/0.1/+download/terminator-0.1.tar.bzr2 +It was downloaded from https://launchpad.net/terminator/+download -Upstream Author(s): +Upstream Authors: Chris Jones + Huang He + Kees Cook + Thomas Meire Copyright: diff --git a/debian/docs b/debian/docs index 6f12db50..e845566c 100644 --- a/debian/docs +++ b/debian/docs @@ -1,2 +1 @@ -AUTHORS README diff --git a/debian/rules b/debian/rules index 88262c22..974115af 100755 --- a/debian/rules +++ b/debian/rules @@ -1,70 +1,9 @@ #!/usr/bin/make -f # -*- makefile -*- -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. +DEB_PYTHON_SYSTEM = pycentral -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/python-distutils.mk -PYTHON := /usr/bin/python -PYVER := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]') +DEB_COMPRESS_EXCLUDE := .py -build: build-stamp - -build-stamp: - dh_testdir - python setup.py build - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - rm -rf build - -find . -name '*.py[co]' | xargs rm -f - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - python setup.py install \ - --root=$(CURDIR)/debian/terminator - -# Build architecture-independent files here. -binary-indep: build install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs README -# dh_installexamples examples/* - dh_installman - : # Replace all '#!' calls to python with $(PYTHON) - : # and make them executable - for i in `find debian -mindepth 3 -type f`; do \ - sed '1s,#!.*python[^ ]*\(.*\),#! $(PYTHON)\1,' \ - $$i > $$i.temp; \ - if cmp --quiet $$i $$i.temp; then \ - rm -f $$i.temp; \ - else \ - mv -f $$i.temp $$i; \ - chmod 755 $$i; \ - echo "fixed interpreter: $$i"; \ - fi; \ - done - dh_pycentral - dh_python - dh_compress -X.py - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -# Build architecture-dependent files here. -binary-arch: build install -# We have nothing to do by default. - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/po/es.pot b/po/es.po similarity index 100% rename from po/es.pot rename to po/es.po