Merge lp:~chipaca/ubuntu-push/fixes-suggested-by-didrocks into lp:ubuntu-push

Proposed by John Lenton
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: no longer in the source branch.
Merged at revision: 88
Proposed branch: lp:~chipaca/ubuntu-push/fixes-suggested-by-didrocks
Merge into: lp:ubuntu-push
Diff against target: 35 lines (+5/-1)
2 files modified
debian/control (+2/-1)
debian/rules (+3/-0)
To merge this branch: bzr merge lp:~chipaca/ubuntu-push/fixes-suggested-by-didrocks
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Review via email: mp+212398@code.launchpad.net

Commit message

Fixes to packaging, as suggested by didrocks.

Description of the change

Fixes to packaging, as suggested by didrocks.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

perfect! Thanks :)

review: Approve
88. By John Lenton

[r=didrocks] Fixes to packaging, as suggested by didrocks.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-03-21 02:42:49 +0000
3+++ debian/control 2014-03-24 12:35:36 +0000
4@@ -21,6 +21,7 @@
5
6 Package: ubuntu-push-client
7 Architecture: any
8+Multi-Arch: foreign
9 Depends: dbus,
10 network-manager,
11 notification-daemon,
12@@ -36,7 +37,7 @@
13 Depends: ${misc:Depends},
14 ${shlibs:Depends},
15 Built-Using: ${misc:Built-Using}
16-Description: Ubuntu Push Notifications client-side daemon
17+Description: Ubuntu Push Notifications client-side daemon development package
18 The Ubuntu Push Notifications client-side daemon library.
19 .
20 This package contains the source.
21
22=== modified file 'debian/rules'
23--- debian/rules 2014-03-21 02:34:48 +0000
24+++ debian/rules 2014-03-24 12:35:36 +0000
25@@ -5,5 +5,8 @@
26 export DEB_BUILD_OPTIONS := nostrip
27 export UBUNTU_PUSH_TEST_RESOURCES_ROOT := $(CURDIR)
28
29+override_dh_install:
30+ dh_install -Xusr/bin/cmd -Xusr/bin/dev --fail-missing
31+
32 %:
33 dh $@ --buildsystem=golang --with=golang
34
35=== removed directory 'debian/source'

Subscribers

People subscribed via source and target branches