diff --git a/data/anbox.conf.in b/data/anbox.conf.in deleted file mode 100644 index 4600e0e..0000000 --- a/data/anbox.conf.in +++ /dev/null @@ -1,6 +0,0 @@ -start on started dbus - -respawn -respawn limit 10 5 - -exec @SNAP_MOUNT_DIR@/anbox session-manager diff --git a/data/anbox.service.in b/data/anbox.service.in deleted file mode 100644 index 7cdd14f..0000000 --- a/data/anbox.service.in +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Anbox session manager - -[Service] -Type=simple -ExecStart=@SNAP_MOUNT_DIR@/anbox session-manager -Restart=always -StartLimitIntervalSec=3 -StartLimitBurst=1 - -[Install] -WantedBy=default.target diff --git a/debian/anbox-common.install b/debian/anbox-common.install index bf67a97..d320f00 100644 --- a/debian/anbox-common.install +++ b/debian/anbox-common.install @@ -1,4 +1 @@ etc/X11/Xsession.d/68anbox -usr/share/upstart/sessions/anbox.conf -usr/lib/systemd/user/anbox.service -usr/lib/systemd/user/default.target.wants/anbox.service diff --git a/debian/control b/debian/control index 9dfb528..8696f8e 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Vcs-Git: https://github.com/anbox/anbox.git Package: anbox-common Architecture: all -Depends: ${misc:Depends}, dbus-user-session +Depends: ${misc:Depends} Description: Common files necessary for Anbox . This package contains necessary things which can't be shipped diff --git a/debian/rules b/debian/rules index b50be78..9874b48 100755 --- a/debian/rules +++ b/debian/rules @@ -14,8 +14,6 @@ VERSION=$(shell dpkg-parsechangelog -SVersion) override_dh_auto_configure: override_dh_auto_build: - cat data/anbox.service.in | sed s:@SNAP_MOUNT_DIR@:/snap/bin:g > data/anbox.service - cat data/anbox.conf.in | sed s:@SNAP_MOUNT_DIR@:/snap/bin:g > data/anbox.conf override_dh_install: VERSION=$(shell dpkg-parsechangelog -SVersion) @@ -30,13 +28,6 @@ override_dh_install: install -d $(CURDIR)/debian/tmp/etc/modules-load.d install -m 0644 kernel/anbox.conf $(CURDIR)/debian/tmp/etc/modules-load.d - install -d $(CURDIR)/debian/tmp/usr/lib/systemd/user/default.target.wants - install -m 0644 data/anbox.service $(CURDIR)/debian/tmp/usr/lib/systemd/user/ - ln -sf /usr/lib/systemd/user/anbox.service $(CURDIR)/debian/tmp/usr/lib/systemd/user/default.target.wants/anbox.service - - install -d $(CURDIR)/debian/tmp/usr/share/upstart/sessions/ - install -m 0644 data/anbox.conf $(CURDIR)/debian/tmp/usr/share/upstart/sessions/ - install -d $(CURDIR)/debian/tmp/etc/X11/Xsession.d install -m 0644 data/xsession.conf $(CURDIR)/debian/tmp/etc/X11/Xsession.d/68anbox