diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-08-21 09:24:46 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-08-21 09:24:46 +0100 |
| commit | a097b1e91076d7b13aa6790e59d25f60de912a97 (patch) | |
| tree | d941d8ae386749015cf7ae6d6390d60a3d0abb92 | |
| parent | a4d343096231d62e8d91a1b23ba9e1997e9136c0 (diff) | |
| parent | a6c28539b4ddaf2c6fd46b98c374f117168c41c0 (diff) | |
Merge branch 'add-lockfile-progs-to-packages' into rails-3-develop
| -rw-r--r-- | config/packages | 1 | ||||
| -rw-r--r-- | config/packages.debian-squeeze | 1 | ||||
| -rw-r--r-- | config/packages.debian-wheezy | 1 | ||||
| -rw-r--r-- | config/packages.ubuntu-precise | 1 |
4 files changed, 4 insertions, 0 deletions
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 |