debian: add build-deps, force debian/control rebuild

debian/control:
  Add build-dep of any of server-dev packages.
  For some reason, server-dev-all does not depend on any

debian/rules:
  Rebuild it via stamp file, otherwise its easily ignored
  and modules package is left out from build.

diff --git a/debian/control b/debian/control
index b64afcff37beb0fa93356547e85b5ebd867e460d..b5ffb67d428445ed92482a3906164f5e7d9904af 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,9 @@ Source: skytools3
 Section: database
 Priority: extra
 Maintainer: Dimitri Fontaine <dim@tapoueh.org>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, autoconf (>= 2.65), automake, libtool, libevent-dev, python-all-dev, python-support, python-psycopg2, xmlto, asciidoc, libpq-dev, postgresql-server-dev-all
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, autoconf (>= 2.65), automake, libtool, libevent-dev,
+  python-all-dev, python-support, python-psycopg2, xmlto, asciidoc, libpq-dev, postgresql-server-dev-all,
+  postgresql-server-dev-8.4 | postgresql-server-dev-9.0 | postgresql-server-dev-9.1 | postgresql-server-dev-9.2
 Standards-Version: 3.9.1
 Homepage: http://wiki.postgresql.org/wiki/Skytools
 Vcs-Git: http://github.com/markokr/skytools.git

diff --git a/debian/control.in b/debian/control.in
index 4e7b205792f5f47a7bad8edbe5652957b0fbf01f..df265cbc6ec8a84d0d1229597eae95067466e8fa 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,7 +2,9 @@ Source: skytools3
 Section: database
 Priority: extra
 Maintainer: Dimitri Fontaine <dim@tapoueh.org>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, autoconf (>= 2.65), automake, libtool, libevent-dev, python-all-dev, python-support, python-psycopg2, xmlto, asciidoc, libpq-dev, postgresql-server-dev-all
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, autoconf (>= 2.65), automake, libtool, libevent-dev,
+  python-all-dev, python-support, python-psycopg2, xmlto, asciidoc, libpq-dev, postgresql-server-dev-all,
+  postgresql-server-dev-8.4 | postgresql-server-dev-9.0 | postgresql-server-dev-9.1 | postgresql-server-dev-9.2
 Standards-Version: 3.9.1
 Homepage: http://wiki.postgresql.org/wiki/Skytools
 Vcs-Git: http://github.com/markokr/skytools.git

diff --git a/debian/rules b/debian/rules
index 6596b38217f852a4fead7c4797d14c0e0c415a4c..626575da510b7a2932703f04d95b85a197780608 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -24,18 +24,24 @@ ORIG_EXCLUDE=--exclude-vcs --exclude=debian
 
 include /usr/share/postgresql-common/pgxs_debian_control.mk
 
-config.mak:
+debian/control-pgver-stamp: debian/control.in debian/pgversions
+       rm -f debian/control
+       $(MAKE) -f debian/rules debian/control
+       touch $@
+
+config.mak: debian/control-pgver-stamp
        #./autogen.sh
        ./configure --prefix=/usr --with-asciidoc --with-sk3-subdir
 
 override_dh_auto_configure: config.mak
 
-override_dh_auto_clean: config.mak debian/control
+override_dh_auto_clean: config.mak
        $(MAKE) -C doc realclean
        dh_auto_clean -- distclean
        for version in $$(pg_buildext supported-versions .) ; do \
                rm -rf debian/postgresql-$${version}-pgq3; \
        done
+       rm -f debian/control-pgver-stamp
 
 # upstream build system will build fine for one given PostgreSQL version,
 # then we build the PostgreSQL module and files for yet another version of