Updated packaging .. still need a datamapper package

4 files changed, 46 insertions, 59 deletions

diff --git a/debian/control b/debian/control
index 491aedf..70baca0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,36 +3,14 @@ Maintainer: Matthew Bloch <matthew@bytemark.co.uk>
 Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>
 Section: ruby
 Priority: optional
-Build-Depends: ruby | ruby-interpreter, debhelper, rdoc, txt2man, gem2deb, dh-systemd, ruby-setup 
+Build-Depends: ruby | ruby-interpreter, debhelper, rdoc, txt2man, dh-systemd, bundler
 Standards-Version: 3.9.1
-XS-Ruby-Versions: all
-
-Package: mauvealert-client
-Architecture: all
-Depends: ruby | ruby-interpreter,
-  mauvealert-common (>= 3.8.0),
-  ${misc:Depends}
-Recommends: liblocale-ruby1.8 | ruby-locale
-Description: Mauve network alert system -- client
- 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 confidently replace all scripts that might otherwise send floods of emails
- or text messages.
- .
- This is the client package.
 
 Package: mauvealert-server
 Architecture: all
 Pre-Depends: libjs-jquery
 Depends: mauvealert-common (>= 3.8.0),
  adduser,
- ruby-dm-core,
- ruby-dm-migrations,
- ruby-dm-sqlite-adapter,
- ruby-dm-types,
- ruby-dm-aggregates,
- ruby-dm-validations,
- ruby-dm-transactions,
  ruby-haml,
  ruby-haml-contrib,
  ruby-sanitize,
@@ -55,6 +33,20 @@ Description: Mauve network alert system -- server
  .
  This is the server package.
 
+Package: mauvealert-client
+Architecture: all
+Depends: ruby | ruby-interpreter,
+  mauvealert-common (>= 3.8.0),
+  ${misc:Depends}
+Recommends: liblocale-ruby1.8 | ruby-locale
+Description: Mauve network alert system -- client
+ 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 confidently replace all scripts that might otherwise send floods of emails
+ or text messages.
+ .
+ This is the client package.
+
 Package: mauvealert-common
 Architecture: all
 Depends: ruby | ruby-interpreter, ruby-protobuf, ${misc:Depends}
diff --git a/debian/mauvealert-server.docs b/debian/mauvealert-server.docs
index 20c256d..e84b576 100644
--- a/debian/mauvealert-server.docs
+++ b/debian/mauvealert-server.docs
@@ -1,6 +1,3 @@
 bytemark_example_alerts.sh
 bytemark_policy.txt
-CHANGELOG
 README
-TODO
-TODO-PJC
diff --git a/debian/mauvealert-server.install b/debian/mauvealert-server.install
index ca7eb5f..6d5dddf 100644
--- a/debian/mauvealert-server.install
+++ b/debian/mauvealert-server.install
@@ -1,37 +1,35 @@
 bin/mauveserver                      usr/sbin/
 bin/mauveconsole                     usr/sbin/
