Ubuntu Push Notifications

Merge lp:~jonas-drange/ubuntu-push/fix-dot-install into lp:ubuntu-push

  1. fix-dot-install
  2. Merge into trunk
Proposed by Jonas G. Drange on 2016-05-02
Status: Superseded
Proposed branch: lp:~jonas-drange/ubuntu-push/fix-dot-install
Merge into: lp:ubuntu-push
Diff against target: 51 lines (+4/-5)
5 files modified
bus/connectivity/connectivity_test.go (+1/-1)
bus/networkmanager/networkmanager.go (+1/-1)
debian/source/format (+0/-1)
debian/ubuntu-push-client.install (+1/-1)
debian/ubuntu-push-dev-server.install (+1/-1)
To merge this branch: bzr merge lp:~jonas-drange/ubuntu-push/fix-dot-install
Reviewer Review Type Date Requested Status
Ubuntu Push Hackers 2016-05-02 Pending
Review via email: mp+293538@code.launchpad.net

This proposal has been superseded by a proposal from 2016-05-02.

Commit Message

remove symbols creating ftbfs issues on vivid

To post a comment you must log in.
lp:~jonas-drange/ubuntu-push/fix-dot-install updated on 2016-05-02
430. By Jonas G. Drange on 2016-05-02

undrop final names

Unmerged revisions

430. By Jonas G. Drange on 2016-05-02

undrop final names

429. By Jonas G. Drange on 2016-05-02

remove misbehaving symbols

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bus/connectivity/connectivity_test.go'
2--- bus/connectivity/connectivity_test.go 2015-04-29 15:17:49 +0000
3+++ bus/connectivity/connectivity_test.go 2016-05-02 14:47:37 +0000
4@@ -167,7 +167,7 @@
5
6 func (rep *racyEndpoint) GetProperty(prop string) (interface{}, error) {
7 switch prop {
8- case "state":
9+ case "State":
10 rep.lock.Lock()
11 defer rep.lock.Unlock()
12 rep.stateGot = true
13
14=== modified file 'bus/networkmanager/networkmanager.go'
15--- bus/networkmanager/networkmanager.go 2015-03-30 12:04:49 +0000
16+++ bus/networkmanager/networkmanager.go 2016-05-02 14:47:37 +0000
17@@ -76,7 +76,7 @@
18 */
19
20 func (nm *networkManager) GetState() State {
21- s, err := nm.bus.GetProperty("state")
22+ s, err := nm.bus.GetProperty("State")
23 if err != nil {
24 nm.log.Errorf("failed getting current state: %s", err)
25 nm.log.Debugf("defaulting state to Unknown")
26
27=== removed directory 'debian/source'
28=== removed file 'debian/source/format'
29--- debian/source/format 2014-03-25 14:35:07 +0000
30+++ debian/source/format 1970-01-01 00:00:00 +0000
31@@ -1,1 +0,0 @@
32-3.0 (quilt)
33
34=== modified file 'debian/ubuntu-push-client.install'
35--- debian/ubuntu-push-client.install 2014-08-12 02:31:51 +0000
36+++ debian/ubuntu-push-client.install 2016-05-02 14:47:37 +0000
37@@ -5,5 +5,5 @@
38 debian/push-helper.hook /usr/share/click/hooks
39 signing-helper/signing-helper /usr/lib/ubuntu-push-client
40 scripts/click-hook /usr/lib/ubuntu-push-client
41-usr/bin/ubuntu-push => /usr/lib/ubuntu-push-client/ubuntu-push-client
42+usr/bin/ubuntu-push
43
44
45=== modified file 'debian/ubuntu-push-dev-server.install'
46--- debian/ubuntu-push-dev-server.install 2014-07-17 23:01:19 +0000
47+++ debian/ubuntu-push-dev-server.install 2016-05-02 14:47:37 +0000
48@@ -1,2 +1,2 @@
49 #!/usr/bin/dh-exec
50-usr/bin/dev => /usr/bin/ubuntu-push-dev-server
51+usr/bin/dev

Subscribers

People subscribed via source and target branches