Merge lp:~dobey/unity-scope-click/merge-trunk into lp:unity-scope-click/devel

[dobey]

New libstdc++ requires explicit -lpthread when using std::thread.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:404
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/274/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/249
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/248
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/248/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/248

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/274/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

This is already in trunk, and necessary to build the scope now, so forcing this through.

review: Abstain

[lp:~dobey/unity-scope-click/merge-trunk]

404. By dobey on 2014-08-18

New libstdc++ requires explicit -lpthread when using std::thread.

Approved by PS Jenkins bot.

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-11 19:08:26 +0000
+++ debian/changelog	2014-08-18 18:53:16 +0000
@@ -1,3 +1,10 @@
+unity-scope-click (0.1.1+14.10.20140815-0ubuntu1) utopic; urgency=low
+
+  [ Rodney Dawes ]
+  * New libstdc++ requires explicit -lpthread when using std::thread.
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 15 Aug 2014 14:24:40 +0000
+
 unity-scope-click (0.1.1+14.10.20140811-0ubuntu1) utopic; urgency=medium
 
   [ Michal Hruby ]

=== modified file 'tools/init-departments/CMakeLists.txt'
--- tools/init-departments/CMakeLists.txt	2014-07-14 09:43:27 +0000
+++ tools/init-departments/CMakeLists.txt	2014-08-18 18:53:16 +0000
@@ -2,6 +2,7 @@
 set (INITDEPTS init-departments)
 
 find_package (Qt5Core REQUIRED)
+find_package (Threads)
 
 include_directories (
     ${CMAKE_SOURCE_DIR}/libclickscope
@@ -15,7 +16,8 @@
 qt5_use_modules (${INITDEPTS} Network Sql)
 
 target_link_libraries(${INITDEPTS}
-        ${SCOPE_LIB_NAME}
-    )
+  ${SCOPE_LIB_NAME}
+  ${CMAKE_THREAD_LIBS_INIT}
+)
 
 install(TARGETS ${INITDEPTS} DESTINATION sbin)