[ignition-transport] 01/01: Removed patches merged upstream

[Jose Luis Rivero]

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

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

commit 3017674d2d9517982a749064e1813da6a47f2d3a
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Tue Nov 17 02:33:06 2015 +0100

    Removed patches merged upstream
---
 debian/patches/0001-c++11_unconditional   | 32 -------------------------------
 debian/patches/0002-c++11-pkgconfig.patch | 14 --------------
 debian/patches/series                     |  2 --
 3 files changed, 48 deletions(-)

diff --git a/debian/patches/0001-c++11_unconditional b/debian/patches/0001-c++11_unconditional
deleted file mode 100644
index 2439a5f..0000000
--- a/debian/patches/0001-c++11_unconditional
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Declare c++11 flag unconditional
-Author: Jose Luis Rivero <jrivero at osrfoundation.org>
-Forwarded: No
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c54c198..40f1cdd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -195,6 +195,7 @@ else()
- 
-   # Unable to be filtered flags (failing due to limitations in filter_valid_compiler_warnings)
-   set(UNFILTERED_FLAGS "-Wc++11-compat")
-+  set(UNFILTERED_FLAGS "-std=c++11")
- endif()
- 
- filter_valid_compiler_warnings(${WARN_LEVEL} -Wextra -Wno-long-long
-diff --git a/cmake/DefaultCFlags.cmake b/cmake/DefaultCFlags.cmake
-index 0903872..aaaaf5b 100644
---- a/cmake/DefaultCFlags.cmake
-+++ b/cmake/DefaultCFlags.cmake
-@@ -36,11 +36,6 @@ set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
- set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
- set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
- 
--# Visual Studio enables c++11 support by default
--if (NOT MSVC)
--  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}} -std=c++11")
--endif()
--
- if (UNIX)
-     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
-     set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
diff --git a/debian/patches/0002-c++11-pkgconfig.patch b/debian/patches/0002-c++11-pkgconfig.patch
deleted file mode 100644
index 1c9e719..0000000
--- a/debian/patches/0002-c++11-pkgconfig.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Declare c++11 flag unconditional
-Author: Jose Luis Rivero <jrivero at osrfoundation.org>
-Forwarded: https://bitbucket.org/ignitionrobotics/ign-transport/pull-request/66
-
-diff --git a/cmake/pkgconfig/ignition.in b/cmake/pkgconfig/ignition.in
-index 11931f4..65b9b23 100644
---- a/cmake/pkgconfig/ignition.in
-+++ b/cmake/pkgconfig/ignition.in
-@@ -7,4 +7,4 @@ Description: A set of @IGN_PROJECT_NAME@ classes for robot applications
- Version: @PROJECT_VERSION_FULL@
- Requires:
- Libs: -L${libdir} -l at PROJECT_NAME_LOWER@
--CFlags: -I${includedir}
-+CFlags: -I${includedir} -std=c++11
diff --git a/debian/patches/series b/debian/patches/series
index a3a0eb4..b6b9d10 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-0001-c++11_unconditional
-0002-c++11-pkgconfig.patch
 0003-respect-cmake-c-flags.patch
 0004_use_system_gtest.patch

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