diff --git a/hack/make/.build-deb/control b/hack/make/.build-deb/control index 03caae8342..ac6541a73e 100644 --- a/hack/make/.build-deb/control +++ b/hack/make/.build-deb/control @@ -1,10 +1,10 @@ -Source: docker-core +Source: docker-engine Maintainer: Docker Homepage: https://dockerproject.com Vcs-Browser: https://github.com/docker/docker Vcs-Git: git://github.com/docker/docker.git -Package: docker-core +Package: docker-engine Architecture: linux-any Depends: iptables, ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends} Recommends: aufs-tools, diff --git a/hack/make/.build-deb/docker-core.install b/hack/make/.build-deb/docker-core.install index c3f4eb1465..76b05ad043 100644 --- a/hack/make/.build-deb/docker-core.install +++ b/hack/make/.build-deb/docker-core.install @@ -1,10 +1,10 @@ #contrib/syntax/vim/doc/* /usr/share/vim/vimfiles/doc/ #contrib/syntax/vim/ftdetect/* /usr/share/vim/vimfiles/ftdetect/ #contrib/syntax/vim/syntax/* /usr/share/vim/vimfiles/syntax/ -contrib/*-integration usr/share/docker-core/contrib/ -contrib/check-config.sh usr/share/docker-core/contrib/ +contrib/*-integration usr/share/docker-engine/contrib/ +contrib/check-config.sh usr/share/docker-engine/contrib/ contrib/completion/zsh/_docker usr/share/zsh/vendor-completions/ contrib/init/systemd/docker.service lib/systemd/system/ contrib/init/systemd/docker.socket lib/systemd/system/ -contrib/mk* usr/share/docker-core/contrib/ -contrib/nuke-graph-directory.sh usr/share/docker-core/contrib/ +contrib/mk* usr/share/docker-engine/contrib/ +contrib/nuke-graph-directory.sh usr/share/docker-engine/contrib/ diff --git a/hack/make/.build-deb/rules b/hack/make/.build-deb/rules index 3369f4fc54..22dab31d12 100755 --- a/hack/make/.build-deb/rules +++ b/hack/make/.build-deb/rules @@ -4,7 +4,7 @@ VERSION = $(shell cat VERSION) override_dh_gencontrol: # if we're on Ubuntu, we need to Recommends: apparmor - echo 'apparmor:Recommends=$(shell dpkg-vendor --is Ubuntu && echo apparmor)' >> debian/docker-core.substvars + echo 'apparmor:Recommends=$(shell dpkg-vendor --is Ubuntu && echo apparmor)' >> debian/docker-engine.substvars dh_gencontrol override_dh_auto_build: @@ -19,13 +19,13 @@ override_dh_strip: # also, Go has lots of problems with stripping, so just don't override_dh_auto_install: - mkdir -p debian/docker-core/usr/bin - cp -aT "$$(readlink -f bundles/$(VERSION)/dynbinary/docker)" debian/docker-core/usr/bin/docker - mkdir -p debian/docker-core/usr/libexec/docker - cp -aT "$$(readlink -f bundles/$(VERSION)/dynbinary/dockerinit)" debian/docker-core/usr/libexec/docker/dockerinit + 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 override_dh_installinit: - # use "docker" as our service name, not "docker-core" + # use "docker" as our service name, not "docker-engine" dh_installinit --name=docker override_dh_installudev: