Merging default ⇨ bug 16653

7 files changed, 25 insertions, 20 deletions

diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index 4dd223086f..54d0c8f38b 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 Feb 15 2010 Matthew Sackman <matthew@lshift.net> 1.7.2-1
+- New Upstream Release
+
 * Fri Jan 22 2010 Matthew Sackman <matthew@lshift.net> 1.7.1-1
 - New Upstream Release
 
diff --git a/packaging/common/rabbitmq-asroot-script-wrapper b/packaging/common/rabbitmq-asroot-script-wrapper
index ee5947b66c..693a6f0b83 100644
--- a/packaging/common/rabbitmq-asroot-script-wrapper
+++ b/packaging/common/rabbitmq-asroot-script-wrapper
@@ -19,11 +19,11 @@
 ##   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
+##   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 ##   Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   Copyright (C) 2007-2009 Cohesive Financial Technologies
+##   Copyright (C) 2007-2010 Cohesive Financial Technologies
 ##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-##   (C) 2007-2009 Rabbit Technologies Ltd.
+##   (C) 2007-2010 Rabbit Technologies Ltd.
 ##
 ##   All Rights Reserved.
 ##
diff --git a/packaging/common/rabbitmq-script-wrapper b/packaging/common/rabbitmq-script-wrapper
index f66f8e59af..79096a4e92 100644
--- a/packaging/common/rabbitmq-script-wrapper
+++ b/packaging/common/rabbitmq-script-wrapper
@@ -19,11 +19,11 @@
 ##   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
+##   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 ##   Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   Copyright (C) 2007-2009 Cohesive Financial Technologies
+##   Copyright (C) 2007-2010 Cohesive Financial Technologies
 ##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-##   (C) 2007-2009 Rabbit Technologies Ltd.
+##   (C) 2007-2010 Rabbit Technologies Ltd.
 ##
 ##   All Rights Reserved.
 ##
diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog
index 796a301a29..63b50749e1 100644
--- a/packaging/debs/Debian/debian/changelog
+++ b/packaging/debs/Debian/debian/changelog
@@ -1,3 +1,9 @@
+rabbitmq-server (1.7.2-1) intrepid; urgency=low
+
+  * New Upstream Release
+
+ -- Matthew Sackman <matthew@lshift.net>  Mon, 15 Feb 2010 15:54:47 +0000
+
 rabbitmq-server (1.7.1-1) intrepid; urgency=low
 
   * New Upstream Release
diff --git a/packaging/debs/Debian/debian/copyright b/packaging/debs/Debian/debian/copyright
index 69867220f0..a569f31aaa 100755
--- a/packaging/debs/Debian/debian/copyright
+++ b/packaging/debs/Debian/debian/copyright
@@ -5,7 +5,7 @@ It was downloaded from http://www.rabbitmq.com/
 
 The file codegen/amqp-0.8.json is covered by the following terms:
 
-        "Copyright (C) 2008-2009 LShift Ltd, Cohesive Financial Technologies LLC,
+        "Copyright (C) 2008-2010 LShift Ltd, Cohesive Financial Technologies LLC,
         and Rabbit Technologies Ltd
         
         Permission is hereby granted, free of charge, to any person
@@ -39,11 +39,11 @@ Authors and Copyright are as described below:
      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
+     Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
      Ltd. Portions created by Cohesive Financial Technologies LLC are
-     Copyright (C) 2007-2009 Cohesive Financial Technologies
+     Copyright (C) 2007-2010 Cohesive Financial Technologies
      LLC. Portions created by Rabbit Technologies Ltd are Copyright
-     (C) 2007-2009 Rabbit Technologies Ltd.
+     (C) 2007-2010 Rabbit Technologies Ltd.
 
 
                           MOZILLA PUBLIC LICENSE
@@ -502,11 +502,11 @@ EXHIBIT A -Mozilla Public License.
      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
+     Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
      Ltd. Portions created by Cohesive Financial Technologies LLC are
-     Copyright (C) 2007-2009 Cohesive Financial Technologies
+     Copyright (C) 2007-2010 Cohesive Financial Technologies
      LLC. Portions created by Rabbit Technologies Ltd are Copyright
-     (C) 2007-2009 Rabbit Technologies Ltd.
+     (C) 2007-2010 Rabbit Technologies Ltd.
 
      All Rights Reserved.
 
@@ -524,7 +524,7 @@ EXHIBIT A -Mozilla Public License.
 If you have any questions regarding licensing, please contact us at 
 info@rabbitmq.com.
 
-The Debian packaging is (C) 2007-2009, Rabbit Technologies Ltd. <info@rabbitmq.com>
+The Debian packaging is (C) 2007-2010, Rabbit Technologies Ltd. <info@rabbitmq.com>
 and is licensed under the MPL 1.1, see above.
 
 
diff --git a/packaging/macports/Makefile b/packaging/macports/Makefile
index 4db305eb58..d5633955b9 100644
--- a/packaging/macports/Makefile
+++ b/packaging/macports/Makefile
@@ -35,13 +35,9 @@ macports: dirs $(DEST)/Portfile
 	for f in rabbitmq-asroot-script-wrapper rabbitmq-script-wrapper ; do \
 	  cp $(COMMON_DIR)/$$f $(DEST)/files ; \
 	done
-	sed -i -e 's|@SU_RABBITMQ_SH_C@|sudo -u rabbitmq -H /bin/sh -c|' \
+	sed -i -e 's|@SU_RABBITMQ_SH_C@|sudo -E -u rabbitmq -H /bin/sh -c|' \
 	    $(DEST)/files/rabbitmq-script-wrapper
 	cp patch-org.macports.rabbitmq-server.plist.diff $(DEST)/files
-
-# This target ssh's into the OSX host in order to finalize the
-# macports repo
-macports_index:
 	if [ -n "$(MACPORTS_USERHOST)" ] ; then \
 	  tar cf - -C $(MACPORTS_DIR) . | ssh $(SSH_OPTS) lshift@macrabbit ' \
 	    d="/tmp/mkportindex.$$$$" ; \
diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile
index f17fe77742..c9e818ac8b 100644
--- a/packaging/windows/Makefile
+++ b/packaging/windows/Makefile
@@ -22,7 +22,7 @@ dist:
 
 	mv $(SOURCE_DIR) $(TARGET_DIR)
 	pod2text --loose rabbitmq-service.pod $(TARGET_DIR)/readme-service.txt
-	unix2dos $(TARGET_DIR)/readme-service.txt
+	todos $(TARGET_DIR)/readme-service.txt
 	zip -r $(TARGET_ZIP).zip $(TARGET_DIR)
 	rm -rf $(TARGET_DIR)