Merge branch 'stable'

packaging/debs/Debian/Makefile

@@ -75,11 +75,21 @@ endif
 # Prepare the source directory: we extract the source archive and copy
 # the debian/ subdirectory.
 	xzcat "$(DEBIAN_ORIG_TARBALL)" | tar -xf -
-	rsync -a \
-		--exclude '.sw?' --exclude '.*.sw?' \
-		--exclude '.git*' \
-		--delete --delete-excluded \
-		debian/ "$(UNPACKED_DIR)/debian/"
+	cp -a debian "$(UNPACKED_DIR)/debian"
+ifeq ($(INSTALL_BUILD_DEPS),yes)
+# Install build dependencies. To help us, we use mk-build-deps(1) from
+# the devscripts package.
+#
+# We ignore errors from the first `dpkg -i` because the command will
+# fail: dependencies are missing and dpkg(8) doesn't install them.
+# That's why we have `apt-get install -f` following. To double-check
+# everything went fine, we have the second `dpkg -i`.
+	apt-get install -y --no-install-recommends devscripts equivs
+	mk-build-deps debian/control
+	-dpkg -i ./rabbitmq-server-build-deps_*_all.deb
+	apt-get install -y -f -V --no-install-recommends
+	dpkg -i ./rabbitmq-server-build-deps_*_all.deb
+endif
 # Possibly update debian/changelog (in the created source directory):
 #   - if it contains an entry for the specified version, do nothing;
 #   - otherwise, prepend a generated entry using "1" as the package

packaging/debs/Debian/debian/control

@@ -7,11 +7,11 @@ Uploaders: Michael Klishin <michael@rabbitmq.com>,
  Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com>
 Build-Depends: debhelper (>= 9),
  dh-systemd (>= 1.5),
- erlang-dev,
  python-simplejson,
  xmlto,
  xsltproc,
  erlang-nox (>= 1:18.3-1) | esl-erlang (>= 1:18.3),
+ erlang-src (>= 1:18.3-1) | esl-erlang (>= 1:18.3),
  zip,
  rsync
 Standards-Version: 3.9.4