diff options
| author | telyn <telyn@bytemark.co.uk> | 2018-01-30 10:19:59 +0000 |
|---|---|---|
| committer | telyn <telyn@bytemark.co.uk> | 2018-01-30 10:19:59 +0000 |
| commit | b37a469b817e55b06b8d6a22c1087506a2221c14 (patch) | |
| tree | 5c5f5510b389c31ee8686e07b451e22738d4c253 /debian | |
| parent | 0139aa17ab739365745c3447de5634b665391a77 (diff) | |
| parent | 9bdd63df6f71ea7322f3d65aa88a79cb17d74b9c (diff) | |
Merge branch 'develop' into gem
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index e4d42d3..b436c88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ mauvealert (3.16.0) UNRELEASED; urgency=medium * Make authentication work for AJAX requests (#22, !3) * Change 'Events' nav item to load day list instead of calendar (#18, !3) + [ Telyn Roat] + * Removed need for locale gem outside of tests. (github pr #3) + -- Patrick J Cherry <patrick@bytemark.co.uk> Mon, 01 Aug 2017 14:37:32 +0100 mauvealert (3.15.15-1) stable; urgency=medium diff --git a/debian/control b/debian/control index 5e913b3..41864f8 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,6 @@ Architecture: any Pre-Depends: libjs-jquery Depends: adduser, lsb-base, ruby | ruby-interpreter, ruby-bundler, ${shlibs:Depends}, ${misc:Depends} Suggests: mauvealert-client -Recommends: ruby-locale | liblocale-ruby1.8 Description: Mauve network alert system -- server Mauve is a network alert system for system and network administrators. You can use it to quickly set up ad-hoc monitoring for a variety of services, and to @@ -25,7 +24,6 @@ Description: Mauve network alert system -- server Package: mauvealert-client Architecture: all Depends: ruby | ruby-interpreter, ruby-protobuf, ${misc:Depends} -Recommends: liblocale-ruby1.8 | ruby-locale Replaces: mauvealert-common Conflicts: mauvealert-common Provides: mauvealert-common |