[med-svn] [charls] 07/10: Refresh patches

[Andreas Tille]

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

tille pushed a commit to branch master
in repository charls.

commit 21135792010b23025c8a2ead221fc9486df6e638
Author: Andreas Tille <tille at debian.org>
Date:   Thu May 19 17:36:52 2016 +0200

    Refresh patches
---
 debian/patches/charls_add_cmake_install_target.patch | 10 ++++------
 debian/patches/charls_add_sharedlib_soname.patch     | 10 ++++------
 debian/patches/charls_fix_tests.patch                |  4 ++--
 debian/patches/fix_EncoderStrategy.patch             |  4 ++--
 debian/patches/stl_symbols_hack.patch                |  6 +++---
 5 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/debian/patches/charls_add_cmake_install_target.patch b/debian/patches/charls_add_cmake_install_target.patch
index ab36718..2d440cb 100644
--- a/debian/patches/charls_add_cmake_install_target.patch
+++ b/debian/patches/charls_add_cmake_install_target.patch
@@ -2,11 +2,9 @@ Description: Fix broken installation rules
 Forwarded: not-needed
 Author: Mathieu Malaterre <malat at debian.org>
 
-Index: charls-1.0/CMakeLists.txt
-===================================================================
---- charls-1.0.orig/CMakeLists.txt	2011-04-27 21:06:40.000000000 +0200
-+++ charls-1.0/CMakeLists.txt	2011-04-27 21:06:42.000000000 +0200
-@@ -12,6 +12,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -12,6 +12,11 @@ SET(CMAKE_CXX_FLAGS "-D NDEBUG -O3" )
  ENDIF(CMAKE_COMPILER_IS_GNUCC)
  ENDIF(NOT CMAKE_BUILD_TYPE)
  
@@ -18,7 +16,7 @@ Index: charls-1.0/CMakeLists.txt
  OPTION(charls_BUILD_SHARED_LIBS "Build CharLS with shared libraries." OFF)
  SET(BUILD_SHARED_LIBS ${charls_BUILD_SHARED_LIBS})
  
-@@ -21,3 +26,7 @@
+@@ -21,3 +26,7 @@ add_library(CharLS header.cpp  interface
  add_executable(charlstest test/main.cpp test/time.cpp test/util.cpp test/bitstreamdamage.cpp test/compliance.cpp test/performance.cpp test/dicomsamples.cpp)
  target_link_libraries (charlstest CharLS)
  
diff --git a/debian/patches/charls_add_sharedlib_soname.patch b/debian/patches/charls_add_sharedlib_soname.patch
index 5ae848e..4e7528e 100644
--- a/debian/patches/charls_add_sharedlib_soname.patch
+++ b/debian/patches/charls_add_sharedlib_soname.patch
@@ -2,11 +2,9 @@ Description: Fix broken SOVERSION rules
 Forwarded: not-needed
 Author: Mathieu Malaterre <malat at debian.org>
 
-Index: charls-1.0/CMakeLists.txt
-===================================================================
---- charls-1.0.orig/CMakeLists.txt	2013-06-09 17:37:59.930503819 +0200
-+++ charls-1.0/CMakeLists.txt	2013-06-09 17:39:15.794503768 +0200
-@@ -20,8 +20,23 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,8 +20,23 @@ SET( charls_HEADERS "colortransform.h"
  OPTION(charls_BUILD_SHARED_LIBS "Build CharLS with shared libraries." OFF)
  SET(BUILD_SHARED_LIBS ${charls_BUILD_SHARED_LIBS})
  
@@ -31,7 +29,7 @@ Index: charls-1.0/CMakeLists.txt
  
  add_executable(charlstest test/main.cpp test/time.cpp test/util.cpp test/bitstreamdamage.cpp test/compliance.cpp test/performance.cpp test/dicomsamples.cpp)
  target_link_libraries (charlstest CharLS)
-@@ -29,4 +44,8 @@
+@@ -29,4 +44,8 @@ target_link_libraries (charlstest CharLS
  # Installs the header files into the {build_dir}/include/libcharls directory
  install(FILES ${charls_HEADERS} DESTINATION include/CharLS)
  
diff --git a/debian/patches/charls_fix_tests.patch b/debian/patches/charls_fix_tests.patch
index ce01719..a9a8217 100644
--- a/debian/patches/charls_fix_tests.patch
+++ b/debian/patches/charls_fix_tests.patch
@@ -2,8 +2,8 @@ Description: Fix broken test
 Forwarded: not-needed
 Author: Mathieu Malaterre <malat at debian.org>
 
---- charls-1.0.orig/defaulttraits.h
-+++ charls-1.0/defaulttraits.h
+--- a/defaulttraits.h
++++ b/defaulttraits.h
 @@ -2,7 +2,7 @@
  // (C) Jan de Vaan 2007-2010, all rights reserved. See the accompanying "License.txt" for licensed use. 
  // 
diff --git a/debian/patches/fix_EncoderStrategy.patch b/debian/patches/fix_EncoderStrategy.patch
index 9268274..8924dfc 100644
--- a/debian/patches/fix_EncoderStrategy.patch
+++ b/debian/patches/fix_EncoderStrategy.patch
@@ -6,8 +6,8 @@ Bug-Debian: https://bugs.debian.org/816607
 Origin: upstream, https://github.com/team-charls/charls/commit/73d351f2df2ca267db35574ffb7a1398a6afb004
 Reviewed-By: Mathieu Malaterre <malat at debian.org>
 
---- charls-1.0.orig/encoderstrategy.h
-+++ charls-1.0/encoderstrategy.h
+--- a/encoderstrategy.h
++++ b/encoderstrategy.h
 @@ -75,9 +75,15 @@ protected:
  			return;
  		}
diff --git a/debian/patches/stl_symbols_hack.patch b/debian/patches/stl_symbols_hack.patch
index 3b53167..eba3e12 100644
--- a/debian/patches/stl_symbols_hack.patch
+++ b/debian/patches/stl_symbols_hack.patch
@@ -1,8 +1,8 @@
 Description: Rework the symbol file to hide stl exported symbols
 Author: Mathieu Malaterre <malat at debian.org>
 
---- charls-1.0.orig/CMakeLists.txt
-+++ charls-1.0/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -34,6 +34,7 @@ IF(BUILD_SHARED_LIBS)
                                SOVERSION ${CHARLS_LIB_MAJOR_VERSION}
                                ) 
@@ -12,7 +12,7 @@ Author: Mathieu Malaterre <malat at debian.org>
  
  ENDIF(BUILD_SHARED_LIBS)
 --- /dev/null
-+++ charls-1.0/exports.version
++++ b/exports.version
 @@ -0,0 +1,6 @@
 +{
 +global:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/charls.git