From af8b090fdd313af0ce53844649395da80b335b8d Mon Sep 17 00:00:00 2001 From: Greg Burek Date: Mon, 12 Sep 2016 12:52:20 -0700 Subject: [PATCH] Repair 9.6 package (#4) --- .travis.yml | 6 +----- debian/control | 2 +- debian/tests/control | 2 +- debian/tests/control.in | 2 +- pgxs_debian_control.mk | 13 ------------- 5 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 pgxs_debian_control.mk diff --git a/.travis.yml b/.travis.yml index cca56d2..fd0e994 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,6 @@ language: cpp sudo: required dist: trusty env: - global: - - PG_SUPPORTED_VERSIONS="9.1\n9.2\n9.3\n9.4\n9.5\n9.6" - secure: adkro9qIBnG0Iilmn4QmcgpyPbYlJnF/KpLDKKbFu3NRcZNgaAiHDMa4MzSyWexFeW6BExYBYfdbgPm2vmGvfptM51TrBR2TbrCRVOlq+l6Iv0nc/eXfbnz4HDMHmc1l26HWd0/FAJkYZlvBCY2NMjL5rIXm3aJZn1JurfNxsNh4uC5ge4hcIeWn3K5HfR39tqyO1A5Y2Qqw4A3R5h6em4GdR4ZEVffAJFDkejcdx0h5aON+NGXXuhtVRYHp2IOpcf3RO1bdCpZXrxM+NpQbN6NsDAS7xZt4oIMd0Q/hBUHyVxqhRQpvDftbO4hm5kWXxf6ffoUETR9ebUe4rUZ1EUiEOa23/KHBFUzxuG7wCg/k5X1J50o6+5Kydkeef+qRqR6qMmezlwXyXhh2k/0Jj0rN4LqkNU49y/9bXhat/oVTE2R0xLH3BbNjK9HCGKLXMs1GJAiywZDkGZXiyHaRh14tbgXTKiJkkSKX5wEauxbBOkWIiCiShWx85JSUUjT6jH6xi8UshEa3Uhxhv4aWuH0Apv+f0nABdNkDRX+WL/8DYWYr6t4iLjoKe9PfGs/NGx9L0YPq6fOY1cMmr/h1hGPeMvyncxg6Lj+BR8Wix7TU1QEdDIgw4cKAKenwvSSa/BvDmIGNX7V91OI0OLD4UNu0hloPv1YYR+kb9noQqT0= matrix: - DIST=precise - DIST=trusty @@ -13,8 +10,7 @@ before_install: - sudo add-apt-repository -y "deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main 9.6" && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - - sudo apt-get update - sudo apt-get -y --force-yes install debhelper devscripts postgresql-server-dev-all postgresql-server-dev-9.6 - - sudo rm -f /usr/share/postgresql-common/pgxs_debian_control.mk - - sudo cp -f pgxs_debian_control.mk /usr/share/postgresql-common/pgxs_debian_control.mk + - echo '9.4\n9.5\n9.6' > ~/.pg_supported_versions before_script: - make clean script: diff --git a/debian/control b/debian/control index 4a97460..e376466 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: amcheck Priority: extra Maintainer: Peter Geoghegan -Build-Depends: debhelper (>= 9), postgresql-server-dev-all (>= 171~) +Build-Depends: debhelper (>= 9), postgresql-server-dev-all (>= 171~), postgresql-server-dev-9.6 Standards-Version: 3.9.6 Section: database Homepage: https://github.com/petergeoghegan/amcheck diff --git a/debian/tests/control b/debian/tests/control index e5a3ae5..f027396 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,3 +1,3 @@ -Depends: @, postgresql-server-dev-all, postgresql-contrib-9.4, postgresql-contrib-9.5, postgresql-contrib-9.6 +Depends: @, postgresql-server-dev-9.4, postgresql-server-dev-9.5, postgresql-server-dev-9.6, postgresql-contrib-9.4, postgresql-contrib-9.5, postgresql-contrib-9.6 Tests: installcheck Restrictions: allow-stderr diff --git a/debian/tests/control.in b/debian/tests/control.in index 6133138..0f99a6b 100644 --- a/debian/tests/control.in +++ b/debian/tests/control.in @@ -1,3 +1,3 @@ -Depends: @, postgresql-server-dev-all, postgresql-contrib-PGVERSION +Depends: @, postgresql-server-dev-PGVERSION, postgresql-contrib-PGVERSION Tests: installcheck Restrictions: allow-stderr diff --git a/pgxs_debian_control.mk b/pgxs_debian_control.mk deleted file mode 100644 index 7e6a1a8..0000000 --- a/pgxs_debian_control.mk +++ /dev/null @@ -1,13 +0,0 @@ -# -# produce a debian/control file from a debian/control.in -# -# In debian/rules, include /usr/share/postgresql-common/pgxs_debian_control.mk -# -# Author: Dimitri Fontaine -# -debian/control: debian/control.in debian/pgversions - pg_buildext checkcontrol || true - -# run check when clean is invoked -clean: debian/control -.PHONY: debian/control