From 867eed8f3586c81b32dc9f85208692e9e1c9909a Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Wed, 6 May 2015 17:39:10 -0600
Subject: [PATCH] Fix build-deb

This fixes the part of #12996 that I forgot. :angel:

This also fixes a minor path issue (there's no `libexec` in Debian), and fixes a minor bug with the `debVersion` parsing.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
---
 ...ker-core.bash-completion => docker-engine.bash-completion} | 0
 ...ocker-core.docker.default => docker-engine.docker.default} | 0
 .../{docker-core.docker.init => docker-engine.docker.init}    | 0
 ...ocker-core.docker.upstart => docker-engine.docker.upstart} | 0
 .../.build-deb/{docker-core.install => docker-engine.install} | 0
 .../{docker-core.manpages => docker-engine.manpages}          | 0
 .../{docker-core.postinst => docker-engine.postinst}          | 0
 hack/make/.build-deb/{docker-core.udev => docker-engine.udev} | 0
 hack/make/.build-deb/rules                                    | 4 ++--
 hack/make/build-deb                                           | 2 +-
 10 files changed, 3 insertions(+), 3 deletions(-)
 rename hack/make/.build-deb/{docker-core.bash-completion => docker-engine.bash-completion} (100%)
 rename hack/make/.build-deb/{docker-core.docker.default => docker-engine.docker.default} (100%)
 rename hack/make/.build-deb/{docker-core.docker.init => docker-engine.docker.init} (100%)
 rename hack/make/.build-deb/{docker-core.docker.upstart => docker-engine.docker.upstart} (100%)
 rename hack/make/.build-deb/{docker-core.install => docker-engine.install} (100%)
 rename hack/make/.build-deb/{docker-core.manpages => docker-engine.manpages} (100%)
 rename hack/make/.build-deb/{docker-core.postinst => docker-engine.postinst} (100%)
 rename hack/make/.build-deb/{docker-core.udev => docker-engine.udev} (100%)

diff --git a/hack/make/.build-deb/docker-core.bash-completion b/hack/make/.build-deb/docker-engine.bash-completion
similarity index 100%
rename from hack/make/.build-deb/docker-core.bash-completion
rename to hack/make/.build-deb/docker-engine.bash-completion
diff --git a/hack/make/.build-deb/docker-core.docker.default b/hack/make/.build-deb/docker-engine.docker.default
similarity index 100%
rename from hack/make/.build-deb/docker-core.docker.default
rename to hack/make/.build-deb/docker-engine.docker.default
diff --git a/hack/make/.build-deb/docker-core.docker.init b/hack/make/.build-deb/docker-engine.docker.init
similarity index 100%
rename from hack/make/.build-deb/docker-core.docker.init
rename to hack/make/.build-deb/docker-engine.docker.init
diff --git a/hack/make/.build-deb/docker-core.docker.upstart b/hack/make/.build-deb/docker-engine.docker.upstart
similarity index 100%
rename from hack/make/.build-deb/docker-core.docker.upstart
rename to hack/make/.build-deb/docker-engine.docker.upstart
diff --git a/hack/make/.build-deb/docker-core.install b/hack/make/.build-deb/docker-engine.install
similarity index 100%
rename from hack/make/.build-deb/docker-core.install
rename to hack/make/.build-deb/docker-engine.install
diff --git a/hack/make/.build-deb/docker-core.manpages b/hack/make/.build-deb/docker-engine.manpages
similarity index 100%
rename from hack/make/.build-deb/docker-core.manpages
rename to hack/make/.build-deb/docker-engine.manpages
diff --git a/hack/make/.build-deb/docker-core.postinst b/hack/make/.build-deb/docker-engine.postinst
similarity index 100%
rename from hack/make/.build-deb/docker-core.postinst
rename to hack/make/.build-deb/docker-engine.postinst
diff --git a/hack/make/.build-deb/docker-core.udev b/hack/make/.build-deb/docker-engine.udev
similarity index 100%
rename from hack/make/.build-deb/docker-core.udev
rename to hack/make/.build-deb/docker-engine.udev
diff --git a/hack/make/.build-deb/rules b/hack/make/.build-deb/rules
index 22dab31d12..fe19b729ea 100755
--- a/hack/make/.build-deb/rules
+++ b/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"
diff --git a/hack/make/build-deb b/hack/make/build-deb
index 90a2b98b85..a347f0e851 100644
--- a/hack/make/build-deb
+++ b/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')"