tags 559606 + patch tags 566047 + patch thanks Dear maintainer,
I've prepared an NMU for skytools (versioned as 2.1.8-2.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. The NMU is big and changes a lot in the package, but it's the only way to properly and cleanly fix the issues at hand. The package will have to pass trhu NEW, so some additional delay in reaching the archive might be in order Regards.
reverted: --- skytools-2.1.8/debian/skytools-modules-8.3.install +++ skytools-2.1.8.orig/debian/skytools-modules-8.3.install @@ -1,4 +0,0 @@ -debian/tmp/usr/lib/postgresql/8.3/lib/* -debian/tmp/usr/share/postgresql/8.3/contrib/* -debian/tmp/usr/share/postgresql/8.3/contrib/* -debian/tmp/usr/share/doc/postgresql-doc-8.3/contrib/README.* usr/share/doc/skytools-modules reverted: --- skytools-2.1.8/debian/skytools-modules-8.3.doc +++ skytools-2.1.8.orig/debian/skytools-modules-8.3.doc @@ -1 +0,0 @@ -debian/tmp/usr/share/doc/postgresql-doc-8.3/contrib/README.* diff -u skytools-2.1.8/debian/control skytools-2.1.8/debian/control --- skytools-2.1.8/debian/control +++ skytools-2.1.8/debian/control @@ -1,18 +1,19 @@ Source: skytools Maintainer: Fernando Ike de Oliveira <f...@midstorm.org> -Section: misc +Section: misc Priority: optional Standards-Version: 3.8.0 -Build-Depends: python-dev, postgresql-server-dev-8.3, cdbs (>= 0.4.38), - debhelper (>= 7), xmlto, asciidoc +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, python-psycopg2, - skytools-modules-8.3 +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: @@ -21,9 +22,9 @@ - pgqadm - PgQ tickter and administration interface - walmgr - Tools for managing WAL-based replication for PostgreSQL. -Package: skytools-modules-8.3 +Package: skytools-modules-8.4 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, postgresql-8.3 +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: diff -u skytools-2.1.8/debian/rules skytools-2.1.8/debian/rules --- skytools-2.1.8/debian/rules +++ skytools-2.1.8/debian/rules @@ -2,9 +2,13 @@ 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.3/bin/pg_config + +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 diff -u skytools-2.1.8/debian/skytools.install skytools-2.1.8/debian/skytools.install --- skytools-2.1.8/debian/skytools.install +++ skytools-2.1.8/debian/skytools.install @@ -1,5 +1,5 @@ debian/tmp/usr/bin/* -debian/tmp/usr/lib/python2.5/site-packages/londiste/*.py -debian/tmp/usr/lib/python2.5/site-packages/pgq/*.py -debian/tmp/usr/lib/python2.5/site-packages/skytools/*.py +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 reverted: --- skytools-2.1.8/debian/skytools-modules-8.3.links +++ skytools-2.1.8.orig/debian/skytools-modules-8.3.links @@ -1,2 +0,0 @@ -/usr/lib/postgresql/8.3/lib/logtriga.so /usr/lib/logtriga.so -/usr/lib/postgresql/8.3/lib/txid.so /usr/lib/txid.so diff -u skytools-2.1.8/debian/changelog skytools-2.1.8/debian/changelog --- skytools-2.1.8/debian/changelog +++ skytools-2.1.8/debian/changelog @@ -1,3 +1,32 @@ +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 <mo...@debian.org> Sat, 13 Feb 2010 10:46:11 +0100 + skytools (2.1.8-2.1) unstable; urgency=medium * Non-maintainer upload. only in patch2: unchanged: --- 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.* only in patch2: unchanged: --- 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 only in patch2: unchanged: --- 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 only in patch2: unchanged: --- 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); + + only in patch2: unchanged: --- 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):
