aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile.lock2
-rw-r--r--config/nginx-ssl.conf.example (renamed from config/nginx-ssl.conf-example)0
-rw-r--r--config/packages1
-rw-r--r--config/packages.debian-squeeze1
-rw-r--r--config/packages.debian-wheezy1
-rw-r--r--config/packages.ubuntu-precise1
6 files changed, 5 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 688f2f2c7..682bacf8c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -154,7 +154,7 @@ GEM
net-ssh (2.6.7)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
- newrelic_rpm (3.8.0.218)
+ newrelic_rpm (3.9.1.236)
nokogiri (1.5.9)
paper_trail (2.7.2)
activerecord (~> 3.0)
diff --git a/config/nginx-ssl.conf-example b/config/nginx-ssl.conf.example
index c623c8e96..c623c8e96 100644
--- a/config/nginx-ssl.conf-example
+++ b/config/nginx-ssl.conf.example
diff --git a/config/packages b/config/packages
index e11fa1d52..a6eeb8079 100644
--- a/config/packages
+++ b/config/packages
@@ -18,6 +18,7 @@ libsqlite3-dev
libxml2-dev
libxslt-dev
links
+lockfile-progs
memcached
mutt
pdftk (>> 1.41+dfsg-1) | pdftk (<< 1.41+dfsg-1) # that version has a non-functionining uncompress option
diff --git a/config/packages.debian-squeeze b/config/packages.debian-squeeze
index 52bdbc376..c34abefde 100644
--- a/config/packages.debian-squeeze
+++ b/config/packages.debian-squeeze
@@ -15,6 +15,7 @@ libsqlite3-dev
libxml2-dev
libxslt-dev
links
+lockfile-progs
mutt
pdftk
php5-cli
diff --git a/config/packages.debian-wheezy b/config/packages.debian-wheezy
index 381e25daa..4129aa930 100644
--- a/config/packages.debian-wheezy
+++ b/config/packages.debian-wheezy
@@ -13,6 +13,7 @@ libsqlite3-dev
libxml2-dev
libxslt-dev
links
+lockfile-progs
mutt
pdftk
php5-cli
diff --git a/config/packages.ubuntu-precise b/config/packages.ubuntu-precise
index 87b9591bf..d97579bc1 100644
--- a/config/packages.ubuntu-precise
+++ b/config/packages.ubuntu-precise
@@ -12,6 +12,7 @@ libsqlite3-dev
libxml2-dev
libxslt1-dev
links
+lockfile-progs
mutt
pdftk
poppler-utils