[ignition-math2] 01/02: Use system packaged gtest.

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository ignition-math2.

commit f6e1a8e103863f0b983ce08e5db4846b29512d62
Author: Anton Gladky <gladk at debian.org>
Date:   Mon Jun 1 17:33:30 2015 +0200

    Use system packaged gtest.
---
 debian/changelog                           | 10 ++--------
 debian/control                             |  1 +
 debian/copyright                           | 10 +---------
 debian/patches/0002_use_system_gtest.patch | 27 +++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 5 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0d63b1d..f99a1af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,5 @@
-ignition-math2 (2.1.1-1) unstable; urgency=medium
+ignition-math2 (2.1.1+dfsg1-1) unstable; urgency=medium
 
-  * Imported Upstream version 2.1.1
+  * Imported Upstream version 2.1.1 (Closes: #783522)
 
  -- Jose Luis Rivero <jrivero at osrfoundation.org>  Mon, 01 Jun 2015 02:13:50 +0200
-
-ignition-math2 (2.0.2-1) unstable; urgency=medium
-
-  * ignition-math2 2.0.2-1 release (Closes: #783522)
-
- -- Jose Luis Rivero <jrivero at osrfoundation.org>  Thu, 02 Apr 2015 01:43:15 +0200
diff --git a/debian/control b/debian/control
index 45291c5..6aa54b8 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Priority: extra
 Testsuite: autopkgtest
 Build-Depends: cmake,
                debhelper (>= 9),
+               libgtest-dev,
                python,
                ruby-ronn
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/ign-math.git
diff --git a/debian/copyright b/debian/copyright
index c421668..7c4316a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,21 +2,13 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ignmath
 Upstream-Contact: gazebo-list at gazebosim.org
 Source: https://bitbucket.org/ignitionrobotics/ign_math
+Files-Excluded: test/gtest
 
 Files: *
 Copyright: 2014-2015 Open Source Robotics Foundation
 License: Apache
  See '/usr/share/common-licenses/Apache-2.0'.
 
-Files: test/gtest/*
-Copyright: 2003, Google Inc.
-           2005, Google Inc.
-           2006, Google Inc.
-           2007, Google Inc.
-           2008, Google Inc.
-           2009, Google Inc.
-License: BSD-3-clause
-
 Files: tools/check_test_ran.py
 Copyright: 2008, Willow Garage, Inc.
 License: BSD-3-clause
diff --git a/debian/patches/0002_use_system_gtest.patch b/debian/patches/0002_use_system_gtest.patch
new file mode 100644
index 0000000..775bc70
--- /dev/null
+++ b/debian/patches/0002_use_system_gtest.patch
@@ -0,0 +1,27 @@
+Description: Use system packaged gtest
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2015-06-01
+
+Index: ignition-math2-2.1.1/test/CMakeLists.txt
+===================================================================
+--- ignition-math2-2.1.1.orig/test/CMakeLists.txt
++++ ignition-math2-2.1.1/test/CMakeLists.txt
+@@ -1,14 +1,14 @@
+ include_directories (
+-  ${PROJECT_SOURCE_DIR}/test/gtest/include
+-  ${PROJECT_SOURCE_DIR}/test/gtest
++  /usr/include
++  /usr/src/gtest
+   ${PROJECT_SOURCE_DIR}/test
+ )
+ 
+ configure_file (test_config.h.in ${PROJECT_BINARY_DIR}/test_config.h)
+ 
+ # Build gtest
+-add_library(gtest STATIC gtest/src/gtest-all.cc)
+-add_library(gtest_main STATIC gtest/src/gtest_main.cc)
++add_library(gtest STATIC /usr/src/gtest/src/gtest-all.cc)
++add_library(gtest_main STATIC /usr/src/gtest/src/gtest_main.cc)
+ target_link_libraries(gtest_main gtest)
+ set(GTEST_LIBRARY "${PROJECT_BINARY_DIR}/test/libgtest.a")
+ set(GTEST_MAIN_LIBRARY "${PROJECT_BINARY_DIR}/test/libgtest_main.a")
diff --git a/debian/patches/series b/debian/patches/series
index 667a3d8..d873eff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-c++11-unconditional.patch
+0002_use_system_gtest.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ignition-math2.git