From 081e813bb87d4b75457620a6c4cdc8dde7fc5beb Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 31 May 2016 13:20:56 +0100
Subject: Consolidate packages files.

Have a generic package install file that works on Debian wheezy and
jessie, and Ubuntu precise, trusty and xenial. Drop Debian squeeze.
---
 conf/packages                |  2 +-
 conf/packages.debian-squeeze | 14 --------------
 conf/packages.debian-wheezy  | 14 --------------
 conf/packages.generic        | 14 ++++++++++++++
 conf/packages.ubuntu-precise | 14 --------------
 5 files changed, 15 insertions(+), 43 deletions(-)
 delete mode 100644 conf/packages.debian-squeeze
 delete mode 100644 conf/packages.debian-wheezy
 create mode 100644 conf/packages.generic
 delete mode 100644 conf/packages.ubuntu-precise

diff --git a/conf/packages b/conf/packages
index bd5ec0785..75794ee87 100644
--- a/conf/packages
+++ b/conf/packages
@@ -12,7 +12,7 @@ perl
 perlmagick
 libmath-bigint-gmp-perl
 gettext
-postgresql-server-dev-9.1 | postgresql-server-dev-8.4
+postgresql-server-dev-all
 gnuplot
 ttf-bitstream-vera
 libexpat1-dev
diff --git a/conf/packages.debian-squeeze b/conf/packages.debian-squeeze
deleted file mode 100644
index 4f820ed01..000000000
--- a/conf/packages.debian-squeeze
+++ /dev/null
@@ -1,14 +0,0 @@
-make
-g++
-jhead
-liblocale-gettext-perl
-memcached
-perl
-perlmagick
-libmath-bigint-gmp-perl
-gettext
-postgresql
-postgresql-server-dev-8.4
-gnuplot
-ttf-bitstream-vera
-libexpat1-dev
diff --git a/conf/packages.debian-wheezy b/conf/packages.debian-wheezy
deleted file mode 100644
index a0cd9fa16..000000000
--- a/conf/packages.debian-wheezy
+++ /dev/null
@@ -1,14 +0,0 @@
-make
-g++
-jhead
-liblocale-gettext-perl
-memcached
-perl
-perlmagick
-libmath-bigint-gmp-perl
-gettext
-postgresql
-postgresql-server-dev-all
-gnuplot
-ttf-bitstream-vera
-libexpat1-dev
diff --git a/conf/packages.generic b/conf/packages.generic
new file mode 100644
index 000000000..a0cd9fa16
--- /dev/null
+++ b/conf/packages.generic
@@ -0,0 +1,14 @@
+make
+g++
+jhead
+liblocale-gettext-perl
+memcached
+perl
+perlmagick
+libmath-bigint-gmp-perl
+gettext
+postgresql
+postgresql-server-dev-all
+gnuplot
+ttf-bitstream-vera
+libexpat1-dev
diff --git a/conf/packages.ubuntu-precise b/conf/packages.ubuntu-precise
deleted file mode 100644
index a0cd9fa16..000000000
--- a/conf/packages.ubuntu-precise
+++ /dev/null
@@ -1,14 +0,0 @@
-make
-g++
-jhead
-liblocale-gettext-perl
-memcached
-perl
-perlmagick
-libmath-bigint-gmp-perl
-gettext
-postgresql
-postgresql-server-dev-all
-gnuplot
-ttf-bitstream-vera
-libexpat1-dev
-- 
cgit v1.2.3