[openems] 02/02: Drop one patch

[Ruben Undheim]

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

rubund-guest pushed a commit to branch master
in repository openems.

commit 9fe1b5843814ffe2adb6931348ebcc2fc5ce1050
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sun Nov 20 22:06:07 2016 +0000

    Drop one patch
---
 .../patches/0003-Fix-build-issue-in-CSXCAD.patch   | 57 ----------------------
 ...d.patch => 0003-More-things-to-fix-build.patch} |  4 +-
 debian/patches/series                              |  3 +-
 3 files changed, 3 insertions(+), 61 deletions(-)

diff --git a/debian/patches/0003-Fix-build-issue-in-CSXCAD.patch b/debian/patches/0003-Fix-build-issue-in-CSXCAD.patch
deleted file mode 100644
index 84db1b0..0000000
--- a/debian/patches/0003-Fix-build-issue-in-CSXCAD.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: Ruben Undheim <ruben.undheim at gmail.com>
-Date: Fri, 7 Oct 2016 20:25:40 +0200
-Subject: Fix build issue in CSXCAD
-
----
- CSXCAD/CMakeLists.txt     | 2 +-
- CSXCAD/src/CMakeLists.txt | 2 ++
- openEMS/CMakeLists.txt    | 3 ++-
- 3 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/CSXCAD/CMakeLists.txt b/CSXCAD/CMakeLists.txt
-index a349287..5a90f62 100644
---- a/CSXCAD/CMakeLists.txt
-+++ b/CSXCAD/CMakeLists.txt
-@@ -6,7 +6,7 @@ ELSE()
-   SET( CMAKE_BUILD_TYPE Release CACHE STRING "Set to either \"Release\" or \"Debug\"" )
- ENDIF()
- 
--PROJECT(CSXCAD CXX)
-+PROJECT(CSXCAD)
- 
- cmake_minimum_required(VERSION 2.8)
- 
-diff --git a/CSXCAD/src/CMakeLists.txt b/CSXCAD/src/CMakeLists.txt
-index 676546a..2469467 100644
---- a/CSXCAD/src/CMakeLists.txt
-+++ b/CSXCAD/src/CMakeLists.txt
-@@ -85,6 +85,8 @@ set(SOURCES
- # CSXCAD library
- add_library( CSXCAD SHARED ${SOURCES} )
- 
-+INCLUDE_DIRECTORIES(/usr/include/hdf5/serial)
-+
- TARGET_LINK_LIBRARIES( CSXCAD
-   ${fparser_LIBRARIES}
-   ${TinyXML_LIBRARIES}
-diff --git a/openEMS/CMakeLists.txt b/openEMS/CMakeLists.txt
-index 5434138..3ca2bb2 100644
---- a/openEMS/CMakeLists.txt
-+++ b/openEMS/CMakeLists.txt
-@@ -6,7 +6,7 @@ ELSE()
-   SET( CMAKE_BUILD_TYPE Release CACHE STRING "Set to either \"Release\" or \"Debug\"" )
- ENDIF()
- 
--PROJECT(openEMS CXX)
-+PROJECT(openEMS)
- cmake_minimum_required(VERSION 2.8)
- 
- # default
-@@ -165,6 +165,7 @@ ADD_SUBDIRECTORY( FDTD/extensions )
- ADD_SUBDIRECTORY( Common )
- 
- INCLUDE_DIRECTORIES( ${openEMS_SOURCE_DIR} )    #find tools
-+INCLUDE_DIRECTORIES(/usr/include/hdf5/serial)
- 
- message(STATUS "Sources:"  ${SOURCES})
- 
diff --git a/debian/patches/0004-More-things-to-fix-build.patch b/debian/patches/0003-More-things-to-fix-build.patch
similarity index 95%
rename from debian/patches/0004-More-things-to-fix-build.patch
rename to debian/patches/0003-More-things-to-fix-build.patch
index df5ea66..dafe140 100644
--- a/debian/patches/0004-More-things-to-fix-build.patch
+++ b/debian/patches/0003-More-things-to-fix-build.patch
@@ -8,7 +8,7 @@ Subject: More things to fix build
  2 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/CSXCAD/CMakeLists.txt b/CSXCAD/CMakeLists.txt
-index 5a90f62..bf2d7d6 100644
+index a349287..1a21fa9 100644
 --- a/CSXCAD/CMakeLists.txt
 +++ b/CSXCAD/CMakeLists.txt
 @@ -90,9 +90,9 @@ INCLUDE_DIRECTORIES( ${fparser_INCLUDE_DIR} )
@@ -25,7 +25,7 @@ index 5a90f62..bf2d7d6 100644
  ADD_DEFINITIONS( -DH5_USE_16_API )
  
 diff --git a/openEMS/CMakeLists.txt b/openEMS/CMakeLists.txt
-index 3ca2bb2..1f7d19e 100644
+index 5434138..48d3aa1 100644
 --- a/openEMS/CMakeLists.txt
 +++ b/openEMS/CMakeLists.txt
 @@ -108,9 +108,9 @@ find_package(TinyXML REQUIRED)
diff --git a/debian/patches/series b/debian/patches/series
index 21c7e70..f255130 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-Fix-path-to-binaries-for-Debian.patch
 0002-Spelling-fixes.patch
-0003-Fix-build-issue-in-CSXCAD.patch
-0004-More-things-to-fix-build.patch
+0003-More-things-to-fix-build.patch

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