[med-svn] r6684 - in trunk/packages/charls/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-04-27 19:07:43 +0000 (Wed, 27 Apr 2011)
New Revision: 6684

Modified:
   trunk/packages/charls/trunk/debian/patches/charls_add_cmake_install_target.patch
   trunk/packages/charls/trunk/debian/patches/charls_add_sharedlib_soname.patch
   trunk/packages/charls/trunk/debian/patches/charls_fix_tests.patch
   trunk/packages/charls/trunk/debian/rules
Log:
Make sure to have unix eol

Modified: trunk/packages/charls/trunk/debian/patches/charls_add_cmake_install_target.patch
===================================================================
--- trunk/packages/charls/trunk/debian/patches/charls_add_cmake_install_target.patch	2011-04-27 18:58:21 UTC (rev 6683)
+++ trunk/packages/charls/trunk/debian/patches/charls_add_cmake_install_target.patch	2011-04-27 19:07:43 UTC (rev 6684)
@@ -1,8 +1,8 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8304f0d..88f0949 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -12,6 +12,11 @@ SET(CMAKE_CXX_FLAGS "-D NDEBUG -O3" )
+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 @@
  ENDIF(CMAKE_COMPILER_IS_GNUCC)
  ENDIF(NOT CMAKE_BUILD_TYPE)
  
@@ -14,7 +14,7 @@
  OPTION(charls_BUILD_SHARED_LIBS "Build CharLS with shared libraries." OFF)
  SET(BUILD_SHARED_LIBS ${charls_BUILD_SHARED_LIBS})
  
-@@ -21,3 +26,7 @@ add_library(CharLS header.cpp  interface.cpp  jpegls.cpp  )
+@@ -21,3 +26,7 @@
  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)
  

Modified: trunk/packages/charls/trunk/debian/patches/charls_add_sharedlib_soname.patch
===================================================================
--- trunk/packages/charls/trunk/debian/patches/charls_add_sharedlib_soname.patch	2011-04-27 18:58:21 UTC (rev 6683)
+++ trunk/packages/charls/trunk/debian/patches/charls_add_sharedlib_soname.patch	2011-04-27 19:07:43 UTC (rev 6684)
@@ -1,8 +1,8 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 88f0949..c57ef72 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,8 +20,21 @@ SET( charls_HEADERS "colortransform.h"  "context.h" "decoderstrategy.h"  "encode
+Index: charls-1.0/CMakeLists.txt
+===================================================================
+--- charls-1.0.orig/CMakeLists.txt	2011-04-27 21:06:42.000000000 +0200
++++ charls-1.0/CMakeLists.txt	2011-04-27 21:06:46.000000000 +0200
+@@ -20,8 +20,21 @@
  OPTION(charls_BUILD_SHARED_LIBS "Build CharLS with shared libraries." OFF)
  SET(BUILD_SHARED_LIBS ${charls_BUILD_SHARED_LIBS})
  
@@ -25,7 +25,7 @@
  
  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 +42,8 @@ target_link_libraries (charlstest CharLS)
+@@ -29,4 +42,8 @@
  # Installs the header files into the {build_dir}/include/libcharls directory
  install(FILES ${charls_HEADERS} DESTINATION include/CharLS)
  

Modified: trunk/packages/charls/trunk/debian/patches/charls_fix_tests.patch
===================================================================
--- trunk/packages/charls/trunk/debian/patches/charls_fix_tests.patch	2011-04-27 18:58:21 UTC (rev 6683)
+++ trunk/packages/charls/trunk/debian/patches/charls_fix_tests.patch	2011-04-27 19:07:43 UTC (rev 6684)
@@ -1,7 +1,7 @@
-diff --git a/defaulttraits.h b/defaulttraits.h
-index 5032f7d..734bcea 100644
---- a/defaulttraits.h
-+++ b/defaulttraits.h
+Index: charls-1.0/defaulttraits.h
+===================================================================
+--- charls-1.0.orig/defaulttraits.h	2011-04-27 21:06:39.000000000 +0200
++++ charls-1.0/defaulttraits.h	2011-04-27 21:06:47.000000000 +0200
 @@ -2,7 +2,7 @@
  // (C) Jan de Vaan 2007-2010, all rights reserved. See the accompanying "License.txt" for licensed use. 
  // 

Modified: trunk/packages/charls/trunk/debian/rules
===================================================================
--- trunk/packages/charls/trunk/debian/rules	2011-04-27 18:58:21 UTC (rev 6683)
+++ trunk/packages/charls/trunk/debian/rules	2011-04-27 19:07:43 UTC (rev 6684)
@@ -37,6 +37,9 @@
 get-orig-source: $(UPSTREAM_SRC).zip
 	rm -rf $(DEBIAN_SRC_DIR)
 	unzip -q $(UPSTREAM_SRC).zip -d $(DEBIAN_SRC_DIR)
+	dos2unix $(DEBIAN_SRC_DIR)/*.h
+	dos2unix $(DEBIAN_SRC_DIR)/*.c*
+	dos2unix $(DEBIAN_SRC_DIR)/*.txt
 	GZIP="--best --no-name" tar czf $(DEBIAN_SRC_TAR) $(DEBIAN_SRC_DIR)
 	rm -rf $(DEBIAN_SRC_DIR)
 	rm $(UPSTREAM_SRC).zip