Merge lp:~cyphermox/bamf/14.04.20131125-0ubuntu2 into lp:bamf

[Mathieu Trudel-Lapierre]

Add missing changelog entry for 0.5.1+14.04.20131125-0ubuntu2

Add missing changelog entry for 0.5.1+14.04.20131125-0ubuntu2

[Didier Roche-Tolomelli (didrocks)]

Thanks Mathieu :)

review: Approve

[Ken VanDine (ken-vandine)]

This is going to FTBFS, and there is a pending branch already at https://code.launchpad.net/~ken-vandine/bamf/0.5.1+14.04.20131125-0ubuntu2/+merge/200723

review: Disapprove

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/bamf-autolanding/59/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-trusty-amd64-autolanding/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-trusty-armhf-autolanding/4/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3817/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:590
http://jenkins.qa.ubuntu.com/job/bamf-ci/96/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-trusty-amd64-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-trusty-armhf-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/bamf-ci/96/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

590. By Mathieu Trudel-Lapierre on 2014-01-09

releasing package bamf version 0.5.1+14.04.20131125-0ubuntu2

=== modified file 'debian/changelog'
--- debian/changelog	2013-11-25 03:55:07 +0000
+++ debian/changelog	2014-01-09 15:27:34 +0000
@@ -1,3 +1,10 @@
+bamf (0.5.1+14.04.20131125-0ubuntu2) trusty; urgency=medium
+
+  * bamf-legacy-window-test.c: Don't use 'return' with a value, in function
+    returning void.
+
+ -- Matthias Klose <[e-mail]>  Mon, 30 Dec 2013 07:55:21 +0100
+
 bamf (0.5.1+14.04.20131125-0ubuntu1) trusty; urgency=low
 
   [ Marco Trevisan (Treviño) ]

=== modified file 'src/bamf-legacy-window-test.c'
--- src/bamf-legacy-window-test.c	2013-08-08 12:32:39 +0000
+++ src/bamf-legacy-window-test.c	2014-01-09 15:27:34 +0000
@@ -427,7 +427,7 @@
   g_return_if_fail (BAMF_IS_LEGACY_WINDOW_TEST (window));
   BamfLegacyWindowTest *self = BAMF_LEGACY_WINDOW_TEST (window);
 
-  return g_hash_table_insert (self->hints, g_strdup (name), g_strdup (value));
+  g_hash_table_insert (self->hints, g_strdup (name), g_strdup (value));
 }
 
 static char *