merge v1_5 into default

6 files changed, 37 insertions, 6 deletions

diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog
index 37b01dabb8..3be25f4836 100644
--- a/packaging/debs/Debian/debian/changelog
+++ b/packaging/debs/Debian/debian/changelog
@@ -1,3 +1,15 @@
+rabbitmq-server (1.5.3-1) hardy; urgency=low
+
+  * New Upstream Release
+
+ -- Tony Garnock-Jones <tonyg@lshift.net>  Tue, 24 Feb 2009 18:23:33 +0000
+
+rabbitmq-server (1.5.2-1) hardy; urgency=low
+
+  * New Upstream Release
+
+ -- Tony Garnock-Jones <tonyg@lshift.net>  Mon, 23 Feb 2009 16:03:38 +0000
+
 rabbitmq-server (1.5.1-1) hardy; urgency=low
 
   * New Upstream Release
diff --git a/packaging/debs/Debian/debian/copyright b/packaging/debs/Debian/debian/copyright
index f9a2b6515a..854db2900f 100644
--- a/packaging/debs/Debian/debian/copyright
+++ b/packaging/debs/Debian/debian/copyright
@@ -3,14 +3,26 @@ Wed,  3 Jan 2007 15:43:44 +0000.
 
 It was downloaded from http://www.rabbitmq.com/
 
-Upstream Author: The RabbitMQ team <info@rabbitmq.com>
+codegen/amqp-0.8.json is released under the MIT License and is
+Copyright (C) 2008-2009 LShift Ltd, Cohesive Financial Technologies
+LLC, and Rabbit Technologies Ltd.
 
-Copyright: 2006-2009 Rabbit Technologies Ltd.
+The rest of this package is licensed under the Mozilla Public License 1.1
+Authors and Copyright are as described below:
 
-License:
-The RabbitMQ server is licensed under the MPL.
+     The Initial Developers of the Original Code are LShift Ltd,
+     Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
 
+     Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
+     Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
+     are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
+     Technologies LLC, and Rabbit Technologies Ltd.
 
+     Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+     Ltd. Portions created by Cohesive Financial Technologies LLC are
+     Copyright (C) 2007-2009 Cohesive Financial Technologies
+     LLC. Portions created by Rabbit Technologies Ltd are Copyright
+     (C) 2007-2009 Rabbit Technologies Ltd.
 
 
                           MOZILLA PUBLIC LICENSE
diff --git a/packaging/debs/Debian/debian/dirs b/packaging/debs/Debian/debian/dirs
index 1a707bc191..625b7d41f5 100644
--- a/packaging/debs/Debian/debian/dirs
+++ b/packaging/debs/Debian/debian/dirs
@@ -5,4 +5,5 @@ usr/share/man
 var/lib/rabbitmq/mnesia
 var/log/rabbitmq
 etc/logrotate.d
+etc/rabbitmq
 
diff --git a/packaging/debs/Debian/debian/init.d b/packaging/debs/Debian/debian/init.d
index aff0ce4da9..ef66add5a5 100644
--- a/packaging/debs/Debian/debian/init.d
+++ b/packaging/debs/Debian/debian/init.d
@@ -79,7 +79,10 @@ status_rabbitmq() {
 
 rotate_logs_rabbitmq() {
     set +e
-    $DAEMON rotate_logs ${ROTATE_SUFFIX} 2>&1
+    $DAEMON rotate_logs ${ROTATE_SUFFIX}
+    if [ $? != 0 ] ; then
+        RETVAL=1
+    fi
     set -e
 }
 
diff --git a/packaging/debs/Debian/debian/postrm b/packaging/debs/Debian/debian/postrm
index 8d1e92a929..a999d95b29 100644
--- a/packaging/debs/Debian/debian/postrm
+++ b/packaging/debs/Debian/debian/postrm
@@ -31,6 +31,9 @@ case "$1" in
         if [ -d /var/run/rabbitmq ]; then
                 rm -r /var/run/rabbitmq
         fi
+        if [ -d /etc/rabbitmq ]; then
+                rm -r /etc/rabbitmq
+        fi
         if getent passwd rabbitmq >/dev/null; then
                 deluser rabbitmq
         fi
diff --git a/packaging/debs/Debian/debian/rabbitmq-server.logrotate b/packaging/debs/Debian/debian/rabbitmq-server.logrotate
index bfd6b8da0b..c786df77b2 100644
--- a/packaging/debs/Debian/debian/rabbitmq-server.logrotate
+++ b/packaging/debs/Debian/debian/rabbitmq-server.logrotate
@@ -7,6 +7,6 @@
         notifempty
         sharedscripts
         postrotate
-            /etc/init.d/rabbitmq-server rotate-logs
+            /etc/init.d/rabbitmq-server rotate-logs > /dev/null
         endscript
 }