Browse code

Replace "docker-core" with "docker-engine" in "build-deb"

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>

Tianon Gravi authored on 2015/05/06 01:11:59
Showing 3 changed files
... ...
@@ -1,10 +1,10 @@
1
-Source: docker-core
1
+Source: docker-engine
2 2
 Maintainer: Docker <support@docker.com>
3 3
 Homepage: https://dockerproject.com
4 4
 Vcs-Browser: https://github.com/docker/docker
5 5
 Vcs-Git: git://github.com/docker/docker.git
6 6
 
7
-Package: docker-core
7
+Package: docker-engine
8 8
 Architecture: linux-any
9 9
 Depends: iptables, ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
10 10
 Recommends: aufs-tools,
... ...
@@ -1,10 +1,10 @@
1 1
 #contrib/syntax/vim/doc/* /usr/share/vim/vimfiles/doc/
2 2
 #contrib/syntax/vim/ftdetect/* /usr/share/vim/vimfiles/ftdetect/
3 3
 #contrib/syntax/vim/syntax/* /usr/share/vim/vimfiles/syntax/
4
-contrib/*-integration usr/share/docker-core/contrib/
5
-contrib/check-config.sh usr/share/docker-core/contrib/
4
+contrib/*-integration usr/share/docker-engine/contrib/
5
+contrib/check-config.sh usr/share/docker-engine/contrib/
6 6
 contrib/completion/zsh/_docker usr/share/zsh/vendor-completions/
7 7
 contrib/init/systemd/docker.service lib/systemd/system/
8 8
 contrib/init/systemd/docker.socket lib/systemd/system/
9
-contrib/mk* usr/share/docker-core/contrib/
10
-contrib/nuke-graph-directory.sh usr/share/docker-core/contrib/
9
+contrib/mk* usr/share/docker-engine/contrib/
10
+contrib/nuke-graph-directory.sh usr/share/docker-engine/contrib/
... ...
@@ -4,7 +4,7 @@ VERSION = $(shell cat VERSION)
4 4
 
5 5
 override_dh_gencontrol:
6 6
 	# if we're on Ubuntu, we need to Recommends: apparmor
7
-	echo 'apparmor:Recommends=$(shell dpkg-vendor --is Ubuntu && echo apparmor)' >> debian/docker-core.substvars
7
+	echo 'apparmor:Recommends=$(shell dpkg-vendor --is Ubuntu && echo apparmor)' >> debian/docker-engine.substvars
8 8
 	dh_gencontrol
9 9
 
10 10
 override_dh_auto_build:
... ...
@@ -19,13 +19,13 @@ override_dh_strip:
19 19
 	# also, Go has lots of problems with stripping, so just don't
20 20
 
21 21
 override_dh_auto_install:
22
-	mkdir -p debian/docker-core/usr/bin
23
-	cp -aT "$$(readlink -f bundles/$(VERSION)/dynbinary/docker)" debian/docker-core/usr/bin/docker
24
-	mkdir -p debian/docker-core/usr/libexec/docker
25
-	cp -aT "$$(readlink -f bundles/$(VERSION)/dynbinary/dockerinit)" debian/docker-core/usr/libexec/docker/dockerinit
22
+	mkdir -p debian/docker-engine/usr/bin
23
+	cp -aT "$$(readlink -f bundles/$(VERSION)/dynbinary/docker)" debian/docker-engine/usr/bin/docker
24
+	mkdir -p debian/docker-engine/usr/libexec/docker
25
+	cp -aT "$$(readlink -f bundles/$(VERSION)/dynbinary/dockerinit)" debian/docker-engine/usr/libexec/docker/dockerinit
26 26
 
27 27
 override_dh_installinit:
28
-	# use "docker" as our service name, not "docker-core"
28
+	# use "docker" as our service name, not "docker-engine"
29 29
 	dh_installinit --name=docker
30 30
 
31 31
 override_dh_installudev: