From ce399f3203cbd7f5834fb5fb93d36576adb85834 Mon Sep 17 00:00:00 2001
From: Patrick J Cherry <patrick@bytemark.co.uk>
Date: Thu, 22 Jun 2017 14:20:04 +0100
Subject: Update gitlab-ci and debian control to use gems

---
 .gitlab-ci.yml |  2 +-
 debian/control | 15 +--------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f6ce09..1cde8d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ test:jessie: &test
   before_script:
     - apt install libpq-dev postgresql-server-dev-9.4
   script:
-    - apt install libsqlite3-dev rake ruby-log4r ruby-ipaddress ruby-json ruby-sanitize ruby-rubymail thin ruby-haml ruby-haml-contrib ruby-redcloth ruby-rack ruby-rack-protection ruby-rack-flash3 ruby-tilt ruby-sinatra ruby-locale ruby-rack-test ruby-webmock ruby-timecop ruby-test-unit
+    - apt install libsqlite3-dev
     - bundle install -j $(nproc) --path vendor/bundle --without development
     - "POSTGRES_URL=postgres://$POSTGRES_USER:$POSTGRES_PASSWORD@postgres/$POSTGRES_DB bundle exec rake test"
 
diff --git a/debian/control b/debian/control
index 70baca0..5ce74d8 100644
--- a/debian/control
+++ b/debian/control
@@ -9,20 +9,7 @@ Standards-Version: 3.9.1
 Package: mauvealert-server
 Architecture: all
 Pre-Depends: libjs-jquery
-Depends: mauvealert-common (>= 3.8.0),
- adduser,
- ruby-haml,
- ruby-haml-contrib,
- ruby-sanitize,
- ruby-sinatra,
- ruby-ipaddress,
- ruby-log4r,
- ruby-redcloth,
- ruby-rubymail,
- ruby-thin,
- lsb-base,
- ruby | ruby-interpreter,
- ${misc:Depends}
+Depends: adduser, lsb-base, ruby | ruby-interpreter, ${misc:Depends}
 Suggests: mauvealert-client
 Recommends: ruby-locale | liblocale-ruby1.8
 Description: Mauve network alert system -- server
-- 
cgit v1.2.1