summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2009-04-20 10:12:40 +0100
committerMatthias Radestock <matthias@lshift.net>2009-04-20 10:12:40 +0100
commitb3281d4f188dd2b4ef2809dd98adcbc820d3b23e (patch)
treeef71b21936238a77b689063c679a9be80b2b0eae /packaging
parent30316785078f18f69b213b2132861c53bd52d451 (diff)
parent6e3f3ff2fc645f92c81e92cd6c0db701f8ab6efd (diff)
downloadrabbitmq-server-git-b3281d4f188dd2b4ef2809dd98adcbc820d3b23e.tar.gz
merge v1_5 into default
Diffstat (limited to 'packaging')
-rw-r--r--packaging/RPMS/Fedora/rabbitmq-server.spec5
-rw-r--r--packaging/debs/Debian/debian/changelog6
2 files changed, 10 insertions, 1 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index 9a67a3410d..54c7def509 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -40,7 +40,7 @@ fi
%build
cp %{S:2} %{_rabbit_wrapper}
-sed 's|/usr/lib/|%{_libdir}/|' %{_rabbit_wrapper}
+sed -i 's|/usr/lib/|%{_libdir}/|' %{_rabbit_wrapper}
make %{?_smp_mflags}
%install
@@ -112,6 +112,9 @@ fi
rm -rf %{buildroot}
%changelog
+* Mon Apr 6 2009 Matthias Radestock <matthias@lshift.net> 1.5.4-1
+- Maintenance release for the 1.5.x series
+
* Tue Feb 24 2009 Tony Garnock-Jones <tonyg@lshift.net> 1.5.3-1
- Maintenance release for the 1.5.x series
diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog
index 3be25f4836..d1ccd3a0c2 100644
--- a/packaging/debs/Debian/debian/changelog
+++ b/packaging/debs/Debian/debian/changelog
@@ -1,3 +1,9 @@
+rabbitmq-server (1.5.4-1) hardy; urgency=low
+
+ * New Upstream Release
+
+ -- Matthias Radestock <matthias@lshift.net> Mon, 06 Apr 2009 09:19:32 +0100
+
rabbitmq-server (1.5.3-1) hardy; urgency=low
* New Upstream Release