Merge pull request #3555 from jordansissel/patch-1

Update Ubuntu packaging script to use 'fpm -s empty' instead of 'mkdir empty && fpm -s dir -C empty'
Upstream-commit: cb314b9752352d9034466c3503058f22b79c345f
Component: engine

components/engine/hack/make/ubuntu

@@ -125,8 +125,7 @@ EOF
 		    --config-files /etc/default/docker \
 		    --deb-compression gz \
 		    -t deb .
-		mkdir empty
-		fpm -s dir -C empty \
+		fpm -s empty \
 		    --name lxc-docker --version $PKGVERSION \
 		    --architecture "$PACKAGE_ARCHITECTURE" \
 		    --depends lxc-docker-$VERSION \
@@ -135,7 +134,7 @@ EOF
 		    --url "$PACKAGE_URL" \
 		    --license "$PACKAGE_LICENSE" \
 		    --deb-compression gz \
-		    -t deb .
+		    -t deb
 	)
 }