Merge lp:~pedronis/ubuntu-push/fixes-from-wily into lp:ubuntu-push/automatic

[Samuele Pedroni]

take the fixes from wily as packaged

take the last fixes from wily

[Samuele Pedroni (pedronis)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-30 15:08:57 +0000
+++ debian/changelog	2015-08-14 12:03:22 +0000
@@ -1,3 +1,16 @@
+ubuntu-push (0.68+15.04.20150430.1-0ubuntu2~ppa1) wily; urgency=medium
+
+  [ John R. Lenton ]
+  * go's compatibility promise fails us again; fixes for 1.4.
+
+ -- John R. Lenton <[e-mail]>  Fri, 31 Jul 2015 13:52:04 +0100
+
+ubuntu-push (0.68+15.04.20150430.1-0ubuntu2~gcc5.1) wily; urgency=medium
+
+  * No-change test rebuild for g++5 ABI transition
+
+ -- Steve Langasek <[e-mail]>  Wed, 15 Jul 2015 16:10:40 +0000
+
 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-08-14 12:03:22 +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