debian/: cleanup and sync with other build changes

- remove hardwired 9.1
- dont touch anything under upgrade/
- configure: use --with-sk3-subdir
- install under /usr/share/skytools3 is done by setup_skytools.py

diff --git a/debian/control b/debian/control
index c5f79e02c7a18bb548ef3ee01f9a991e4fe8c7bc..16d7b25dcd41b78a08e3254a9af29894ae111cb6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -51,33 +51,3 @@ Description: Skype tools for PostgreSQL replication, londiste and PGQ
  is based on snapshot based event handling ideas from Slony-I, written for
  general usage.
 
-Package: postgresql-9.1-pgq3
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, postgresql-9.1
-Provides: skytools-modules
-Conflicts: skytools-modules-9.1
-Replaces: skytools-modules-9.1
-Description: Skype tools for PostgreSQL replication, londiste and PGQ
- This is the PGQ extension used by Skype replication, londiste. It consists
- of PL/pgsql, and C code in database.
-
-Package: postgresql-8.4-pgq3
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, postgresql-8.4
-Provides: skytools-modules
-Conflicts: skytools-modules-8.4
-Replaces: skytools-modules-8.4
-Description: Skype tools for PostgreSQL replication, londiste and PGQ
- This is the PGQ extension used by Skype replication, londiste. It consists
- of PL/pgsql, and C code in database.
-
-Package: postgresql-9.0-pgq3
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, postgresql-9.0
-Provides: skytools-modules
-Conflicts: skytools-modules-9.0
-Replaces: skytools-modules-9.0
-Description: Skype tools for PostgreSQL replication, londiste and PGQ
- This is the PGQ extension used by Skype replication, londiste. It consists
- of PL/pgsql, and C code in database.
-

diff --git a/debian/control.in b/debian/control.in
index 0cb76152b62b4920aa593a2cc09d6c9def053019..896e2a510e5dad55df0880a31c3524afa3ff1602 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -51,16 +51,6 @@ Description: Skype tools for PostgreSQL replication, londiste and PGQ
  is based on snapshot based event handling ideas from Slony-I, written for
  general usage.
 
-Package: postgresql-9.1-pgq3
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, postgresql-9.1
-Provides: skytools-modules
-Conflicts: skytools-modules-9.1
-Replaces: skytools-modules-9.1
-Description: Skype tools for PostgreSQL replication, londiste and PGQ
- This is the PGQ extension used by Skype replication, londiste. It consists
- of PL/pgsql, and C code in database.
-
 Package: postgresql-PGVERSION-pgq3
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, postgresql-PGVERSION

diff --git a/debian/pgversions b/debian/pgversions
index af97c101df9d42a3a4a1868edbd056f221300c20..80086582d4278684dabbba9f2dbd978434eb6b2e 100644 (file)
--- a/debian/pgversions
+++ b/debian/pgversions
@@ -1,4 +1,3 @@
-# don't list here 9.1, it's hard-coded in debian/rules (yes, I know)
-8.3
 8.4
 9.0
+9.1

diff --git a/debian/postgresql-8.4-pgq3.install b/debian/postgresql-8.4-pgq3.install
index 133586c84fe72cfed7011f68f380a39f17e724fa..dd505f37bc07018dad2b000667f186f72851458d 100644 (file)
--- a/debian/postgresql-8.4-pgq3.install
+++ b/debian/postgresql-8.4-pgq3.install
@@ -13,4 +13,3 @@ usr/share/postgresql/8.4/contrib/pgq.sql
 usr/share/postgresql/8.4/contrib/pgq_coop.sql
 usr/share/postgresql/8.4/contrib/londiste.upgrade.sql
 usr/share/postgresql/8.4/contrib/uninstall_pgq.sql
-pgq_core_upgrade_to_v3.0.sql usr/share/postgresql/8.4/contrib/

diff --git a/debian/postgresql-9.0-pgq3.install b/debian/postgresql-9.0-pgq3.install
index 529419c069499c92e5b9b4bf779fc61cd3949e44..00426ca14efbd608720376fd26611c214c18c7a9 100644 (file)
--- a/debian/postgresql-9.0-pgq3.install
+++ b/debian/postgresql-9.0-pgq3.install
@@ -13,4 +13,3 @@ usr/share/postgresql/9.0/contrib/pgq.sql
 usr/share/postgresql/9.0/contrib/pgq_coop.sql
 usr/share/postgresql/9.0/contrib/londiste.upgrade.sql
 usr/share/postgresql/9.0/contrib/uninstall_pgq.sql
