aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2014-07-14 14:21:08 +0100
committerMatthew Somerville <matthew@mysociety.org>2014-07-14 18:16:38 +0100
commit01c6fe20b2111c76853f2bdcf8d376ae2c78b411 (patch)
tree647a0a325c732abd8bbf247845b858f9730c63a2 /conf
parentbdd96e587c7976fdfa3a410e4899dfd5861ddd36 (diff)
Update packages list to install correctly on wheezy.
Make mySociety-internal file separate to keep its dual use.
Diffstat (limited to 'conf')
-rw-r--r--[l---------]conf/packages20
-rw-r--r--conf/packages.debian-squeeze+testing16
-rw-r--r--conf/packages.debian-wheezy3
3 files changed, 21 insertions, 18 deletions
diff --git a/conf/packages b/conf/packages
index 123595395..5edbe96fe 120000..100644
--- a/conf/packages
+++ b/conf/packages
@@ -1 +1,19 @@
-packages.debian-wheezy \ No newline at end of file
+# Please note that this package list currently forms part of the
+# mySociety deployment infrastructure -- please discuss on the
+# mailing list if you want to change it.
+
+make
+jhead
+liberror-perl
+liblocale-gettext-perl
+libsoap-lite-perl
+memcached
+perl
+perlmagick
+libmath-bigint-gmp-perl
+gettext
+ruby-compass
+postgresql-server-dev-9.1 | postgresql-server-dev-8.4
+gnuplot
+ttf-bitstream-vera
+libexpat1-dev
diff --git a/conf/packages.debian-squeeze+testing b/conf/packages.debian-squeeze+testing
deleted file mode 100644
index 4b3872c18..000000000
--- a/conf/packages.debian-squeeze+testing
+++ /dev/null
@@ -1,16 +0,0 @@
-make
-jhead
-liberror-perl
-liblocale-gettext-perl
-libsoap-lite-perl
-memcached
-perl
-perlmagick
-libmath-bigint-gmp-perl
-gettext
-ruby-compass
-postgresql-8.4
-postgresql-server-dev-8.4
-gnuplot
-ttf-bitstream-vera
-libexpat1-dev
diff --git a/conf/packages.debian-wheezy b/conf/packages.debian-wheezy
index 618d3be43..d925dfcad 100644
--- a/conf/packages.debian-wheezy
+++ b/conf/packages.debian-wheezy
@@ -9,7 +9,8 @@ perlmagick
libmath-bigint-gmp-perl
gettext
ruby-compass
-postgresql-server-dev-9.1 | postgresql-server-dev-8.4
+postgresql
+postgresql-server-dev-9.1
gnuplot
ttf-bitstream-vera
libexpat1-dev