Merge lp:~timo-jyrinki/ubuntu-push/test_ignore_file_removal into lp:ubuntu-push

[Timo Jyrinki]

test

test removing the ignore files

[lp:~timo-jyrinki/ubuntu-push/test_ignore_file_removal]

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

sync changelog between automatic and trunk

428. By Timo Jyrinki on 2016-05-02

remove debian/source, not needed

429. By Timo Jyrinki on 2016-05-02

try hack to replace >=

430. By Timo Jyrinki on 2016-05-02

hmm

Unmerged revisions

430. By Timo Jyrinki on 2016-05-02

hmm

429. By Timo Jyrinki on 2016-05-02

try hack to replace >=

=== modified file 'bus/connectivity/connectivity_test.go'
--- bus/connectivity/connectivity_test.go	2015-04-29 15:17:49 +0000
+++ bus/connectivity/connectivity_test.go	2016-05-02 14:05:46 +0000
@@ -167,7 +167,7 @@
 
 func (rep *racyEndpoint) GetProperty(prop string) (interface{}, error) {
 	switch prop {
-	case "state":
+	case "State":
 		rep.lock.Lock()
 		defer rep.lock.Unlock()
 		rep.stateGot = true

=== modified file 'bus/networkmanager/networkmanager.go'
--- bus/networkmanager/networkmanager.go	2015-03-30 12:04:49 +0000
+++ bus/networkmanager/networkmanager.go	2016-05-02 14:05:46 +0000
@@ -76,7 +76,7 @@
 */
 
 func (nm *networkManager) GetState() State {
-	s, err := nm.bus.GetProperty("state")
+	s, err := nm.bus.GetProperty("State")
 	if err != nil {
 		nm.log.Errorf("failed getting current state: %s", err)
 		nm.log.Debugf("defaulting state to Unknown")

=== modified file 'debian/rules'
--- debian/rules	2016-03-10 20:24:21 +0000
+++ debian/rules	2016-05-02 14:05:46 +0000
@@ -29,6 +29,8 @@
 	GODEBUG=cgocheck=0 dh_auto_test -O--buildsystem=golang
 
 override_dh_install:
+	mkdir -p debian/tmp/usr/bin/
+	#ln -s /usr/lib/ubuntu-push-client/ubuntu-push-client debian/tmp/usr/bin/ubuntu-push
 	dh_install -Xusr/bin/cmd --fail-missing
 
 %:

=== removed directory 'debian/source'
=== removed file 'debian/source/format'
--- debian/source/format	2014-03-25 14:35:07 +0000
+++ debian/source/format	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-3.0 (quilt)

=== modified file 'debian/ubuntu-push-client.install'
--- debian/ubuntu-push-client.install	2014-08-12 02:31:51 +0000
+++ debian/ubuntu-push-client.install	2016-05-02 14:05:46 +0000
@@ -5,5 +5,5 @@
 debian/push-helper.hook /usr/share/click/hooks
 signing-helper/signing-helper /usr/lib/ubuntu-push-client
 scripts/click-hook /usr/lib/ubuntu-push-client
-usr/bin/ubuntu-push => /usr/lib/ubuntu-push-client/ubuntu-push-client
+usr/bin/ubuntu-push
 

=== modified file 'debian/ubuntu-push-dev-server.install'
--- debian/ubuntu-push-dev-server.install	2014-07-17 23:01:19 +0000
+++ debian/ubuntu-push-dev-server.install	2016-05-02 14:05:46 +0000
@@ -1,2 +1,2 @@
 #!/usr/bin/dh-exec
-usr/bin/dev => /usr/bin/ubuntu-push-dev-server
+usr/bin/dev