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
=== modified file 'debian/control'
--- debian/control 2014-03-21 02:42:49 +0000
+++ debian/control 2014-03-24 12:35:36 +0000
@@ -21,6 +21,7 @@
2121
22Package: ubuntu-push-client22Package: ubuntu-push-client
23Architecture: any23Architecture: any
24Multi-Arch: foreign
24Depends: dbus,25Depends: dbus,
25 network-manager,26 network-manager,
26 notification-daemon,27 notification-daemon,
@@ -36,7 +37,7 @@
36Depends: ${misc:Depends},37Depends: ${misc:Depends},
37 ${shlibs:Depends},38 ${shlibs:Depends},
38Built-Using: ${misc:Built-Using}39Built-Using: ${misc:Built-Using}
39Description: Ubuntu Push Notifications client-side daemon40Description: Ubuntu Push Notifications client-side daemon development package
40 The Ubuntu Push Notifications client-side daemon library.41 The Ubuntu Push Notifications client-side daemon library.
41 .42 .
42 This package contains the source.43 This package contains the source.
4344
=== modified file 'debian/rules'
--- debian/rules 2014-03-21 02:34:48 +0000
+++ debian/rules 2014-03-24 12:35:36 +0000
@@ -5,5 +5,8 @@
5export DEB_BUILD_OPTIONS := nostrip5export DEB_BUILD_OPTIONS := nostrip
6export UBUNTU_PUSH_TEST_RESOURCES_ROOT := $(CURDIR)6export UBUNTU_PUSH_TEST_RESOURCES_ROOT := $(CURDIR)
77
8override_dh_install:
9 dh_install -Xusr/bin/cmd -Xusr/bin/dev --fail-missing
10
8%:11%:
9 dh $@ --buildsystem=golang --with=golang12 dh $@ --buildsystem=golang --with=golang
1013
=== removed directory 'debian/source'

Subscribers

People subscribed via source and target branches