[magics] 01/04: Refresh patches: - compile-fixes.patch: fixed upstream
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Mar 22 17:34:24 UTC 2016
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository magics.
commit c8d4de64910d6814e606e2846752bd47c6f9986a
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Fri Mar 18 11:04:38 2016 +0000
Refresh patches:
- compile-fixes.patch: fixed upstream
---
debian/changelog | 2 ++
debian/patches/cmake-config.patch | 8 ++++----
debian/patches/compile-fixes.patch | 15 ---------------
debian/patches/pkgconfig-fix.patch | 14 +++++++-------
debian/patches/reproducibility.patch | 18 +++++++++---------
debian/patches/series | 1 -
debian/patches/soname-version.patch | 18 +++++++++---------
debian/patches/terralib.patch | 12 ++++++------
8 files changed, 37 insertions(+), 51 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 59d233c..54b1374 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
magics++ (2.28.0-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Refresh patches:
+ - compile-fixes.patch: fixed upstream
-- Alastair McKinstry <mckinstry at debian.org> Fri, 18 Mar 2016 10:44:16 +0000
diff --git a/debian/patches/cmake-config.patch b/debian/patches/cmake-config.patch
index bc67fa6..b505b7c 100644
--- a/debian/patches/cmake-config.patch
+++ b/debian/patches/cmake-config.patch
@@ -3,11 +3,11 @@ Description: Ensure /usr/include/magics on include path in Metview
Last-Updated: 2016-01-09
Forwarded: not-needed
-Index: magics++-2.26.2/cmake/project-config.cmake.in
+Index: magics++-2.28.0/cmake/project-config.cmake.in
===================================================================
---- magics++-2.26.2.orig/cmake/project-config.cmake.in
-+++ magics++-2.26.2/cmake/project-config.cmake.in
-@@ -17,7 +17,7 @@
+--- magics++-2.28.0.orig/cmake/project-config.cmake.in
++++ magics++-2.28.0/cmake/project-config.cmake.in
+@@ -19,7 +19,7 @@
get_filename_component(@PNAME at _CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
diff --git a/debian/patches/compile-fixes.patch b/debian/patches/compile-fixes.patch
deleted file mode 100644
index c61857b..0000000
--- a/debian/patches/compile-fixes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: magics++-2.26.2/src/drivers/CairoDriver.cc
-===================================================================
---- magics++-2.26.2.orig/src/drivers/CairoDriver.cc
-+++ magics++-2.26.2/src/drivers/CairoDriver.cc
-@@ -539,8 +539,8 @@ MAGICS_NO_EXPORT void CairoDriver::write
-
- // DPI
- TIFFSetField(tif, TIFFTAG_RESOLUTIONUNIT, RESUNIT_INCH);
-- TIFFSetField(tif, TIFFTAG_XRESOLUTION, (float) resolution_);
-- TIFFSetField(tif, TIFFTAG_YRESOLUTION, (float) resolution_);
-+ // TIFFSetField(tif, TIFFTAG_XRESOLUTION, (float) resolution_);
-+ // TIFFSetField(tif, TIFFTAG_YRESOLUTION, (float) resolution_);
-
- unsigned char *buf;
- if (TIFFScanlineSize(tif))
diff --git a/debian/patches/pkgconfig-fix.patch b/debian/patches/pkgconfig-fix.patch
index 3d34031..edf5f55 100644
--- a/debian/patches/pkgconfig-fix.patch
+++ b/debian/patches/pkgconfig-fix.patch
@@ -3,10 +3,10 @@ Description: Need args for ecbuild_pkgconfig() to work
Last-Updated: 2016-01-09
Forwarded: no
-Index: magics++-2.26.2/cmake/ecbuild_pkgconfig.cmake
+Index: magics++-2.28.0/cmake/ecbuild_pkgconfig.cmake
===================================================================
---- magics++-2.26.2.orig/cmake/ecbuild_pkgconfig.cmake
-+++ magics++-2.26.2/cmake/ecbuild_pkgconfig.cmake
+--- magics++-2.28.0.orig/cmake/ecbuild_pkgconfig.cmake
++++ magics++-2.28.0/cmake/ecbuild_pkgconfig.cmake
@@ -12,8 +12,11 @@
# to CMake variable ${dependencies}
function( ecbuild_library_dependencies dependencies libraries )
@@ -19,11 +19,11 @@ Index: magics++-2.26.2/cmake/ecbuild_pkgconfig.cmake
foreach( _lib ${_libraries})
unset( _location )
-Index: magics++-2.26.2/CMakeLists.txt
+Index: magics++-2.28.0/CMakeLists.txt
===================================================================
---- magics++-2.26.2.orig/CMakeLists.txt
-+++ magics++-2.26.2/CMakeLists.txt
-@@ -326,7 +326,12 @@ ecbuild_add_resources( TARGET internal
+--- magics++-2.28.0.orig/CMakeLists.txt
++++ magics++-2.28.0/CMakeLists.txt
+@@ -330,7 +330,12 @@ ecbuild_add_resources( TARGET internal
set( MAGICS_DESCRIPTION "Multi-platform meteorological graphics library" )
set( MAGICS_URL "https://software.ecmwf.int/wiki/display/MAGP/Magics" )
diff --git a/debian/patches/reproducibility.patch b/debian/patches/reproducibility.patch
index c6013b2..6b6e055 100644
--- a/debian/patches/reproducibility.patch
+++ b/debian/patches/reproducibility.patch
@@ -7,10 +7,10 @@ Bugs-Debian: https://bugs.debian.org/792824
Last-Updated: 2016-01-07
Forwarded: no
-Index: magics++-2.26.2/tools/xml2cc_new.pl
+Index: magics++-2.28.0/tools/xml2cc_new.pl
===================================================================
---- magics++-2.26.2.orig/tools/xml2cc_new.pl
-+++ magics++-2.26.2/tools/xml2cc_new.pl
+--- magics++-2.28.0.orig/tools/xml2cc_new.pl
++++ magics++-2.28.0/tools/xml2cc_new.pl
@@ -167,7 +167,6 @@ foreach my $object (keys %{$info->{magic
This file is automatically generated.
Do Not Edit!
@@ -27,10 +27,10 @@ Index: magics++-2.26.2/tools/xml2cc_new.pl
*/
#include "$object\Attributes.h"
-Index: magics++-2.26.2/tools/xml2cc.pl
+Index: magics++-2.28.0/tools/xml2cc.pl
===================================================================
---- magics++-2.26.2.orig/tools/xml2cc.pl
-+++ magics++-2.26.2/tools/xml2cc.pl
+--- magics++-2.28.0.orig/tools/xml2cc.pl
++++ magics++-2.28.0/tools/xml2cc.pl
@@ -3,6 +3,11 @@
use XML::Parser;
@@ -52,10 +52,10 @@ Index: magics++-2.26.2/tools/xml2cc.pl
{
print "#include \"$i.h\"\n";
-Index: magics++-2.26.2/tools/xml2mv.pl
+Index: magics++-2.28.0/tools/xml2mv.pl
===================================================================
---- magics++-2.26.2.orig/tools/xml2mv.pl
-+++ magics++-2.26.2/tools/xml2mv.pl
+--- magics++-2.28.0.orig/tools/xml2mv.pl
++++ magics++-2.28.0/tools/xml2mv.pl
@@ -3,9 +3,12 @@
use XML::Parser;
diff --git a/debian/patches/series b/debian/patches/series
index 10e68fa..765f5d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
terralib.patch
soname-version.patch
reproducibility.patch
-compile-fixes.patch
pkgconfig-fix.patch
cmake-config.patch
diff --git a/debian/patches/soname-version.patch b/debian/patches/soname-version.patch
index 54a0be8..6a6aa83 100644
--- a/debian/patches/soname-version.patch
+++ b/debian/patches/soname-version.patch
@@ -3,10 +3,10 @@ Description: Add versioned soname for Debian.
Forwarded: no
Last-Updated: 2015-06-19
-Index: magics++-2.26.2/src/CMakeLists.txt
+Index: magics++-2.28.0/src/CMakeLists.txt
===================================================================
---- magics++-2.26.2.orig/src/CMakeLists.txt
-+++ magics++-2.26.2/src/CMakeLists.txt
+--- magics++-2.28.0.orig/src/CMakeLists.txt
++++ magics++-2.28.0/src/CMakeLists.txt
@@ -122,6 +122,9 @@ ecbuild_add_library( TARGET MagPlus
${common_templates}
DEFINITIONS
@@ -36,16 +36,16 @@ Index: magics++-2.26.2/src/CMakeLists.txt
TYPE SHARED )
if ( BUILD_SHARED_LIBS STREQUAL "BOTH" )
-Index: magics++-2.26.2/cmake/ecbuild_add_library.cmake
+Index: magics++-2.28.0/cmake/ecbuild_add_library.cmake
===================================================================
---- magics++-2.26.2.orig/cmake/ecbuild_add_library.cmake
-+++ magics++-2.26.2/cmake/ecbuild_add_library.cmake
-@@ -133,7 +133,7 @@
+--- magics++-2.28.0.orig/cmake/ecbuild_add_library.cmake
++++ magics++-2.28.0/cmake/ecbuild_add_library.cmake
+@@ -148,7 +148,7 @@
function( ecbuild_add_library_impl )
set( options NOINSTALL AUTO_VERSION )
- set( single_value_args TARGET TYPE COMPONENT INSTALL_HEADERS INSTALL_HEADERS_REGEX LINKER_LANGUAGE HEADER_DESTINATION VERSION OUTPUT_NAME )
-+ set( single_value_args TARGET TYPE COMPONENT INSTALL_HEADERS INSTALL_HEADERS_REGEX LINKER_LANGUAGE HEADER_DESTINATION VERSION SONAME SOVERSION OUTPUT_NAME )
- set( multi_value_args SOURCES TEMPLATES LIBS INCLUDES PRIVATE_INCLUDES PUBLIC_INCLUDES DEPENDS PERSISTENT DEFINITIONS INSTALL_HEADERS_LIST CFLAGS CXXFLAGS FFLAGS GENERATED CONDITION )
++ set( single_value_args TARGET TYPE COMPONENT INSTALL_HEADERS INSTALL_HEADERS_REGEX LINKER_LANGUAGE HEADER_DESTINATION VERSION OUTPUT_NAME SONAME SOVERSION)
+ set( multi_value_args SOURCES SOURCES_GLOB SOURCES_EXCLUDE_REGEX OBJECTS TEMPLATES LIBS INCLUDES PRIVATE_INCLUDES PUBLIC_INCLUDES DEPENDS PERSISTENT DEFINITIONS INSTALL_HEADERS_LIST CFLAGS CXXFLAGS FFLAGS GENERATED CONDITION )
cmake_parse_arguments( _PAR "${options}" "${single_value_args}" "${multi_value_args}" ${_FIRST_ARG} ${ARGN} )
diff --git a/debian/patches/terralib.patch b/debian/patches/terralib.patch
index d9b9dee..b6d18ec 100644
--- a/debian/patches/terralib.patch
+++ b/debian/patches/terralib.patch
@@ -3,10 +3,10 @@ Description: Add Debians libterralib, rather than built-in version
Last-Updated: 2015-06-19
Forwarded: not-needed
-Index: magics++-2.26.2/src/CMakeLists.txt
+Index: magics++-2.28.0/src/CMakeLists.txt
===================================================================
---- magics++-2.26.2.orig/src/CMakeLists.txt
-+++ magics++-2.26.2/src/CMakeLists.txt
+--- magics++-2.28.0.orig/src/CMakeLists.txt
++++ magics++-2.28.0/src/CMakeLists.txt
@@ -92,7 +92,6 @@ add_subdirectory( web )
add_subdirectory( visualisers )
add_subdirectory( drivers )
@@ -41,10 +41,10 @@ Index: magics++-2.26.2/src/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/libMagWrapper )
-@@ -226,18 +220,6 @@ if( metview )
- FixedTableModeAttributes.h
+@@ -229,18 +223,6 @@ if( metview )
+ QtDriverAttributes.h)
+ endif()
- )
- install( FILES terralib/kernel/TeProjection.h
- terralib/kernel/TeCoord2D.h
- terralib/kernel/TeDefines.h
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/magics.git
More information about the debian-science-commits
mailing list