Merge in upstream changes

7 files changed, 9 insertions, 50 deletions

diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile
index 0bf3a2d8c6..9479feb001 100644
--- a/packaging/debs/Debian/Makefile
+++ b/packaging/debs/Debian/Makefile
@@ -21,7 +21,7 @@ package: clean
 	cp -r debian $(UNPACKED_DIR)
 	chmod a+x $(UNPACKED_DIR)/debian/rules
 	UNOFFICIAL_RELEASE=$(UNOFFICIAL_RELEASE) VERSION=$(VERSION) ./check-changelog.sh rabbitmq-server $(UNPACKED_DIR)
-	cd $(UNPACKED_DIR); debconf-updatepo; GNUPGHOME=$(GNUPG_PATH)/.gnupg dpkg-buildpackage -rfakeroot $(SIGNING)
+	cd $(UNPACKED_DIR); GNUPGHOME=$(GNUPG_PATH)/.gnupg dpkg-buildpackage -rfakeroot $(SIGNING)
 	rm -rf $(UNPACKED_DIR)
 
 clean:
diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog
index 07f5a8dd41..e8be8d8d8c 100644
--- a/packaging/debs/Debian/debian/changelog
+++ b/packaging/debs/Debian/debian/changelog
@@ -1,3 +1,9 @@
+rabbitmq-server (1.5.0-1) testing; urgency=low
+
+  * New Upstream Release
+
+ -- Matthias Radestock <matthias@lshift.net>  Wed, 17 Dec 2008 18:23:47 +0000
+
 rabbitmq-server (1.4.0-1) testing; urgency=low
 
   * New Upstream Release
diff --git a/packaging/debs/Debian/debian/config b/packaging/debs/Debian/debian/config
deleted file mode 100644
index 9020888aad..0000000000
--- a/packaging/debs/Debian/debian/config
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-if ! su rabbitmq -s /bin/sh -c /usr/lib/rabbitmq/bin/rabbitmq-mnesia-current ; then
-	db_beginblock
-	db_input high rabbitmq-server/mnesia-dir-note || true
-	db_input high rabbitmq-server/do-what-with-mnesia-dir || true
-	db_endblock
-	db_go
-
-	db_get rabbitmq-server/do-what-with-mnesia-dir
-	if [ "$RET" = "Deleted" ]; then
-		rm -r /var/lib/rabbitmq/mnesia/
-	elif [ "$RET" = "Moved" ]; then
-		db_input high rabbitmq-server/move-mnesia-dir-where || true
-		db_go
-
-		db_get rabbitmq-server/move-mnesia-dir-where
-
-		mkdir -p "`dirname $RET`"
-		mv /var/lib/rabbitmq/mnesia "$RET"
-	fi
-fi
diff --git a/packaging/debs/Debian/debian/control b/packaging/debs/Debian/debian/control
index d5d49f3fe9..b2b3ab0236 100644
--- a/packaging/debs/Debian/debian/control
+++ b/packaging/debs/Debian/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.8.0
 
 Package: rabbitmq-server
 Architecture: all
-Depends: erlang-nox, adduser, ${misc:Depends}
+Depends: erlang-nox, adduser, logrotate, ${misc:Depends}
 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
diff --git a/packaging/debs/Debian/debian/po/POTFILES.in b/packaging/debs/Debian/debian/po/POTFILES.in
deleted file mode 100644
index cef83a3407..0000000000
--- a/packaging/debs/Debian/debian/po/POTFILES.in
+++ /dev/null
@@ -1 +0,0 @@
-[type: gettext/rfc822deb] templates
diff --git a/packaging/debs/Debian/debian/postinst b/packaging/debs/Debian/debian/postinst
index d0575628fe..495b8331f0 100644
--- a/packaging/debs/Debian/debian/postinst
+++ b/packaging/debs/Debian/debian/postinst
@@ -26,7 +26,7 @@ fi
 # create rabbitmq user
 if ! getent passwd rabbitmq >/dev/null; then
         adduser --system --ingroup rabbitmq --home /var/lib/rabbitmq --no-create-home rabbitmq
-        usermod -c "Rabbit AMQP Messaging Server" rabbitmq
+        usermod -c "RabbitMQ messaging server" rabbitmq
 fi
 
 chown -R rabbitmq:rabbitmq /var/lib/rabbitmq
@@ -34,7 +34,6 @@ chown -R rabbitmq:rabbitmq /var/log/rabbitmq
 
 case "$1" in
     configure)
-        . /usr/share/debconf/confmodule
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/packaging/debs/Debian/debian/templates b/packaging/debs/Debian/debian/templates
deleted file mode 100644
index 2d5acc155e..0000000000
--- a/packaging/debs/Debian/debian/templates
+++ /dev/null
@@ -1,20 +0,0 @@
-Template: rabbitmq-server/mnesia-dir-note
-Type: note
-_Description: Schema changed
- The RabbitMQ database schema has changed. If your RabbitMQ database
- contains important data, such as user accounts, durable exchanges and
- queues, or persistent messages, then it is recommended to contact
- support@rabbitmq.com for assistance with the upgrade. If you want to
- experiment with the new version in the meantime, simply move the database
- directory to a safe place. In all other cases just remove the directory.
-
-Template: rabbitmq-server/do-what-with-mnesia-dir
-Type: select
-_Choices: Moved, Deleted, Kept (WILL BREAK)
-Default: Moved
-_Description: The old RabbitMQ database directory should be:
-
-Template: rabbitmq-server/move-mnesia-dir-where
-Type: string
-Default: /var/lib/rabbitmq/mnesia-old/
-_Description: Directory where the old RabbitMQ database should be moved: