Merge lp:~didrocks/unity/add-gtest-build-dep into lp:unity

[Didier Roche]

Readd gtests to the testsuite back now that google-mock is in main. Add libgtests and google-mock to the package build-deps then.

Readd gtests to the testsuite back now that google-mock is in main. Add libgtests and google-mock to the package build-deps then.

[Francis Ginther (fginther)]

This resolves https://bugs.launchpad.net/unity/+bug/1076763, please link and add to changelog.

review: Needs Fixing

[Didier Roche (didrocks)]

pushed

[Francis Ginther (fginther)]

The bug ref should be 1076763.

review: Needs Fixing

[Francis Ginther (fginther)]

Approved.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
No commit message was specified.

review: Needs Fixing (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-11-08 21:24:33 +0000
+++ CMakeLists.txt	2012-11-09 10:29:20 +0000
@@ -182,17 +182,13 @@
   "Path to Google test srcs"
 )
 
-# Commenting out the following block added in rev 2884 which is causing
-#   builds to break in launchpad.
-# This requires dependencies on libgtest-dev and google-mock which are not
-#   specified in the packaging.
-#set(
-#  GTEST_INCLUDE_DIR
-#  "/usr/include/gtest"
-#  CACHE
-#  PATH
-#  "Path to Google tests include"
-#)
+set(
+  GTEST_INCLUDE_DIR
+  "/usr/include/gtest"
+  CACHE
+  PATH
+  "Path to Google tests include"
+)
 
 find_path(GTEST_INCLUDE_DIR gtest/gtest.h)
 if (GTEST_INCLUDE_DIR)

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-06 18:19:09 +0000
+++ debian/changelog	2012-11-09 10:29:20 +0000
@@ -1,8 +1,14 @@
 unity (6.10.0-0ubuntu3) UNRELEASED; urgency=low
 
+  [ Michael Terry ]
   * debian/control:
     - Update Vcs-Bzr
 
+  [ Didier Roche ]
+  * debian/control:
+    - adding libgtest-dev and google-mock build-dep now that there are in main
+      (LP: #1076763)
+
  -- Michael Terry <[e-mail]>  Tue, 06 Nov 2012 10:52:43 -0500
 
 unity (6.10.0-0ubuntu2) quantal-proposed; urgency=low

=== modified file 'debian/control'
--- debian/control	2012-11-06 18:19:09 +0000
+++ debian/control	2012-11-09 10:29:20 +0000
@@ -43,6 +43,8 @@
                libxfixes-dev (>= 1:5.0-4ubuntu4),
                gcc-4.6,
                g++-4.6,
+               libgtest-dev,
+               google-mock,
 Standards-Version: 3.9.3
 Homepage: https://launchpad.net/unity
 # If you aren't a member of ~unity-team but need to upload packaging changes,