Merge pull request #13038 from tianon/fix-build-deb

Fix build-deb

hack/make/.build-deb/rules

@@ -21,8 +21,8 @@ override_dh_strip:
 override_dh_auto_install:
 	mkdir -p debian/docker-engine/usr/bin
 	cp -aT "$$(readlink -f bundles/$(VERSION)/dynbinary/docker)" debian/docker-engine/usr/bin/docker
-	mkdir -p debian/docker-engine/usr/libexec/docker
-	cp -aT "$$(readlink -f bundles/$(VERSION)/dynbinary/dockerinit)" debian/docker-engine/usr/libexec/docker/dockerinit
+	mkdir -p debian/docker-engine/usr/lib/docker
+	cp -aT "$$(readlink -f bundles/$(VERSION)/dynbinary/dockerinit)" debian/docker-engine/usr/lib/docker/dockerinit
 
 override_dh_installinit:
 	# use "docker" as our service name, not "docker-engine"

hack/make/build-deb

@@ -9,7 +9,7 @@ DEST=$1
 
 	# TODO consider using frozen images for the dockercore/builder-deb tags
 
-	debVersion="${VERSION//-/'~'}"
+	debVersion="${VERSION//-/~}"
 	# if we have a "-dev" suffix or have change in Git, let's make this package version more complex so it works better
 	if [[ "$VERSION" == *-dev ]] || [ -n "$(git status --porcelain)" ]; then
 		gitUnix="$(git log -1 --pretty='%at')"