skytools (2.1.8-2.2) debian-dir only changes

--- skytools-2.1.8.orig/debian/control
+++ skytools-2.1.8/debian/control
@@ -0,0 +1,37 @@
+Source: skytools
+Maintainer: Fernando Ike de Oliveira <fike@midstorm.org>
+Section: misc
+Priority: optional
+Standards-Version: 3.8.0
+Build-Depends: python-all-dev, postgresql-server-dev-8.4, cdbs (>= 0.4.38), 
+ debhelper (>= 7), xmlto, asciidoc, python-support
+Homepage: http://pgfoundry.org/projects/skytools/
+XS-Python-Version: >= 2.5
+Vcs-Svn: svn://svn.debian.org/pkg-postgresql/trunk/skytools/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-postgresql/trunk/skytools/
+
+Package: skytools
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-psycopg2, 
+ skytools-modules-8.4
+Description: Database management tools from Skype to PostgreSQL 
+ Skytools are database management tools to WAL shipping, queueing and 
+ replication. This package has Python parts of skytools:
+ .
+  - londiste - PostgreSQL replication engine written in Python
+  - pgqadm - PgQ tickter and administration interface
+  - walmgr - Tools for managing WAL-based replication for PostgreSQL.
+
+Package: skytools-modules-8.4
+Architecture: any
+Depends:  ${shlibs:Depends}, ${misc:Depends}, postgresql-8.4
+Description: PostgreSQL modules of skytools
+ Skytools are database management tools to WAL shipping, queuing and 
+ replication. This package has PostgreSQL modules skytools:
+ .
+  - txid: Provides 8-byte transaction id-s for external usage
+  - logtriga: Trigger function for table event logging in "partial SQL" 
+    format, used in londsite for replication
+  - logutriga - Trigger function for table event logging in 
+    urlencoded format
+  - pgq: Python framework for PgQ consumers
--- skytools-2.1.8.orig/debian/rules
+++ skytools-2.1.8/debian/rules
@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+DEB_PYTHON_SYSTEM := pysupport
+include /usr/share/cdbs/1/class/python-distutils.mk
+
+
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/usr PG_CONFIG=/usr/lib/postgresql/8.4/bin/pg_config
+DEB_INSTALL_DOCS_ALL := doc/TODO.txt NEWS README
+DEB_INSTALL_MANPAGES_skytools := doc/*.1 doc/*.5
+
+DEB_DH_SHLIBDEPS_ARGS_ALL=--dpkg-shlibdeps-params=--ignore-missing-info
+
+install/skytools::
+	for I in debian/tmp/usr/bin/*; \
+		do \
+			mv $$I $${I%.py} ; \
+	done
+
--- skytools-2.1.8.orig/debian/skytools-modules-8.4.install
+++ skytools-2.1.8/debian/skytools-modules-8.4.install
@@ -0,0 +1,5 @@
+debian/tmp/usr/lib/postgresql/8.4/lib/*
+debian/tmp/usr/share/postgresql/8.4/contrib/*
+debian/tmp/usr/share/postgresql/8.4/contrib/*
+debian/tmp/usr/share/doc/postgresql*/contrib/README.*
+debian/tmp/usr/share/skytools
--- skytools-2.1.8.orig/debian/skytools-modules-8.4.links
+++ skytools-2.1.8/debian/skytools-modules-8.4.links
@@ -0,0 +1,2 @@
+/usr/lib/postgresql/8.4/lib/logtriga.so /usr/lib/logtriga.so
+/usr/lib/postgresql/8.4/lib/txid.so /usr/lib/txid.so
--- skytools-2.1.8.orig/debian/skytools-modules-8.4.doc
+++ skytools-2.1.8/debian/skytools-modules-8.4.doc
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/postgresql-doc-8.4/contrib/README.* 
--- skytools-2.1.8.orig/debian/skytools.install
+++ skytools-2.1.8/debian/skytools.install
@@ -0,0 +1,5 @@
+debian/tmp/usr/bin/*
+debian/tmp/usr/lib/python*/*-packages/londiste/*.py
+debian/tmp/usr/lib/python*/*-packages/pgq/*.py
+debian/tmp/usr/lib/python*/*-packages/skytools/*.py
+debian/tmp/usr/share/doc/skytools/conf
--- skytools-2.1.8.orig/debian/compat
+++ skytools-2.1.8/debian/compat
@@ -0,0 +1 @@
+7
--- skytools-2.1.8.orig/debian/watch
+++ skytools-2.1.8/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://pgfoundry.org/frs/?group_id=1000206 /frs/download.php/[0-9]+/skytools-([0-9.]+).tar.gz debian uupdate
--- skytools-2.1.8.orig/debian/changelog
+++ skytools-2.1.8/debian/changelog
@@ -0,0 +1,70 @@
+skytools (2.1.8-2.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/{control, rules}
+    - use pysupport to manage the Python module, so also compiling it; thanks to
+      Luca Falavigna for the report; Closes: #566047
+  * debian/{control, rules, *.links, *.install}
+    - support only PostgreSQL 8.4; thanks to Martin Pitt for the report;
+      Closes: #559606
+  * debian/rules
+    - added simple-patchsys.mk rule
+    - added python-distutils.mk class
+  * debian/patches/missing_includes.diff
+    - added missing includes, fixing the FTBFS with PostgreSQL 8.4
+  * skytools.install
+    - don't hardcode 'python2.5' and 'site-package', use globbing instead
+  * patches/rename_as_for_python2.6.diff
+    - added to replace 'as', since it's a reserved word in Python 2.6; thanks to
+      Fabrice Coutadeur for the report; Closes: #535144
+  * debian/skytools-modules-8.4.install
+    - added installation of files from 'debian/tmp/usr/share/skytools' needed
+      for the module to look for SQL files; thanks to Marc Cousin for the
+      report and Chris Lamb for the patch; Closes: #534310
+  * debian/control
+    - replaced explicit Depends on 'python' with substvar ${python:Depends}
+    - build-depends on python-all-dev, to be built against all support Python
+
+ -- Sandro Tosi <morph@debian.org>  Sat, 13 Feb 2010 10:46:11 +0100
+
+skytools (2.1.8-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Specify PG_CONFIG directly so that paths relating to Postgres 8.4 are not
+    returned, preventing a FTBFS. (Closes: #536906)
+
+ -- Chris Lamb <lamby@debian.org>  Tue, 11 Aug 2009 08:20:10 +0100
+
+skytools (2.1.8-2) unstable; urgency=low
+
+  * Dependency changes psycopg to psycopg2, because psycopg isn't support 
+    upstream. (Closes: #518223)
+  * Added README.source
+
+ -- Fernando Ike de Oliveira <fike@midstorm.org>  Wed, 04 Mar 2009 18:39:29 -0300
+
+skytools (2.1.8-1) unstable; urgency=low
+
+  * New upstream release. 
+
+ -- Fernando Ike de Oliveira <fike@midstorm.org>  Fri, 09 Jan 2009 15:17:14 -0200
+
+skytools (2.1.7-1) unstable; urgency=low
+
+  * New upstream release
+  * Fixed itens relationship bug #479685: (Closes: #479685)
+    + Added manpage of bulk_loader, cube_dispatcher, londsite, pgqadm,
+      queue_mover, queue_splitter, scriptmgr, skytools_upgrade, table_dispacher
+      and walmgr.
+    + Added NEWS and README.
+    + Better written field short description to skytools-modules and 
+      skytools in the control file.
+    + Better written field long description to skytools-modules and skytools.
+
+ -- Fernando Ike de Oliveira <fike@midstorm.org>  Sat, 07 Jun 2008 20:39:15 -0300
+
+skytools (2.1.6-1) unstable; urgency=low
+
+  * Initial release. (Closes: #427871)
+
+ -- Fernando Ike de Oliveira <fike@midstorm.org>  Fri, 27 Jul 2007 04:00:06 -0300
--- skytools-2.1.8.orig/debian/copyright
+++ skytools-2.1.8/debian/copyright
@@ -0,0 +1,21 @@
+This package was debianized by Fernando Ike de Oliveira 
+<fike@midstorm.org>  on Mon, 9 Jul 2007 21:50:03 -0300.
+
+It was downloaded from <http://pgfoundry.org/projects/skytools/>.
+
+Upstream Authors: Sven Suursoho, Marko Kreen, Skype technologies OÜ
+
+Copyright: 2007 - Sven Suursoho <sven.suursoho@skype.net>,
+                  Marko Kreen <marko.kreen@skype.net>
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the BSD License as published by Univesity
+   California.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   BSD  License for more details.
+
+On Debian systems, the complete text of the BSD License can be
+found in '/usr/share/common-licenses/BSD'.
--- skytools-2.1.8.orig/debian/README.source
+++ skytools-2.1.8/debian/README.source
@@ -0,0 +1,9 @@
+skytools source for Debian
+---------------------------------
+
+  * Originally, source code had debian directory that were removed.
+    The debian directory was used to build packaging pgbouncer with
+    yada.
+
+  -- Fernando Ike de Oliveira <fike@midstorm.org>  Thu, 05 Mar 2009
+  17:27:19 -0300
--- skytools-2.1.8.orig/debian/patches/rename_as_for_python2.6.diff
+++ skytools-2.1.8/debian/patches/rename_as_for_python2.6.diff
@@ -0,0 +1,20 @@
+--- skytools-2.1.8.orig/python/pgq/status.py
++++ skytools-2.1.8/python/pgq/status.py
+@@ -4,13 +4,13 @@
+ 
+ import sys, os, skytools
+ 
+-def ival(data, as = None):
++def ival(data, as_expr = None):
+     "Format interval for output"
+-    if not as:
+-        as = data.split('.')[-1]
++    if not as_expr:
++        as_expr = data.split('.')[-1]
+     numfmt = 'FM9999999'
+     expr = "coalesce(to_char(extract(epoch from %s), '%s') || 's', 'NULL') as %s"
+-    return expr % (data, numfmt, as)
++    return expr % (data, numfmt, as_expr)
+ 
+ class PGQStatus(skytools.DBScript):
+     def __init__(self, args, check = 0):
--- skytools-2.1.8.orig/debian/patches/missing_includes.diff
+++ skytools-2.1.8/debian/patches/missing_includes.diff
@@ -0,0 +1,24 @@
+--- skytools-2.1.8.orig/sql/pgq/triggers/common.c
++++ skytools-2.1.8/sql/pgq/triggers/common.c
+@@ -30,6 +30,9 @@
+ #include "common.h"
+ #include "stringutil.h"
+ 
++#include "utils/syscache.h"
++#include "utils/builtins.h"
++
+ /*
+  * Module tag
+  */
+--- skytools-2.1.8.orig/sql/logtriga/logtriga.c
++++ skytools-2.1.8/sql/logtriga/logtriga.c
+@@ -21,6 +21,8 @@
+ 
+ #include "textbuf.h"
+ 
++#include "catalog/pg_type.h"
++
+ PG_FUNCTION_INFO_V1(logtriga);
+ Datum logtriga(PG_FUNCTION_ARGS);
+ 
+