Merge pull request #20054 from jfrazelle/fix-generation

fix deb generate

contrib/builder/deb/amd64/debian-wheezy/Dockerfile

@@ -5,7 +5,7 @@
 FROM debian:wheezy-backports
 
 RUN apt-get update && apt-get install -y -t wheezy-backports btrfs-tools --no-install-recommends && rm -rf /var/lib/apt/lists/*
-RUN apt-get update && apt-get install -y apparmor bash-completion  build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev  libsqlite3-dev pkg-config  --no-install-recommends && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y apparmor bash-completion  build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev  libsqlite3-dev pkg-config --no-install-recommends && rm -rf /var/lib/apt/lists/*
 
 ENV GO_VERSION 1.5.3
 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

contrib/builder/deb/amd64/generate.sh

@@ -99,7 +99,7 @@ for version in "${versions[@]}"; do
 	if [ "$suite" = 'wheezy' ]; then
 		# pull a couple packages from backports explicitly
 		# (build failures otherwise)
-		backportsPackages=( btrfs-tools libsystemd-journal-dev )
+		backportsPackages=( btrfs-tools )
 		for pkg in "${backportsPackages[@]}"; do
 			packages=( "${packages[@]/$pkg}" )
 		done