Merge bug19200 into bug19193

3 files changed, 1 insertions, 3 deletions

diff --git a/packaging/debs/Debian/debian/control b/packaging/debs/Debian/debian/control
index 0696eca7cb..bc691bc7b6 100644
--- a/packaging/debs/Debian/debian/control
+++ b/packaging/debs/Debian/debian/control
@@ -12,4 +12,4 @@ Description: An AMQP server written in Erlang
  RabbitMQ is an implementation of AMQP, the emerging standard for high
  performance enterprise messaging. The RabbitMQ server is a robust and
  scalable implementation of an AMQP broker.
-  Homepage: http://www.rabbitmq.com/
+Homepage: http://www.rabbitmq.com/
diff --git a/packaging/debs/Debian/debian/dirs b/packaging/debs/Debian/debian/dirs
index 1b15b0c34f..74f8631437 100644
--- a/packaging/debs/Debian/debian/dirs
+++ b/packaging/debs/Debian/debian/dirs
@@ -1,7 +1,6 @@
 usr/lib/erlang/lib
 usr/sbin
 usr/share/man
-usr/share/linda/overrides
 var/lib/rabbitmq/mnesia
 var/log/rabbitmq
 etc/logrotate.d
diff --git a/packaging/debs/Debian/debian/rules b/packaging/debs/Debian/debian/rules
index 606bbfd1d1..39af711c13 100644
--- a/packaging/debs/Debian/debian/rules
+++ b/packaging/debs/Debian/debian/rules
@@ -17,4 +17,3 @@ install/rabbitmq-server::
 	cp debian/rabbitmq-server.logrotate $(DEB_DESTDIR)etc/logrotate.d/rabbitmq-server
 	cp $(DEB_DESTDIR)usr/share/man/man1/rabbitmqctl.1.gz $(DEB_DESTDIR)usr/share/man/man1/rabbitmqctl_real.1.gz
 	chmod a+x $(DEB_DESTDIR)usr/sbin/rabbitmqctl
-	echo "Tag: usr-lib-in-arch-all" > $(DEB_DESTDIR)usr/share/linda/overrides/rabbitmq-server