Merged bug23866 into default

4 files changed, 6 insertions, 5 deletions

diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog
index 4390b7398b..8f52654475 100644
--- a/packaging/debs/Debian/debian/changelog
+++ b/packaging/debs/Debian/debian/changelog
@@ -1,3 +1,9 @@
+rabbitmq-server (2.6.1-1) natty; urgency=low
+
+  * New Upstream Release
+
+ -- Tim <tim@rabbitmq.com>  Fri, 09 Sep 2011 14:38:45 +0100
+
 rabbitmq-server (2.6.0-1) natty; urgency=low
 
   * New Upstream Release
diff --git a/packaging/debs/Debian/debian/dirs b/packaging/debs/Debian/debian/dirs
index 5cf167d5e6..625b7d41f5 100644
--- a/packaging/debs/Debian/debian/dirs
+++ b/packaging/debs/Debian/debian/dirs
@@ -4,7 +4,6 @@ usr/sbin
 usr/share/man
 var/lib/rabbitmq/mnesia
 var/log/rabbitmq
-var/run/rabbitmq
 etc/logrotate.d
 etc/rabbitmq
 
diff --git a/packaging/debs/Debian/debian/postinst b/packaging/debs/Debian/debian/postinst
index ca531f14c6..b11340ef8a 100644
--- a/packaging/debs/Debian/debian/postinst
+++ b/packaging/debs/Debian/debian/postinst
@@ -32,7 +32,6 @@ fi
 
 chown -R rabbitmq:rabbitmq /var/lib/rabbitmq
 chown -R rabbitmq:rabbitmq /var/log/rabbitmq
-chown -R rabbitmq:rabbitmq /var/run/rabbitmq
 
 case "$1" in
     configure)
diff --git a/packaging/debs/Debian/debian/postrm.in b/packaging/debs/Debian/debian/postrm.in
index c4aeeebe3d..baf081fc47 100644
--- a/packaging/debs/Debian/debian/postrm.in
+++ b/packaging/debs/Debian/debian/postrm.in
@@ -32,9 +32,6 @@ case "$1" in
         if [ -d /var/log/rabbitmq ]; then
                 rm -r /var/log/rabbitmq
         fi
-        if [ -d /var/run/rabbitmq ]; then
-                rm -r /var/run/rabbitmq
-        fi
         if [ -d /etc/rabbitmq ]; then
                 rm -r /etc/rabbitmq
         fi