[ignition-transport] 01/01: Use packaged gtest.

Mon Jun 1 17:24:21 UTC 2015

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

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

commit 58d3766a0e4cf12156cd8344b60ac830103c62fa
Author: Anton Gladky <gladk at debian.org>
Date:   Mon Jun 1 19:09:06 2015 +0200

    Use packaged gtest.
---
 debian/changelog                                |  2 +-
 debian/control                                  |  1 +
 debian/copyright                                | 10 +---------
 debian/files                                    |  3 ---
 debian/patches/0003-respect-cmake-c-flags.patch | 12 ++++++------
 debian/patches/0004_use_system_gtest.patch      | 26 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 debian/watch                                    |  1 +
 8 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 539a54b..d2c0fc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ignition-transport (0.8.1-1) unstable; urgency=medium
+ignition-transport (0.8.1+dfsg1-1) unstable; urgency=medium
 
   * ignition-transport 0.8.1-1 release (Closes: #783520)
 
diff --git a/debian/control b/debian/control
index 923c8df..0570d1d 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends: cmake,
                debhelper (>= 9),
                python,
                ruby-ronn,
+               libgtest-dev,
                libprotoc-dev,
                libprotobuf-dev,
                protobuf-compiler,
diff --git a/debian/copyright b/debian/copyright
index d9e1c6f..376a4e8 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: igntransport
 Upstream-Contact: gazebo-list at gazebosim.org
 Source: https://bitbucket.org/ignitionrobotics/ign-transport
+Files-Excluded: test/gtest
 
 Files: *
 Copyright: 2014 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
        src/urdf/*
 Copyright: 2008, Willow Garage, Inc.
diff --git a/debian/files b/debian/files
deleted file mode 100644
index b91653d..0000000
--- a/debian/files
+++ /dev/null
@@ -1,3 +0,0 @@
-libignition-transport0_0.8.1-1_amd64.deb libs extra
-libignition-transport-dev_0.8.1-1_amd64.deb libdevel extra
-libignition-transport0-dbg_0.8.1-1_amd64.deb debug extra
diff --git a/debian/patches/0003-respect-cmake-c-flags.patch b/debian/patches/0003-respect-cmake-c-flags.patch
index ab851da..9c5baac 100644
--- a/debian/patches/0003-respect-cmake-c-flags.patch
+++ b/debian/patches/0003-respect-cmake-c-flags.patch
@@ -2,11 +2,11 @@ Description: do not unset CMAKE_C*_FLAGS
 Author: Jose Luis Rivero <jrivero at osrfoundation.org>
 Forwarded: no
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 63ea6f7..d5406f9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -181,8 +181,6 @@ endif()
+Index: ignition-transport-0.8.1/CMakeLists.txt
+===================================================================
+--- ignition-transport-0.8.1.orig/CMakeLists.txt
++++ ignition-transport-0.8.1/CMakeLists.txt
+@@ -159,8 +159,6 @@ endif()
  
  #####################################
  # Handle CFlags
@@ -15,7 +15,7 @@ index 63ea6f7..d5406f9 100644
  
  # USE_HOST_CFLAGS (default TRUE)
  # Will check building host machine for proper cflags
-@@ -201,6 +199,10 @@ filter_valid_compiler_warnings(${WARN_LEVEL} -Wextra -Wno-long-long
+@@ -202,6 +200,10 @@ filter_valid_compiler_warnings(${WARN_LE
    -Wno-unused-value -Wno-unused-value -Wno-unused-value -Wno-unused-value
    -Wfloat-equal -Wshadow -Winit-self -Wswitch-default
    -Wmissing-include-dirs -pedantic -Wno-pragmas)
diff --git a/debian/patches/0004_use_system_gtest.patch b/debian/patches/0004_use_system_gtest.patch
new file mode 100644
index 0000000..22e9b60
--- /dev/null
+++ b/debian/patches/0004_use_system_gtest.patch
@@ -0,0 +1,26 @@
+Description: Use system packaged gtest
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2015-06-01
+
+--- ignition-transport-0.8.1+dfsg1.orig/test/CMakeLists.txt
++++ ignition-transport-0.8.1+dfsg1/test/CMakeLists.txt
+@@ -1,15 +1,13 @@
+ include_directories (
+-  ${PROJECT_SOURCE_DIR}/test/gtest/include
+-  ${PROJECT_SOURCE_DIR}/test/gtest
+-  ${PROJECT_SOURCE_DIR}/test
+-  ${PROJECT_BINARY_DIR}
++  /usr/include
++  /usr/src/gtest
+ )
+ 
+ configure_file (test_config.h.in ${PROJECT_BINARY_DIR}/include/ignition/transport/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 6a6288d..a3a0eb4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-c++11_unconditional
 0002-c++11-pkgconfig.patch
 0003-respect-cmake-c-flags.patch
+0004_use_system_gtest.patch
diff --git a/debian/watch b/debian/watch
index 58803d7..2a90c78 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
+opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$// \
 http://gazebosim.org/distributions/ign-transport/releases/ .*ignition-transport-(\d\.\d\.\d)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

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

