Merge lp:~chipaca/ubuntu-push/promises-schmromises into lp:ubuntu-push

[John Lenton]

Tests pass with go 1.4 again.

Oooh, look. A fix because of a change to go that breaks the compatibility promise!

[dobey (dobey)]

review: Approve

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-30 15:08:57 +0000
+++ debian/changelog	2015-07-31 14:51:33 +0000
@@ -1,3 +1,11 @@
+ubuntu-push (0.69-0ubuntu1) wily; urgency=medium
+
+  [ John R. Lenton ]
+  * go's compatibility promise fails us again; fixes for 1.4.
+  * fix gcc5-related linking issues.
+
+ -- John R. Lenton <[e-mail]>  Fri, 31 Jul 2015 13:52:04 +0100
+
 ubuntu-push (0.68+15.04.20150430.1-0ubuntu1) vivid; urgency=medium
 
   [ Samuele Pedroni ]
 
=== modified file 'launch_helper/kindpool_test.go'
--- launch_helper/kindpool_test.go	2015-03-18 16:34:11 +0000
+++ launch_helper/kindpool_test.go	2015-07-31 14:51:33 +0000
@@ -278,7 +278,7 @@
 	args := HelperArgs{
 		Input:   input,
 		FileOut: filepath.Join(d, "file_out.json"),
-		Timer:   &time.Timer{},
+		Timer:   time.NewTimer(0),
 	}
 	pool.hmap["l:1"] = &args
 
@@ -310,7 +310,7 @@
 			Payload:        []byte(`"hello"`),
 		},
 		FileOut: "/does-not-exist",
-		Timer:   &time.Timer{},
+		Timer:   time.NewTimer(0),
 	}
 	pool.hmap["l:1"] = &args
 
@@ -337,7 +337,7 @@
 			NotificationId: "foo",
 			Payload:        []byte(`"hello"`),
 		},
-		Timer: &time.Timer{},
+		Timer: time.NewTimer(0),
 	}
 	pool.hmap["l:1"] = &args
 
 
=== modified file 'signing-helper/CMakeLists.txt'
--- signing-helper/CMakeLists.txt	2014-04-30 17:34:57 +0000
+++ signing-helper/CMakeLists.txt	2015-07-31 14:51:33 +0000
@@ -13,8 +13,8 @@
 SET (CMAKE_AUTOMOC ON)
 find_package(Qt5Core REQUIRED)
 
-FILE (GLOB SIGNING_SOURCES signing*.cpp)
-FILE (GLOB SIGNING_HEADERS signing*.h)
+SET (SIGNING_SOURCES signing-helper.cpp)
+SET (SIGNING_HEADERS signing.h)
 
 add_executable (${SIGNING_EXE}
   ${SIGNING_SOURCES}