Skip to content
This repository has been archived by the owner on Dec 1, 2022. It is now read-only.

Commit

Permalink
Normalize building 9.6 packages
Browse files Browse the repository at this point in the history
Previously in af8b090 and 55eae4b there was some thrashing done to be
able to build packages for a postgres server version that was not served
by postgres-server-dev-all package.

This commit removes that thrashing and updates the required
postgres-server-dev-all package version to latest, which allows building
of extensions for 9.6 without gymnastics.
  • Loading branch information
gregburek authored and petergeoghegan committed Oct 13, 2016
1 parent af8b090 commit e52b85d
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 8 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
Expand Up @@ -7,10 +7,9 @@ env:
- DIST=trusty
before_install:
- sudo apt-get -y install wget software-properties-common
- 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 add-apt-repository -y "deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main" && 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
- echo '9.4\n9.5\n9.6' > ~/.pg_supported_versions
- sudo apt-get -y --force-yes install debhelper devscripts postgresql-server-dev-all
before_script:
- make clean
script:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -6,7 +6,7 @@ Author: Peter Geoghegan [`<pg@bowt.ie>`](mailto:pg@bowt.ie)

License: <a href="https://opensource.org/licenses/postgresql">PostgreSQL license</a>

Minimum supported version: PostgreSQL 9.4
Supported versions: PostgreSQL 9.4, PostgreSQL 9.5, PostgreSQL 9.6

## Overview

Expand Down Expand Up @@ -45,7 +45,7 @@ operator class support functions.

`amcheck` is proposed as a contrib extension for PostgreSQL 10, scheduled for
release in 2017. This externally maintained version of the extension exists to
target earlier versions of PostgreSQL (PostgreSQL 9.4+).
target earlier versions of PostgreSQL (PostgreSQL 9.4 - PostgreSQL 9.6).

### Bugs

Expand Down
2 changes: 1 addition & 1 deletion debian/control
@@ -1,7 +1,7 @@
Source: amcheck
Priority: extra
Maintainer: Peter Geoghegan <pg@bowt.ie>
Build-Depends: debhelper (>= 9), postgresql-server-dev-all (>= 171~), postgresql-server-dev-9.6
Build-Depends: debhelper (>= 9), postgresql-server-dev-all (>= 171~)
Standards-Version: 3.9.6
Section: database
Homepage: https://github.com/petergeoghegan/amcheck
Expand Down
2 changes: 1 addition & 1 deletion debian/tests/control
@@ -1,3 +1,3 @@
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
Depends: @, postgresql-server-dev-all, postgresql-contrib-9.4, postgresql-contrib-9.5, postgresql-contrib-9.6
Tests: installcheck
Restrictions: allow-stderr
2 changes: 1 addition & 1 deletion debian/tests/control.in
@@ -1,3 +1,3 @@
Depends: @, postgresql-server-dev-PGVERSION, postgresql-contrib-PGVERSION
Depends: @, postgresql-server-dev-all, postgresql-contrib-PGVERSION
Tests: installcheck
Restrictions: allow-stderr

0 comments on commit e52b85d

Please sign in to comment.