-lib/dm-sqlite-adapter-with-mutex.rb  usr/lib/ruby/1.8/
-lib/dm-validations-with-empty-errors-hack.rb  usr/lib/ruby/1.8/
-lib/mauve/alert.rb                   usr/lib/ruby/1.8/mauve/
-lib/mauve/alert_changed.rb           usr/lib/ruby/1.8/mauve/
-lib/mauve/alert_group.rb             usr/lib/ruby/1.8/mauve/
-lib/mauve/authentication.rb           usr/lib/ruby/1.8/mauve/
-lib/mauve/calendar_interface.rb      usr/lib/ruby/1.8/mauve/
-lib/mauve/configuration.rb           usr/lib/ruby/1.8/mauve/
-lib/mauve/configuration_builder.rb   usr/lib/ruby/1.8/mauve/
-lib/mauve/configuration_builders.rb  usr/lib/ruby/1.8/mauve/
-lib/mauve/configuration_builders     usr/lib/ruby/1.8/mauve/
-lib/mauve/datamapper.rb              usr/lib/ruby/1.8/mauve/
-lib/mauve/generic_http_api_client.rb usr/lib/ruby/1.8/mauve/
-lib/mauve/heartbeat.rb               usr/lib/ruby/1.8/mauve/
-lib/mauve/history.rb                 usr/lib/ruby/1.8/mauve/
-lib/mauve/http_server.rb             usr/lib/ruby/1.8/mauve/
-lib/mauve/mauve_thread.rb            usr/lib/ruby/1.8/mauve/
-lib/mauve/notification.rb            usr/lib/ruby/1.8/mauve/
-lib/mauve/notifier.rb                usr/lib/ruby/1.8/mauve/
-lib/mauve/notifiers                  usr/lib/ruby/1.8/mauve/
-lib/mauve/notifiers.rb               usr/lib/ruby/1.8/mauve/
-lib/mauve/people_list.rb             usr/lib/ruby/1.8/mauve/
-lib/mauve/person.rb                  usr/lib/ruby/1.8/mauve/
-lib/mauve/pop3_server.rb                  usr/lib/ruby/1.8/mauve/
-lib/mauve/processor.rb               usr/lib/ruby/1.8/mauve/
-lib/mauve/server.rb                  usr/lib/ruby/1.8/mauve/
-lib/mauve/source_list.rb             usr/lib/ruby/1.8/mauve/
-lib/mauve/udp_server.rb              usr/lib/ruby/1.8/mauve/
-lib/mauve/web_interface.rb           usr/lib/ruby/1.8/mauve/
-lib/object_builder.rb                usr/lib/ruby/1.8/
-lib/rack-flash.rb                    usr/lib/ruby/1.8/
-lib/sinatra-partials.rb              usr/lib/ruby/1.8/
+lib/dm-sqlite-adapter-with-mutex.rb  usr/lib/ruby/vendor_ruby/
+lib/dm-validations-with-empty-errors-hack.rb  usr/lib/ruby/vendor_ruby/
+lib/mauve/alert.rb                   usr/lib/ruby/vendor_ruby/mauve/
+lib/mauve/alert_changed.rb           usr/lib/ruby/vendor_ruby/mauve/
+lib/mauve/alert_group.rb             usr/lib/ruby/vendor_ruby/mauve/
+lib/mauve/authentication.rb           usr/lib/ruby/vendor_ruby/mauve/
+lib/mauve/calendar_interface.rb      usr/lib/ruby/vendor_ruby/mauve/
+lib/mauve/configuration.rb           usr/lib/ruby/vendor_ruby/mauve/
+lib/mauve/configuration_builder.rb   usr/lib/ruby/vendor_ruby/mauve/
+lib/mauve/configuration_builders.rb  usr/lib/ruby/vendor_ruby/mauve/
+lib/mauve/configuration_builders     usr/lib/ruby/vendor_ruby/mauve/
+lib/mauve/datamapper.rb              usr/lib/ruby/vendor_ruby/mauve/
+lib/mauve/generic_http_api_client.rb usr/lib/ruby/vendor_ruby/mauve/
+lib/mauve/heartbeat.rb               usr/lib/ruby/vendor_ruby/mauve/
+lib/mauve/history.rb                 usr/lib/ruby/vendor_ruby/mauve/
+lib/mauve/http_server.rb             usr/lib/ruby/vendor_ruby/mauve/
+lib/mauve/mauve_thread.rb            usr/lib/ruby/vendor_ruby/mauve/
+lib/mauve/notification.rb            usr/lib/ruby/vendor_ruby/mauve/
+lib/mauve/notifier.rb                usr/lib/ruby/vendor_ruby/mauve/
+lib/mauve/notifiers                  usr/lib/ruby/vendor_ruby/mauve/
+lib/mauve/notifiers.rb               usr/lib/ruby/vendor_ruby/mauve/
+lib/mauve/people_list.rb             usr/lib/ruby/vendor_ruby/mauve/
+lib/mauve/person.rb                  usr/lib/ruby/vendor_ruby/mauve/
+lib/mauve/processor.rb               usr/lib/ruby/vendor_ruby/mauve/
+lib/mauve/server.rb                  usr/lib/ruby/vendor_ruby/mauve/
+lib/mauve/source_list.rb             usr/lib/ruby/vendor_ruby/mauve/
+lib/mauve/udp_server.rb              usr/lib/ruby/vendor_ruby/mauve/
+lib/mauve/web_interface.rb           usr/lib/ruby/vendor_ruby/mauve/
+lib/object_builder.rb                usr/lib/ruby/vendor_ruby/
+lib/sinatra-partials.rb              usr/lib/ruby/vendor_ruby/
 static                               usr/share/mauvealert
 views                                usr/share/mauvealert
 etc/mauveserver.conf                 etc/mauvealert/
diff --git a/debian/rules b/debian/rules
index f938869..5289f9d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
   
 %:
-	dh $@ --buildsystem=ruby --with ruby --with systemd
+	dh $@ --with systemd