[clfft] 06/06: d/p/*: remove numbered prefix, gets in the way

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Thu Jun 4 14:18:35 UTC 2015


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 c3856856916c521cbc283bad560b82de42fcba62
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu Jun 4 14:38:30 2015 +0100

    d/p/*: remove numbered prefix, gets in the way
---
 .../0001-fix-cmake-config-install.patch.old        | 34 ----------------------
 ...fix-client-name.patch => fix-client-name.patch} |  0
 ...nstall.patch => fix-cmake-config-install.patch} |  0
 ...n-settings.patch => fix-doxygen-settings.patch} |  0
 debian/patches/series                              |  6 ++--
 5 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/debian/patches/0001-fix-cmake-config-install.patch.old b/debian/patches/0001-fix-cmake-config-install.patch.old
deleted file mode 100644
index 5c3683c..0000000
--- a/debian/patches/0001-fix-cmake-config-install.patch.old
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: install missing cmake config module
-Author: Kent Knox
-Origin: upstream
-Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -283,6 +283,25 @@
- 	message( "GoogleTest unit tests will NOT be built" )
- endif( )
- 
-+if(WIN32)
-+	set(destdir CMake)
-+else()
-+	set(destdir share/clFFT)
-+endif()
-+string(REGEX REPLACE "[^/]+" ".." reldir "${destdir}")
-+configure_file(
-+	${CMAKE_CURRENT_SOURCE_DIR}/clFFTConfigVersion.cmake.in
-+	${CMAKE_CURRENT_BINARY_DIR}/clFFTConfigVersion.cmake
-+	@ONLY)
-+configure_file(
-+	${CMAKE_CURRENT_SOURCE_DIR}/clFFTConfig.cmake.in
-+	${CMAKE_CURRENT_BINARY_DIR}/clFFTConfig.cmake
-+	@ONLY)
-+install(EXPORT Library DESTINATION ${destdir} FILE clFFTTargets.cmake)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/clFFTConfigVersion.cmake
-+	${CMAKE_CURRENT_BINARY_DIR}/clFFTConfig.cmake
-+	DESTINATION ${destdir})
-+
- # The following code is setting variables to control the behavior of CPack to generate our
- if( WIN32 )
- 	set( CPACK_SOURCE_GENERATOR "ZIP" )
diff --git a/debian/patches/0003-fix-client-name.patch b/debian/patches/fix-client-name.patch
similarity index 100%
rename from debian/patches/0003-fix-client-name.patch
rename to debian/patches/fix-client-name.patch
diff --git a/debian/patches/0001-fix-cmake-config-install.patch b/debian/patches/fix-cmake-config-install.patch
similarity index 100%
rename from debian/patches/0001-fix-cmake-config-install.patch
rename to debian/patches/fix-cmake-config-install.patch
diff --git a/debian/patches/0002-fix-doxygen-settings.patch b/debian/patches/fix-doxygen-settings.patch
similarity index 100%
rename from debian/patches/0002-fix-doxygen-settings.patch
rename to debian/patches/fix-doxygen-settings.patch
diff --git a/debian/patches/series b/debian/patches/series
index 59a32f8..5ef37e3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-0001-fix-cmake-config-install.patch
-0002-fix-doxygen-settings.patch
-0003-fix-client-name.patch
+fix-cmake-config-install.patch
+fix-doxygen-settings.patch
+fix-client-name.patch
 debian-enable-multiarch.patch

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



More information about the debian-science-commits mailing list