poll-daemon

Merge lp:~sergiusens/account-polld/packaging_massage into lp:~ubuntu-push-hackers/account-polld/trunk

  1. packaging_massage
  2. Merge into trunk
Proposed by Sergio Schvezov
Status: Merged
Approved by: Ricardo Salveti
Approved revision: 49
Merged at revision: 46
Proposed branch: lp:~sergiusens/account-polld/packaging_massage
Merge into: lp:~ubuntu-push-hackers/account-polld/trunk
Prerequisite: lp:~sergiusens/account-polld/translations
Diff against target: 49 lines (+4/-11)
2 files modified
debian/account-polld.conf (+3/-2)
debian/rules (+1/-9)
To merge this branch: bzr merge lp:~sergiusens/account-polld/packaging_massage
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ricardo Salveti (community) Approve
Review via email: mp+229803@code.launchpad.net

Commit message

Packaging fixes: remove host arch from debian/rules, install to bin instead of lib; start only when the push client session is available

Description of the change

Similar procedure to what was done in https://code.launchpad.net/~sergiusens/ciborium/packaging_massage/+merge/229726

To post a comment you must log in.
Revision history for this message
Ricardo Salveti (rsalveti) wrote :

LGTM, thanks.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:49
http://jenkins.qa.ubuntu.com/job/account-polld-ci/60/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-amd64-ci/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-armhf-ci/60
        deb: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-armhf-ci/60/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-i386-ci/60

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-polld-ci/60/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/account-polld.conf'
2--- debian/account-polld.conf 2014-07-24 01:26:07 +0000
3+++ debian/account-polld.conf 2014-08-06 14:42:22 +0000
4@@ -1,5 +1,6 @@
5 description "account-polld checks for notifications for twitter, facebook and gmail and passes them on to the Ubuntu Push Postal service"
6
7-start on started dbus
8+start on started ubuntu-push-client
9+stop on stopping ubuntu-push-client
10
11-exec /usr/lib/account-polld/account-polld
12+exec /usr/bin/account-polld
13
14=== modified file 'debian/rules'
15--- debian/rules 2014-08-06 14:42:22 +0000
16+++ debian/rules 2014-08-06 14:42:22 +0000
17@@ -5,8 +5,6 @@
18 export DH_GOPKG := launchpad.net/account-polld
19 export DH_GOLANG_INSTALL_ALL := 1
20
21-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
22-
23 %:
24 dh $@ \
25 --buildsystem=golang \
26@@ -16,17 +14,11 @@
27
28 override_dh_auto_install:
29 dh_auto_install -O--buildsystem=golang
30- mkdir -p ${CURDIR}/debian/account-polld/usr/lib/account-polld
31- mv \
32- ${CURDIR}/debian/account-polld/usr/bin/account-polld \
33- ${CURDIR}/debian/account-polld/usr/lib/account-polld
34 rm \
35 ${CURDIR}/debian/account-polld/usr/bin/account-watcher-test
36 # all our libs are private
37 rm -r \
38 ${CURDIR}/debian/account-polld/usr/share/gocode
39- rmdir \
40- ${CURDIR}/debian/account-polld/usr/bin
41 # setup online accounts service files
42 mkdir -p \
43 ${CURDIR}/debian/account-polld/usr/share/accounts/applications \
44@@ -53,4 +45,4 @@
45 done
46
47 override_dh_strip:
48- echo "Skipping strip"
49+ echo "Skipping strip (LP: #1318027)"

Subscribers

People subscribed via source and target branches