Merged v1_5_1 into default

7 files changed, 30 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index fede89e186..83223667dc 100644
--- a/Makefile
+++ b/Makefile
@@ -127,10 +127,15 @@ srcdist: distclean
 	cp INSTALL.in $(TARGET_SRC_DIR)/INSTALL
 	elinks -dump -no-references -no-numbering $(WEB_URL)install.html \
 		>> $(TARGET_SRC_DIR)/INSTALL
-	cp BUILD.in $(TARGET_SRC_DIR)/BUILD
+	cp README.in $(TARGET_SRC_DIR)/README
 	elinks -dump -no-references -no-numbering $(WEB_URL)build-server.html \
+<<<<<<< local
 		>> $(TARGET_SRC_DIR)/BUILD
 	sed -i 's/%%VERSION%%/$(VERSION)/' $(TARGET_SRC_DIR)/ebin/rabbit_app.in
+=======
+		>> $(TARGET_SRC_DIR)/README
+	sed -i 's/%%VERSION%%/$(VERSION)/' $(TARGET_SRC_DIR)/ebin/rabbit.app
+>>>>>>> other
 
 	cp -r $(AMQP_CODEGEN_DIR)/* $(TARGET_SRC_DIR)/codegen/
 	cp codegen.py Makefile $(TARGET_SRC_DIR)
diff --git a/BUILD.in b/README.in
index 0e70d0e7b3..0e70d0e7b3 100644
--- a/BUILD.in
+++ b/README.in
diff --git a/docs/rabbitmqctl.1.pod b/docs/rabbitmqctl.1.pod
index 692c4dc540..fd8918cd9b 100644
--- a/docs/rabbitmqctl.1.pod
+++ b/docs/rabbitmqctl.1.pod
@@ -146,8 +146,8 @@ auto_delete
 arguments
     queue arguments
 
-pid
-    Erlang process identifier associated with the queue
+node
+    node on which the process associated with the queue resides
 
 messages_ready
     number of messages ready to be delivered to clients
@@ -157,6 +157,12 @@ messages_unacknowledged
 
 messages_uncommitted
     number of messages published in as yet uncommitted transactions
+<<<<<<< local
+=======
+
+messages
+    sum of ready, unacknowledged and uncommitted messages
+>>>>>>> other
 
 acks_uncommitted
     number of acknowledgements received in as yet uncommitted
@@ -212,8 +218,8 @@ list_connections [I<connectioninfoitem> ...]
 
 =over 4
 
-pid
-    Erlang process id associated with the connection
+node
+    node on which the process associated with the connection resides
 
 address
     server IP number
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index 241afd713c..fc109bdbcc 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -118,6 +118,9 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Mon Jan 19 2009 Ben Hood <0x6e6562@gmail.com> 1.5.1-1
+- Maintenance release for the 1.5.x series
+
 * Wed Dec 17 2008 Matthias Radestock <matthias@lshift.net> 1.5.0-1
 - New upstream release
 
diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog
index e8be8d8d8c..37b01dabb8 100644
--- a/packaging/debs/Debian/debian/changelog
+++ b/packaging/debs/Debian/debian/changelog
@@ -1,3 +1,9 @@
+rabbitmq-server (1.5.1-1) hardy; urgency=low
+
+  * New Upstream Release
+
+ -- Simon MacMullen <simon@lshift.net>  Mon, 19 Jan 2009 15:46:13 +0000
+
 rabbitmq-server (1.5.0-1) testing; urgency=low
 
   * New Upstream Release
diff --git a/packaging/debs/Debian/debian/watch b/packaging/debs/Debian/debian/watch
new file mode 100644
index 0000000000..b41aff9aed
--- /dev/null
+++ b/packaging/debs/Debian/debian/watch
@@ -0,0 +1,4 @@
+version=3
+
+http://www.rabbitmq.com/releases/rabbitmq-server/v(.*)/rabbitmq-server-(\d.*)\.tar\.gz \
+	debian uupdate
diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile
index 9d16fd9fb3..59101cb2c6 100644
--- a/packaging/windows/Makefile
+++ b/packaging/windows/Makefile
@@ -15,7 +15,7 @@ dist:
 	mv $(SOURCE_DIR)/scripts/rabbitmq-multi.bat $(SOURCE_DIR)/sbin
 	rm -rf $(SOURCE_DIR)/scripts
 	rm -rf $(SOURCE_DIR)/codegen* $(SOURCE_DIR)/Makefile
-	rm -f $(SOURCE_DIR)/BUILD
+	rm -f $(SOURCE_DIR)/README
 	rm -rf $(SOURCE_DIR)/docs
 
 	mv $(SOURCE_DIR) $(TARGET_DIR)