Merge branch used for improving debian packaging

ChangeLog

@@ -0,0 +1,65 @@
+terminator 0.7:
+
+  * Fullscreen support, via a patch from Thomas Meire. Closes LP #178914
+  * Improved behaviour when closing terminals/window. Result of work by Thomas
+    Meire. Closes LP #161121
+  * Freedesktop .desktop file and appropriate setup.py entry for installing
+    it. Closes LP #178943
+
+terminator 0.6:
+
+  * Use new gnome-terminal gconf key to find available profiles
+  * Move a few more hardcoded items to our settings array (not that it can be
+    overridden yet)
+  * Fix handling of exiting child processes to properly track gnome-terminal
+    settings
+  * Add Ctrl-Tab and Ctrl-Shift-Tab as options for switching terminals (patch
+    from Kees Cook)
+  * Stop using parent.show_all() when removing/adding a terminal and instead
+    show the actual widgets that have been created. This prevents scrollbars
+    from re-appearing after they have been hidden
+
+terminator 0.5:
+
+  * The terminator window is now able to resize smaller, thanks to Kees Cook
+    for the fix.
+  * Email addresses are now matched and opened correctly. Closes LP #139015
+  * Double clicking a URL now selects the whole URL. Closes LP #129533
+  * The default behaviour is now to open a single 80x24 terminal rather than
+    four terminals in a maximised window. Closes LP #126219 and should force
+    me to fix LP #87720
+  * There are now hotkeys for switching between terminals, splitting terminals
+    and closing them. Closes LP #149931 and #148622(thanks to Huanghe for 
+    patches for this)
+  * If there is only one terminal, closing it will not produce a quit message
+
+terminator 0.4:
+
+  * Architecture should be all, not any
+  * Fix section
+  * Add AUTHORS file
+  * Rename script to drop the .py
+  * Handle the gnome-terminal profile better by offering command options
+  * Fudge around some resizing issues
+  * Fix child spawning to avoid segfaulting zsh
+  * Misc. code formatting/style improvements
+  * Refactor terminal splitting into one axis agnostic function
+  * Flesh out setup.py a tiny bit more
+
+terminator 0.3:
+
+  * Implemented terminal closing, which correctly reparents its sibling (if
+    any)
+  * Updated documentation to reflect a serious bug with shells that aren't
+    bash (or at least zsh)
+
+terminator 0.2:
+
+  * Support dynamically splitting terminals
+
+terminator 0.1:
+
+  * Fixed some distribution wording
+  * Fix build-depends
+  * Initial release 
+

debian/changelog

@@ -1,41 +1,19 @@
-terminator (0.7) gutsy; urgency=low
+terminator (0.7-1) hardy; urgency=low
 
-  * Fullscreen support, via a patch from Thomas Meire. Closes LP #178914
+  * Switch from cdbs to python-central
-  * Improved behaviour when closing terminals/window. Result of work by Thomas
+  * Move change log details to ChangeLog and no longer be a native package
-    Meire. Closes LP #161121
-  * Freedesktop .desktop file and appropriate setup.py entry for installing
-    it. Closes LP #178943
 
  -- Chris Jones <cmsj@tenshu.net>  Sat, 29 Dec 2007 02:34:29 +0000
 
 terminator (0.6) gutsy; urgency=low
 
-  * Use new gnome-terminal gconf key to find available profiles
+  * New upstream release
-  * Move a few more hardcoded items to our settings array (not that it can be
-    overridden yet)
-  * Fix handling of exiting child processes to properly track gnome-terminal
-    settings
-  * Add Ctrl-Tab and Ctrl-Shift-Tab as options for switching terminals (patch
-    from Kees Cook)
-  * Stop using parent.show_all() when removing/adding a terminal and instead
-    show the actual widgets that have been created. This prevents scrollbars
-    from re-appearing after they have been hidden
 
  -- Chris Jones <cmsj@tenshu.net>  Wed, 26 Dec 2007 19:54:47 +0000
 
 terminator (0.5-1) gutsy; urgency=low
 
-  * The terminator window is now able to resize smaller, thanks to Kees Cook
+  * New upstream release
-    for the fix.
-  * Email addresses are now matched and opened correctly. Closes LP #139015
-  * Double clicking a URL now selects the whole URL. Closes LP #129533
-  * The default behaviour is now to open a single 80x24 terminal rather than
-    four terminals in a maximised window. Closes LP #126219 and should force
-    me to fix LP #87720
-  * There are now hotkeys for switching between terminals, splitting terminals
-    and closing them. Closes LP #149931 and #148622(thanks to Huanghe for 
-    patches for this)
-  * If there is only one terminal, closing it will not produce a quit message
 
  -- Chris Jones <cmsj@tenshu.net>  Fri, 09 Nov 2007 00:03:05 -0500
 
@@ -53,29 +31,20 @@ terminator (0.4-2) gutsy; urgency=low
 
 terminator (0.4-1) gutsy; urgency=low
 
-  * Add AUTHORS file
+  * New upstream release
-  * Rename script to drop the .py
-  * Handle the gnome-terminal profile better by offering command options
-  * Fudge around some resizing issues
-  * Fix child spawning to avoid segfaulting zsh
-  * Misc. code formatting/style improvements
-  * Refactor terminal splitting into one axis agnostic function
   * Flesh out setup.py a tiny bit more
 
  -- Chris Jones <cmsj@tenshu.net>  Tue, 11 Sep 2007 22:42:00 +0100
 
 terminator (0.3-1) gutsy; urgency=low
 
-  * Implemented terminal closing, which correctly reparents its sibling (if
+  * New upstream release
-    any)
-  * Updated documentation to reflect a serious bug with shells that aren't
-    bash (or at least zsh)
 
  -- Chris Jones <cmsj@tenshu.net>  Sun, 29 Jul 2007 17:48:13 +0100
 
 terminator (0.2-1) gutsy; urgency=low
 
-  * Support dynamically splitting terminals
+  * New upstream release
 
  -- Chris Jones <cmsj@tenshu.net>  Sun, 29 Jul 2007 05:02:13 +0100
 

debian/control

@@ -1,14 +1,16 @@
 Source: terminator
 Section: misc
-Priority: extra
+XS-Python-Version: all
+Priority: optional
 Maintainer: Chris Jones <cmsj@tenshu.net>
-Build-Depends: cdbs, debhelper (>= 5), python, python-vte
+Build-Depends-Indep: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-vte
-Standards-Version: 3.7.2
+Standards-Version: > 3.7.3
 
 Package: terminator
 Architecture: all
-Depends: python, python-vte, python-gconf, gconf2
+Depends: ${python:Depends}, python-vte, python-gconf, gconf2
-Description: Terminator, multiple GNOME terminals in one window
+XB-Python-Version: ${python:Versions}
+Description: Multiple GNOME terminals in one window
  Terminator, multiple terminals in one window. This is a little
  project to produce an efficient way of filling a large area of
  screen space with terminals.

debian/dirs

@@ -1 +0,0 @@
-usr/bin

debian/rules

@@ -1,6 +1,70 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
 
-include /usr/share/cdbs/1/rules/debhelper.mk
+# Uncomment this to turn on verbose mode.
-include /usr/share/cdbs/1/class/python-distutils.mk
+#export DH_VERBOSE=1
 
-# Add here any variable or target overrides you need.
+PYTHON	:= /usr/bin/python
+PYVER   := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
+
+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