From 68e509cbef97f5717c6d4e3aad5d93c589f6cdf1 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@mysociety.org>
Date: Fri, 8 Aug 2014 17:22:30 +0100
Subject: Debian specific fixes

- Add wheezy repo to get bundler package which is
  unavailable in squeeze repo
- Get bundler from wheezy repo and de-prioritise all other
  wheezy packages
---
 script/site-specific-install.sh | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'script/site-specific-install.sh')

diff --git a/script/site-specific-install.sh b/script/site-specific-install.sh
index 4c8c99aa2..4b707d0dc 100755
--- a/script/site-specific-install.sh
+++ b/script/site-specific-install.sh
@@ -30,6 +30,28 @@ misuse() {
 [ -z "$DEVELOPMENT_INSTALL" ] && misuse DEVELOPMENT_INSTALL
 [ -z "$BIN_DIRECTORY" ] && misuse BIN_DIRECTORY
 
+# Debian Squeeze Fixes
+if [ x"$DISTRIBUTION" = x"debian" ] && [ x"$DISTVERSION" = x"squeeze" ]
+then
+  # Add wheezy repo to get bundler
+  cat > /etc/apt/sources.list.d/debian-wheezy.list <<EOF
+deb http://the.earth.li/debian/ wheezy main contrib non-free
+EOF
+
+  # Get bundler from wheezy repo and de-prioritise all other
+  # wheezy packages
+  cat >> /etc/apt/preferences <<EOF
+
+Package: bundler
+Pin: release n=wheezy
+Pin-Priority: 990
+
+Package: *
+Pin: release n=wheezy
+Pin-Priority: 50
+EOF
+fi
+
 update_mysociety_apt_sources
 
 if [ ! "$DEVELOPMENT_INSTALL" = true ]; then
-- 
cgit v1.2.3


From d0df86d597ec95e7b6b7e32af0932563c4c1406f Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@mysociety.org>
Date: Wed, 13 Aug 2014 10:00:45 +0100
Subject: Precise specific fixes

- Get bundler and pdftk from raring repo and de-prioritise all other
  raring packages
---
 script/site-specific-install.sh | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'script/site-specific-install.sh')

diff --git a/script/site-specific-install.sh b/script/site-specific-install.sh
index 4b707d0dc..92809cf85 100755
--- a/script/site-specific-install.sh
+++ b/script/site-specific-install.sh
@@ -30,6 +30,8 @@ misuse() {
 [ -z "$DEVELOPMENT_INSTALL" ] && misuse DEVELOPMENT_INSTALL
 [ -z "$BIN_DIRECTORY" ] && misuse BIN_DIRECTORY
 
+update_mysociety_apt_sources
+
 # Debian Squeeze Fixes
 if [ x"$DISTRIBUTION" = x"debian" ] && [ x"$DISTVERSION" = x"squeeze" ]
 then
@@ -50,9 +52,39 @@ Package: *
 Pin: release n=wheezy
 Pin-Priority: 50
 EOF
+
+apt-get -qq update
 fi
 
-update_mysociety_apt_sources
+# Ubuntu Precise Fixes
+if [ x"$DISTRIBUTION" = x"ubuntu" ] && [ x"$DISTVERSION" = x"precise" ]
+then
+  cat > /etc/apt/sources.list.d/ubuntu-trusty.list <<EOF
+deb http://archive.ubuntu.com/ubuntu/ trusty universe
+deb-src http://archive.ubuntu.com/ubuntu/ trusty universe
+EOF
+
+  # Get bundler and pdftk from raring and de-prioritise all other
+  # raring packages
+  cat >> /etc/apt/preferences <<EOF
+
+Package: ruby-bundler
+Pin: release n=trusty
+Pin-Priority: 990
+
+Package: pdftk
+Pin: release n=squeeze
+Pin-Priority: 990
+
+Package: *
+Pin: release n=trusty
+Pin-Priority: 50
+EOF
+
+apt-get -qq update
+fi
+
+apt-get -y update
 
 if [ ! "$DEVELOPMENT_INSTALL" = true ]; then
     install_nginx
-- 
cgit v1.2.3


From f81cb5161f91eb40af88e7f5a1871a10e632cdf2 Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Fri, 15 Aug 2014 15:53:40 +0100
Subject: Use our own Launchpad Ubuntu repo to get pdftk

---
 script/site-specific-install.sh | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'script/site-specific-install.sh')

diff --git a/script/site-specific-install.sh b/script/site-specific-install.sh
index 92809cf85..c113b6efb 100755
--- a/script/site-specific-install.sh
+++ b/script/site-specific-install.sh
@@ -64,23 +64,28 @@ deb http://archive.ubuntu.com/ubuntu/ trusty universe
 deb-src http://archive.ubuntu.com/ubuntu/ trusty universe
 EOF
 
-  # Get bundler and pdftk from raring and de-prioritise all other
-  # raring packages
+  cat > /etc/apt/sources.list.d/mysociety-launchpad.list <<EOF
+deb http://ppa.launchpad.net/mysociety/alaveteli/ubuntu precise main
+deb-src http://ppa.launchpad.net/mysociety/alaveteli/ubuntu precise main
+EOF
+
+  # Get bundler from trusty and de-prioritise all other
+  # trusty packages
   cat >> /etc/apt/preferences <<EOF
 
 Package: ruby-bundler
 Pin: release n=trusty
 Pin-Priority: 990
 
-Package: pdftk
-Pin: release n=squeeze
-Pin-Priority: 990
-
 Package: *
 Pin: release n=trusty
 Pin-Priority: 50
 EOF
 
+# Get the key for the mysociety ubuntu alaveteli repo
+apt-get install python-software-properties
+add-apt-repository -y ppa:mysociety/alaveteli
+
 apt-get -qq update
 fi
 
-- 
cgit v1.2.3


From f0679b4321f6d1eb3aaca3412d73edde22ce667c Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@mysociety.org>
Date: Mon, 18 Aug 2014 13:27:32 +0100
Subject: Add -y option to install python-software-properties

---
 script/site-specific-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'script/site-specific-install.sh')

diff --git a/script/site-specific-install.sh b/script/site-specific-install.sh
index c113b6efb..5c3fb2339 100755
--- a/script/site-specific-install.sh
+++ b/script/site-specific-install.sh
@@ -83,7 +83,7 @@ Pin-Priority: 50
 EOF
 
 # Get the key for the mysociety ubuntu alaveteli repo
-apt-get install python-software-properties
+apt-get install -y python-software-properties
 add-apt-repository -y ppa:mysociety/alaveteli
 
 apt-get -qq update
-- 
cgit v1.2.3