[clfft] 04/50: commit patch and install path

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/sid
in repository clfft.

commit 5e4a55de2eb10dc0a57f436358d4bf3a8be818e5
Author: Jerome Kieffer <jerome.kieffer at terre-adelie.org>
Date:   Tue Apr 7 21:57:46 2015 +0200

    commit patch and install path
---
 debian/clfft-dev.install |  3 +++
 debian/patches/lib64     | 47 +++++++++++++++++++++++++++++++++++++++--------
 src/CMakeLists.txt       |  6 ++----
 3 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/debian/clfft-dev.install b/debian/clfft-dev.install
new file mode 100644
index 0000000..5774e64
--- /dev/null
+++ b/debian/clfft-dev.install
@@ -0,0 +1,3 @@
+usr/include/*
+usr/lib/lib*.so
+usr/lib/pkgconfig/*
diff --git a/debian/patches/lib64 b/debian/patches/lib64
index 21a499c..4929901 100644
--- a/debian/patches/lib64
+++ b/debian/patches/lib64
@@ -1,17 +1,40 @@
-Description: remove installation to lib64
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
  .
  clfft (2.4.0-1) unstable; urgency=low
  .
    * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
 Author: Jerome Kieffer <jerome.kieffer at esrf.fr>
 
-Last-Update: 2015-04-07
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
 
-Index: clFFT/src/CMakeLists.txt
-===================================================================
---- clFFT.orig/src/CMakeLists.txt	2015-04-07 21:21:25.000000000 +0200
-+++ clFFT/src/CMakeLists.txt	2015-04-07 21:21:25.000000000 +0200
-@@ -115,8 +115,6 @@
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- clfft-2.4.0.orig/src/CMakeLists.txt
++++ clfft-2.4.0/src/CMakeLists.txt
+@@ -48,7 +48,7 @@ if( NOT DEFINED CLFFT_VERSION_PATCH )
+ endif( )
+ 
+ set( CLFFT_VERSION "${CLFFT_VERSION_MAJOR}.${CLFFT_VERSION_MINOR}.${CLFFT_VERSION_PATCH}")
+-	
++
+ # This is incremented when the ABI to the library changes
+ set( CLFFT_SOVERSION 2 )
+ 
+@@ -115,8 +115,6 @@ set( SUFFIX_BIN_DEFAULT "" )
  if( BUILD64 )
  	set_property( GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE )
  	message( STATUS "64bit build - FIND_LIBRARY_USE_LIB64_PATHS TRUE" )
@@ -20,4 +43,12 @@ Index: clFFT/src/CMakeLists.txt
  else( )
  	set_property( GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE )
  	message( STATUS "32bit build - FIND_LIBRARY_USE_LIB64_PATHS FALSE" )
-
+@@ -205,7 +203,7 @@ elseif( CMAKE_COMPILER_IS_GNUCXX )
+ 		# we only want c++0x if we're using gcc 4.5.2
+ 		set( CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}" )
+ 	endif()
+-	
++
+ 	set( CMAKE_CXX_FLAGS "-pthread ${CMAKE_CXX_FLAGS}" )
+ 	set( CMAKE_C_FLAGS "-pthread ${CMAKE_C_FLAGS}" )
+ 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ec5fc4b..919ca99 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -48,7 +48,7 @@ if( NOT DEFINED CLFFT_VERSION_PATCH )
 endif( )
 
 set( CLFFT_VERSION "${CLFFT_VERSION_MAJOR}.${CLFFT_VERSION_MINOR}.${CLFFT_VERSION_PATCH}")
-	
+
 # This is incremented when the ABI to the library changes
 set( CLFFT_SOVERSION 2 )
 
@@ -115,8 +115,6 @@ set( SUFFIX_BIN_DEFAULT "" )
 if( BUILD64 )
 	set_property( GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE )
 	message( STATUS "64bit build - FIND_LIBRARY_USE_LIB64_PATHS TRUE" )
-
-    set( SUFFIX_LIB_DEFAULT "64" )
 else( )
 	set_property( GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE )
 	message( STATUS "32bit build - FIND_LIBRARY_USE_LIB64_PATHS FALSE" )
@@ -205,7 +203,7 @@ elseif( CMAKE_COMPILER_IS_GNUCXX )
 		# we only want c++0x if we're using gcc 4.5.2
 		set( CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}" )
 	endif()
-	
+
 	set( CMAKE_CXX_FLAGS "-pthread ${CMAKE_CXX_FLAGS}" )
 	set( CMAKE_C_FLAGS "-pthread ${CMAKE_C_FLAGS}" )
 

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