Merge ~sylvain-pineau/checkbox-ng/+git/packaging_service_renamed:master into ~checkbox-dev/checkbox-ng/+git/packaging:master

Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: de5b3c328d2fa7d42366fba9d12e1a69cd53ef8e
Merged at revision: 4073e4afcc5a010fa8cbfa7f81a5c000b767128b
Proposed branch: ~sylvain-pineau/checkbox-ng/+git/packaging_service_renamed:master
Merge into: ~checkbox-dev/checkbox-ng/+git/packaging:master
Diff against target: 35 lines (+5/-2)
3 files modified
debian/checkbox-ng.remote-slave.service (+1/-1)
debian/compat (+1/-1)
debian/rules (+3/-0)
Reviewer Review Type Date Requested Status
Taihsiang Ho Needs Information
Jonathan Cave (community) Approve
Review via email: mp+374839@code.launchpad.net

Description of the change

Rename the systemd service unit file to match checkbox snaps services naming convention.

To post a comment you must log in.
Revision history for this message
Jonathan Cave (jocave) wrote :

LGTM

review: Approve
Revision history for this message
Taihsiang Ho (tai271828) wrote :

I am not if something like [1] went wrong or so. The deb I used for bionic desktops has no such systemd service.

ubuntu@sru-201606-22344-cool-quail:~$ dpkg -L checkbox-ng
/.
/etc
/etc/polkit-1
/etc/polkit-1/localauthority
/etc/polkit-1/localauthority/50-local.d
/etc/polkit-1/localauthority/50-local.d/com.canonical.certification.checkbox.pkla
/usr
/usr/bin
/usr/bin/checkbox-cli
/usr/share
/usr/share/doc
/usr/share/doc/checkbox-ng
/usr/share/doc/checkbox-ng/copyright
/usr/share/lintian
/usr/share/lintian/overrides
/usr/share/lintian/overrides/checkbox-ng
/usr/share/man
/usr/share/man/man1
/usr/share/man/man1/checkbox_ng.1.gz
/usr/share/doc/checkbox-ng/changelog.gz
/usr/share/man/man1/checkbox-cli.1.gz
ubuntu@sru-201606-22344-cool-quail:~$ apt-cache policy checkbox-ng
checkbox-ng:
  Installed: 1.5.0+git201910231016+pkg128~ubuntu18.04.1
  Candidate: 1.5.0+git201910231016+pkg128~ubuntu18.04.1
  Version table:
 *** 1.5.0+git201910231016+pkg128~ubuntu18.04.1 500
        500 http://ppa.launchpad.net/checkbox-dev/ppa/ubuntu bionic/main amd64 Packages
        500 http://ppa.launchpad.net/checkbox-dev/ppa/ubuntu bionic/main i386 Packages
        100 /var/lib/dpkg/status
     0.23-2 500
        500 http://archive.ubuntu.com/ubuntu bionic/main amd64 Packages
        500 http://archive.ubuntu.com/ubuntu bionic/main i386 Packages
ubuntu@sru-201606-22344-cool-quail:~$

[1] https://code.launchpad.net/~sylvain-pineau/checkbox-ng/+git/packaging_service_renamed_fix/+merge/374855

review: Needs Information

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/checkbox-ng.service b/debian/checkbox-ng.remote-slave.service
2similarity index 90%
3rename from debian/checkbox-ng.service
4rename to debian/checkbox-ng.remote-slave.service
5index 2e678cf..8d0379d 100644
6--- a/debian/checkbox-ng.service
7+++ b/debian/checkbox-ng.remote-slave.service
8@@ -4,7 +4,7 @@ Wants=network.target
9
10 [Service]
11 ExecStart=/usr/bin/checkbox-cli slave
12-SyslogIdentifier=checkbox-slave
13+SyslogIdentifier=checkbox-ng.remote-slave
14 Restart=on-failure
15 TimeoutStopSec=30
16 Type=simple
17diff --git a/debian/compat b/debian/compat
18index f599e28..b4de394 100644
19--- a/debian/compat
20+++ b/debian/compat
21@@ -1 +1 @@
22-10
23+11
24diff --git a/debian/rules b/debian/rules
25index 810ba91..aea35a3 100755
26--- a/debian/rules
27+++ b/debian/rules
28@@ -46,3 +46,6 @@ override_dh_clean:
29 override_dh_python3:
30 dh_python3 --shebang=/usr/bin/python3
31 rm -rf debian/python3-checkbox-ng/usr/lib/python3.?
32+
33+override_dh_installsystemd:
34+ dh_installsystemd --name=checkbox-ng.remote-slave
35\ No newline at end of file

Subscribers

People subscribed via source and target branches