-pgq_core_upgrade_to_v3.0.sql usr/share/postgresql/9.0/contrib/

diff --git a/debian/postgresql-9.1-pgq3.install b/debian/postgresql-9.1-pgq3.install
index c7ddf1022671e52ed07f82b3ad03edb40bd8131c..87b9cdc6d3f33c2e375cc3c20a38e3b4c4fb52c9 100644 (file)
--- a/debian/postgresql-9.1-pgq3.install
+++ b/debian/postgresql-9.1-pgq3.install
@@ -13,4 +13,3 @@ usr/share/postgresql/9.1/contrib/pgq.sql
 usr/share/postgresql/9.1/contrib/pgq_coop.sql
 usr/share/postgresql/9.1/contrib/londiste.upgrade.sql
 usr/share/postgresql/9.1/contrib/uninstall_pgq.sql
-pgq_core_upgrade_to_v3.0.sql usr/share/postgresql/9.1/contrib/

diff --git a/debian/rules b/debian/rules
index fbaf596df3a3eb5dcdd7d527ea707965e710623d..f95419190a1164546bf72569991218635b5fdba7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,6 @@ export DH_OPTIONS
 # The build system is averse to VPATH building, so we can't properly use
 # postgresql-server-dev-all
 SRCDIR      = $(CURDIR)
-PG_CONFIG_91=/usr/lib/postgresql/9.1/bin/pg_config
 PKGVERS     = $(shell dpkg-parsechangelog | awk -F '[:-]' '/^Version:/ { print substr($$2, 2) }')
 ORIG_EXCLUDE=--exclude-vcs --exclude=debian
 
@@ -27,30 +26,26 @@ include /usr/share/postgresql-common/pgxs_debian_control.mk
 
 config.mak:
        autoreconf -I lib/m4
-       ./configure --prefix=/usr --with-asciidoc
+       ./configure --prefix=/usr --with-asciidoc --with-sk3-subdir
 
 override_dh_auto_configure:
 
 override_dh_auto_clean: config.mak debian/control
-       make -C lib distclean
        make -C doc realclean
        dh_auto_clean -- distclean
-       rm -f upgrade/final/v3.0_pgq_core.sql
        for version in $$(pg_buildext supported-versions .) ; do \
-               rm -rf debian/postgresql-$$version-pgq3; \
+               rm -rf debian/postgresql-$${version}-pgq3; \
        done
 
 override_dh_auto_build: config.mak lib/build
-       dh_auto_build -- SQLDIR=/usr/share/skytools3 PG_CONFIG=$(PG_CONFIG_91)
-       make -C upgrade
+       dh_auto_build -- SQLDIR=/usr/share/skytools3
 
 # upstream build system will build fine for one given PostgreSQL version,
 # then we build the PostgreSQL module and files for yet another version of
 # it so that we have binary packages for postgresql-8.4-pgq3 and 9.0.
 override_dh_auto_install: 
        mkdir -p $(CURDIR)/debian/tmp
-       cp -a upgrade/final/v3.0_pgq_core.sql $(CURDIR)/debian/tmp/pgq_core_upgrade_to_v3.0.sql
-       dh_auto_install -- SQLDIR=/usr/share/skytools3 PG_CONFIG=$(PG_CONFIG_91)
+       dh_auto_install -- SQLDIR=/usr/share/skytools3
        # now care about any previous supported versions
        for version in $$(pg_buildext supported-versions .) ; do \
                echo "### Building for PostgreSQL $$version" && \
@@ -62,11 +57,9 @@ override_dh_auto_install:
                done; \
        done
 
-lib/build:
-       chmod +x lib/find_modules.sh
-
 orig: clean
        cd .. && tar czf skytools3_$(PKGVERS).orig.tar.gz $(ORIG_EXCLUDE) skytools
 
 %:
        dh $@
+

