[med-svn] [SCM] bamtools branch, debian, updated. e48c1baa00e4c59ef262fc6b68023232cd519365
Charles Plessy
plessy at debian.org
Mon Apr 1 06:57:36 UTC 2013
The following commit has been merged in the debian branch:
commit e48c1baa00e4c59ef262fc6b68023232cd519365
Author: Charles Plessy <plessy at debian.org>
Date: Mon Apr 1 15:54:46 2013 +0900
Refreshed patches with quilt.
diff --git a/debian/patches/0002-support-out-of-source-build.patch b/debian/patches/0002-support-out-of-source-build.patch
index 53251ba..9dcd1c6 100644
--- a/debian/patches/0002-support-out-of-source-build.patch
+++ b/debian/patches/0002-support-out-of-source-build.patch
@@ -8,12 +8,10 @@ Subject: support out-of-source build
src/toolkit/CMakeLists.txt | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 944e01d..5811fff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -35,8 +35,8 @@ set( BamTools_VERSION_MINOR 2 )
- set( BamTools_VERSION_BUILD 0 )
+@@ -35,8 +35,8 @@
+ set( BamTools_VERSION_BUILD 3 )
# set our library and executable destination dirs
-set( EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin" )
@@ -23,7 +21,7 @@ index 944e01d..5811fff 100644
# define compiler flags for all code
set( CMAKE_BUILD_TYPE Release )
-@@ -60,6 +60,7 @@ endif()
+@@ -60,6 +60,7 @@
# add our includes root path
include_directories( src )
@@ -31,11 +29,9 @@ index 944e01d..5811fff 100644
# list subdirectories to build in
add_subdirectory( src )
-diff --git a/src/ExportHeader.cmake b/src/ExportHeader.cmake
-index ec62573..ddfe410 100644
--- a/src/ExportHeader.cmake
+++ b/src/ExportHeader.cmake
-@@ -18,7 +18,7 @@ function( ExportHeader MODULE FILE DEST )
+@@ -18,7 +18,7 @@
add_custom_command( TARGET ${MODULE} COMMAND
${CMAKE_COMMAND} -E copy_if_different
"${CMAKE_CURRENT_SOURCE_DIR}/${FILE}"
@@ -44,11 +40,9 @@ index ec62573..ddfe410 100644
# make sure files are properly 'installed'
install( FILES "${FILE}" DESTINATION "include/bamtools/${DEST}" )
-diff --git a/src/toolkit/CMakeLists.txt b/src/toolkit/CMakeLists.txt
-index 1f198b3..dc073d4 100644
--- a/src/toolkit/CMakeLists.txt
+++ b/src/toolkit/CMakeLists.txt
-@@ -35,7 +35,7 @@ set_target_properties( bamtools_cmd PROPERTIES
+@@ -34,7 +34,7 @@
OUTPUT_NAME "bamtools"
)
# make version info available in application
diff --git a/debian/patches/0003-remove-custom-ExportHeader-function-use-install-inst.patch b/debian/patches/0003-remove-custom-ExportHeader-function-use-install-inst.patch
index 9ecdc66..b2aea53 100644
--- a/debian/patches/0003-remove-custom-ExportHeader-function-use-install-inst.patch
+++ b/debian/patches/0003-remove-custom-ExportHeader-function-use-install-inst.patch
@@ -10,11 +10,9 @@ Subject: remove custom ExportHeader function, use install instead
4 files changed, 28 insertions(+), 56 deletions(-)
delete mode 100644 src/ExportHeader.cmake
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 636bd62..3298ff9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
-@@ -10,7 +10,4 @@ add_subdirectory( api )
+@@ -10,7 +10,4 @@
add_subdirectory( toolkit )
add_subdirectory( utils )
@@ -23,9 +21,6 @@ index 636bd62..3298ff9 100644
-set( SharedIncludeDir "shared" )
-ExportHeader( SharedHeaders shared/bamtools_global.h ${SharedIncludeDir} )
+install( FILES shared/bamtools_global.h DESTINATION "include/bamtools/shared" COMPONENT Development )
-diff --git a/src/ExportHeader.cmake b/src/ExportHeader.cmake
-deleted file mode 100644
-index ddfe410..0000000
--- a/src/ExportHeader.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
@@ -56,11 +51,9 @@ index ddfe410..0000000
-
-endfunction( ExportHeader )
-
-diff --git a/src/api/CMakeLists.txt b/src/api/CMakeLists.txt
-index 5b66ec0..8234e78 100644
--- a/src/api/CMakeLists.txt
+++ b/src/api/CMakeLists.txt
-@@ -54,30 +54,29 @@ target_link_libraries( BamTools ${APILibs} )
+@@ -54,30 +54,29 @@
target_link_libraries( BamTools-static ${APILibs} )
# set library install destinations
@@ -115,11 +108,9 @@ index 5b66ec0..8234e78 100644
+install( FILES SamSequence.h DESTINATION "include/bamtools/api" COMPONENT Development )
+install( FILES SamSequenceDictionary.h DESTINATION "include/bamtools/api" COMPONENT Development )
+install( FILES algorithms/Sort.h DESTINATION "include/bamtools/api/algorithms" COMPONENT Development )
-diff --git a/src/toolkit/CMakeLists.txt b/src/toolkit/CMakeLists.txt
-index dc073d4..19f7cf1 100644
--- a/src/toolkit/CMakeLists.txt
+++ b/src/toolkit/CMakeLists.txt
-@@ -36,6 +36,9 @@ set_target_properties( bamtools_cmd PROPERTIES
+@@ -35,6 +35,9 @@
)
# make version info available in application
configure_file( bamtools_version.h.in ${BamTools_BINARY_DIR}/include/bamtools_version.h )
--
debian packaging for bamtools
More information about the debian-med-commit
mailing list