merge

4 files changed, 20 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index be8f647..dc1c59d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+mauvealert (3.2.1) stable; urgency=low
+
+  * Fixed up alert_group matching.
+
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Fri, 22 Jul 2011 16:28:52 +0100
+
+mauvealert (3.2.0) stable; urgency=low
+
+  * Re-organisation of config
+  * Added lots of tests.
+
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Fri, 22 Jul 2011 13:30:23 +0100
+
 mauvealert (3.1.6) stable; urgency=low
 
   * Added new heartbeat to remote mauve
diff --git a/debian/control b/debian/control
index 2b5020d..fdb7e0a 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.9.1
 Package: mauvealert-client
 Architecture: all
 Depends: ruby1.8,
-  mauvealert-common (>= 3.1.0),
+  mauvealert-common (>= 3.2.0),
   ${misc:Depends}
 Description: Mauve network alert system -- client
  Mauve is a network alert system for system and network administrators.  You
@@ -22,7 +22,7 @@ Description: Mauve network alert system -- client
 Package: mauvealert-server
 Architecture: all
 Pre-Depends: libjs-jquery
-Depends: mauvealert-common (>= 3.1.0),
+Depends: mauvealert-common (>= 3.2.0),
  adduser,
  ruby1.8 (>= 1.8.7),
  libhaml-ruby1.8 | haml,
diff --git a/debian/mauvealert-common.install b/debian/mauvealert-common.install
index b98b3cf..d928f1b 100644
--- a/debian/mauvealert-common.install
+++ b/debian/mauvealert-common.install
@@ -2,5 +2,5 @@ mauve.proto         usr/lib/mauvealert/
 lib/mauve/proto.rb  usr/lib/ruby/1.8/mauve/
 lib/mauve/mauve_time.rb  usr/lib/ruby/1.8/mauve/
 lib/mauve/version.rb  usr/lib/ruby/1.8/mauve/
-
+lib/mauve/mauve_resolv.rb usr/lib/ruby/1.8/mauve/
 
diff --git a/debian/mauvealert-server.install b/debian/mauvealert-server.install
index f5950da..bc3f0f8 100644
--- a/debian/mauvealert-server.install
+++ b/debian/mauvealert-server.install
@@ -7,7 +7,11 @@ lib/mauve/alert_group.rb             usr/lib/ruby/1.8/mauve/
 lib/mauve/auth_bytemark.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/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/