diff --git a/debian/skytools3-walmgr.docs b/debian/skytools3-walmgr.docs
index b3855e4f6b65702fc0290b38efc30c588921beea..917e0194b7267ef1c47888654ba1785bf2e9d3d3 100644 (file)
--- a/debian/skytools3-walmgr.docs
+++ b/debian/skytools3-walmgr.docs
@@ -1,3 +1,3 @@
-debian/tmp/usr/share/doc/skytools3/walmgr.html
+debian/tmp/usr/share/doc/skytools3/walmgr3.html
 debian/tmp/usr/share/doc/skytools3/conf/wal-master.ini
 debian/tmp/usr/share/doc/skytools3/conf/wal-slave.ini

diff --git a/debian/skytools3.docs b/debian/skytools3.docs
index 12deae945e70057fa5b37a272a4eae7b4d37b189..b5dc56224e5896ba5e144b8d7a6fb1287d7f9e56 100644 (file)
--- a/debian/skytools3.docs
+++ b/debian/skytools3.docs
@@ -1,9 +1,7 @@
-debian/tmp/usr/share/doc/skytools3/pgqadm.html
 debian/tmp/usr/share/doc/skytools3/scriptmgr.html
 debian/tmp/usr/share/doc/skytools3/skytools_upgrade.html
 debian/tmp/usr/share/doc/skytools3/qadmin.html
 debian/tmp/usr/share/doc/skytools3/skytools3.html
-debian/tmp/usr/share/doc/skytools3/londiste.html
-debian/tmp/usr/share/doc/skytools3/londiste.ref.html
 debian/tmp/usr/share/doc/skytools3/queue_splitter.html
 debian/tmp/usr/share/doc/skytools3/queue_mover.html
+debian/tmp/usr/share/doc/skytools3/londiste3.html

diff --git a/debian/skytools3.install b/debian/skytools3.install
index 1ab3eb45d1b1af0cb42878210f255456d1bb48af..6dd0067e9ebd117a3782cf950b1f333f33f80611 100644 (file)
--- a/debian/skytools3.install
+++ b/debian/skytools3.install
@@ -5,16 +5,4 @@ usr/bin/queue_mover3
 usr/bin/queue_splitter3
 debian/skytools.ini /etc
 usr/lib/python*/site-packages/skytools-3.0/londiste
-usr/share/postgresql/9.0/contrib/pgq.upgrade.sql        /usr/share/skytools3
-usr/share/postgresql/9.0/contrib/txid.sql                /usr/share/skytools3
-usr/share/postgresql/9.0/contrib/pgq_triggers.sql       /usr/share/skytools3
-usr/share/postgresql/9.0/contrib/pgq_lowlevel.sql       /usr/share/skytools3
-usr/share/postgresql/9.0/contrib/pgq_node.sql           /usr/share/skytools3
-usr/share/postgresql/9.0/contrib/pgq_coop.upgrade.sql    /usr/share/skytools3
-usr/share/postgresql/9.0/contrib/pgq_ext.sql            /usr/share/skytools3
-usr/share/postgresql/9.0/contrib/londiste.sql           /usr/share/skytools3
-usr/share/postgresql/9.0/contrib/pgq_node.upgrade.sql    /usr/share/skytools3
-usr/share/postgresql/9.0/contrib/pgq.sql                /usr/share/skytools3
-usr/share/postgresql/9.0/contrib/pgq_coop.sql           /usr/share/skytools3
-usr/share/postgresql/9.0/contrib/londiste.upgrade.sql    /usr/share/skytools3
-usr/share/postgresql/9.0/contrib/uninstall_pgq.sql       /usr/share/skytools3
+usr/share/skytools3

diff --git a/debian/skytools3.manpages b/debian/skytools3.manpages
index 210423ae7edaf2abbb846885fa452e00317731d1..a92296f5f8d92e61fbd5950b578ec99ba1cd7408 100644 (file)
--- a/debian/skytools3.manpages
+++ b/debian/skytools3.manpages
@@ -1,6 +1,5 @@
 debian/tmp/usr/share/man/man1/scriptmgr3.1
 debian/tmp/usr/share/man/man1/qadmin.1
-debian/tmp/usr/share/man/man1/pgqadm3.1
 debian/tmp/usr/share/man/man1/londiste3.1
 debian/tmp/usr/share/man/man1/queue_mover3.1
 debian/tmp/usr/share/man/man1/queue_splitter3.1