diff options
| author | Hubert Plociniczak <hubert@lshift.net> | 2008-09-10 12:39:27 +0100 |
|---|---|---|
| committer | Hubert Plociniczak <hubert@lshift.net> | 2008-09-10 12:39:27 +0100 |
| commit | ad944a79cd610d219248eb4586e30080a0ecf6ba (patch) | |
| tree | 4f548dae29a5b1f1d29ac6f4c529119dd2027b80 /packaging | |
| parent | d848d59f8ed468bee91bbc90ddaba992392a240b (diff) | |
| parent | 89dea897540cbdfb3250153ddb07eff9fa95bf7c (diff) | |
| download | rabbitmq-server-git-ad944a79cd610d219248eb4586e30080a0ecf6ba.tar.gz | |
merge default into bug19193
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 1 | ||||
| -rw-r--r-- | packaging/debs/Debian/Makefile | 2 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/copyright | 6 |
3 files changed, 5 insertions, 4 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index 765ccf9ba9..08694c096c 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -79,6 +79,7 @@ chown -R rabbitmq:rabbitmq /var/lib/rabbitmq chown -R rabbitmq:rabbitmq /var/log/rabbitmq /sbin/chkconfig --add %{name} +/sbin/service rabbitmq-server start %preun if [ $1 = 0 ]; then diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile index aeb958a7c3..dd74c31ea1 100644 --- a/packaging/debs/Debian/Makefile +++ b/packaging/debs/Debian/Makefile @@ -18,7 +18,7 @@ package: clean make -C ../.. check_tools tar -zxvf $(TARBALL_DIR)/$(TARBALL) cp -r debian $(UNPACKED_DIR) - chmod -R a+x $(UNPACKED_DIR)/debian + chmod a+x $(UNPACKED_DIR)/debian/rules UNOFFICIAL_RELEASE=$(UNOFFICIAL_RELEASE) VERSION=$(VERSION) ./check-changelog.sh rabbitmq-server $(UNPACKED_DIR) cd $(UNPACKED_DIR); GNUPGHOME=$(GNUPG_PATH)/.gnupg dpkg-buildpackage -rfakeroot $(SIGNING) rm -rf $(UNPACKED_DIR) diff --git a/packaging/debs/Debian/debian/copyright b/packaging/debs/Debian/debian/copyright index e16996e5db..9f9f8672bc 100644 --- a/packaging/debs/Debian/debian/copyright +++ b/packaging/debs/Debian/debian/copyright @@ -5,7 +5,7 @@ It was downloaded from http://www.rabbitmq.com/ Upstream Author: The RabbitMQ team <info@rabbitmq.com> -Copyright: 2006-2008 LShift Ltd. +Copyright: 2006-2008 Rabbit Technologies Ltd. License: The RabbitMQ server is licensed under the MPL. @@ -485,7 +485,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, Tony Garnock-Jones <tonyg@rabbitmq.com> and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. +The Debian packaging is (C) 2007-2008, Rabbit Technologies Ltd. <info@rabbitmq.com> +and is licensed under the MPL 1.1, see above. |
