[magics] 17/23: refresh patches

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository magics.

commit 40970c9fc2163ee1961a4b71f3df8962fa8dcc2a
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Jun 18 12:23:11 2015 +0100

    refresh patches
---
 debian/patches/grib-cmake.patch     | 10 +++++-----
 debian/patches/soname-version.patch | 34 +++++++++++++++-------------------
 debian/patches/terralib.patch       | 24 ++++++++++++------------
 3 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/debian/patches/grib-cmake.patch b/debian/patches/grib-cmake.patch
index d3a2e96..0a51a3b 100644
--- a/debian/patches/grib-cmake.patch
+++ b/debian/patches/grib-cmake.patch
@@ -3,12 +3,12 @@ Description: Disable ecbuild for grib_api, as not shipped with Debian yet.
 Last-Updated: 2014-09-12
 Forwarded: not-needed
 
-Index: magics++-2.22.7/CMakeLists.txt
+Index: magics++-2.24.4/CMakeLists.txt
 ===================================================================
---- magics++-2.22.7.orig/CMakeLists.txt
-+++ magics++-2.22.7/CMakeLists.txt
-@@ -95,9 +95,9 @@ endif()
- ### grib
+--- magics++-2.24.4.orig/CMakeLists.txt
++++ magics++-2.24.4/CMakeLists.txt
+@@ -104,9 +104,9 @@ endif()
+ #cmake_add_cxx_flags("-gdwarf-2")
  
  set( grib no )
 -if( ENABLE_GRIB )
diff --git a/debian/patches/soname-version.patch b/debian/patches/soname-version.patch
index 6e25c38..1165e73 100644
--- a/debian/patches/soname-version.patch
+++ b/debian/patches/soname-version.patch
@@ -1,26 +1,22 @@
 Author: Alastair McKinstry <mckinstry at debian.org>
 Description: Add versioned soname for Debian.
 Forwarded: no
-Last-Updated: 2014-09-13
+Last-Updated: 2015-06-19
 
-Index: magics++-2.22.7.dfsg.1/src/CMakeLists.txt
+Index: magics++-2.24.4/src/CMakeLists.txt
 ===================================================================
---- magics++-2.22.7.dfsg.1.orig/src/CMakeLists.txt
-+++ magics++-2.22.7.dfsg.1/src/CMakeLists.txt
-@@ -85,7 +85,6 @@ endif()
- if( MAGICS_ODB )
- 	add_subdirectory( oda )
- endif()
--
- ecbuild_add_library( TARGET    MagPlusSingle 
- 		     SOURCES MagicsSingle.cc
- 		     INCLUDES  ${CMAKE_CURRENT_SOURCE_DIR}/common
-@@ -119,7 +118,7 @@ ecbuild_add_library( TARGET    MagPlusSh
-                         ${MAGICS_EXTRA_LIBRARIES}
- 		            TYPE SHARED		     
-                     )
+--- magics++-2.24.4.orig/src/CMakeLists.txt
++++ magics++-2.24.4/src/CMakeLists.txt
+@@ -142,9 +142,9 @@ ecbuild_add_library(TARGET    MagPlusDou
+ 		     SOURCES MagicsDouble.cc
+ 		     TYPE SHARED)		     
+ 
 -SET_TARGET_PROPERTIES(MagPlusShared PROPERTIES OUTPUT_NAME "MagPlus")
+-SET_TARGET_PROPERTIES(MagPlusDoubleShared PROPERTIES OUTPUT_NAME "MagPlusDouble")
+-SET_TARGET_PROPERTIES(MagPlusSingleShared PROPERTIES OUTPUT_NAME "MagPlusSingle")
 +SET_TARGET_PROPERTIES(MagPlusShared PROPERTIES OUTPUT_NAME "MagPlus" VERSION 3.0.0 SOVERSION 3)
- if ( ENABLE_STATIC_LIBRARY ) 	     
- ecbuild_add_library( TARGET    MagPlusStatic
-                      DEPENDS   magics_params
++SET_TARGET_PROPERTIES(MagPlusDoubleShared PROPERTIES OUTPUT_NAME "MagPlusDouble" VERSION 3.0.0 SOVERSION 3)
++SET_TARGET_PROPERTIES(MagPlusSingleShared PROPERTIES OUTPUT_NAME "MagPlusSingle" VERSION 3.0.0 SOVERSION 3)
+ 
+ 
+ 
diff --git a/debian/patches/terralib.patch b/debian/patches/terralib.patch
index 02c8533..9e73daf 100644
--- a/debian/patches/terralib.patch
+++ b/debian/patches/terralib.patch
@@ -1,13 +1,13 @@
 Author: Alastair McKinstry <mckinstry at debian.org>
 Description: Add Debians libterralib, rather than built-in version
-Last-Updated: 2014-08-25
+Last-Updated: 2015-06-19
 Forwarded: not-needed
 
-Index: magics++-2.22.7/src/CMakeLists.txt
+Index: magics++-2.24.4/src/CMakeLists.txt
 ===================================================================
---- magics++-2.22.7.orig/src/CMakeLists.txt
-+++ magics++-2.22.7/src/CMakeLists.txt
-@@ -75,7 +75,6 @@ add_subdirectory( web )
+--- magics++-2.24.4.orig/src/CMakeLists.txt
++++ magics++-2.24.4/src/CMakeLists.txt
+@@ -97,7 +97,6 @@ add_subdirectory( web )
  add_subdirectory( visualisers )
  add_subdirectory( drivers )
  add_subdirectory( decoders )
@@ -15,7 +15,7 @@ Index: magics++-2.22.7/src/CMakeLists.txt
  add_subdirectory( eckit_readers )
  
  if( metview )
-@@ -109,7 +108,6 @@ ecbuild_add_library( TARGET    MagPlusSh
+@@ -123,7 +122,6 @@ ecbuild_add_library( TARGET    MagPlusSh
                          ${drivers_srcs}
                          ${qt_srcs}
                          ${decoders_srcs}
@@ -23,7 +23,7 @@ Index: magics++-2.22.7/src/CMakeLists.txt
                          ${odb_srcs}
                       TEMPLATES
                          ${common_templates}
-@@ -134,7 +132,6 @@ ecbuild_add_library( TARGET    MagPlusSt
+@@ -165,7 +163,6 @@ ecbuild_add_library( TARGET    MagPlusSt
                          ${drivers_srcs}
                          ${qt_srcs}
                          ${decoders_srcs}
@@ -31,17 +31,17 @@ Index: magics++-2.22.7/src/CMakeLists.txt
                          ${odb_srcs}
                       TEMPLATES
                          ${common_templates}
-@@ -168,9 +165,6 @@ if( metview )
+@@ -201,9 +198,6 @@ if( metview )
                          ${CMAKE_CURRENT_SOURCE_DIR}/visualisers
                          ${CMAKE_CURRENT_SOURCE_DIR}/drivers
                          ${CMAKE_CURRENT_SOURCE_DIR}/decoders
 -                        ${CMAKE_CURRENT_SOURCE_DIR}/terralib
 -                        ${CMAKE_CURRENT_SOURCE_DIR}/terralib/kernel
 -                        ${CMAKE_CURRENT_SOURCE_DIR}/terralib/utils 
-                         ${CMAKE_CURRENT_SOURCE_DIR}/libMagWrapper
-                     LIBS
-                         ${MAGICS_EXTRA_LIBRARIES}
-@@ -197,18 +191,6 @@ if( metview )
+                         ${CMAKE_CURRENT_SOURCE_DIR}/libMagWrapper )
+                         
+   ecbuild_add_library( TARGET    MagWrapper
+@@ -239,18 +233,6 @@ if( metview )
  
  				)
     install( FILES magics.h  DESTINATION ${INSTALL_INCLUDE_DIR})

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