[clfft] 73/74: Update patch queue: - Drop Fix-examples-install-target.patch, use dh instead. - Drop fix-docs-output.patch, applied upstream. - Drop restore-missing-install-targets.patch, fixed upstream.

[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 27575bfb6b1edb6cb474127305a9f830fa84cc44
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu Jan 14 19:33:04 2016 +0000

    Update patch queue:
    - Drop Fix-examples-install-target.patch, use dh instead.
    - Drop fix-docs-output.patch, applied upstream.
    - Drop restore-missing-install-targets.patch, fixed upstream.
---
 debian/patches/Fix-examples-install-target.patch   | 21 -----------
 debian/patches/fix-docs-output.patch               | 18 ----------
 .../patches/restore-missing-install-targets.patch  | 42 ----------------------
 debian/patches/series                              |  3 --
 4 files changed, 84 deletions(-)

diff --git a/debian/patches/Fix-examples-install-target.patch b/debian/patches/Fix-examples-install-target.patch
deleted file mode 100644
index 4457caa..0000000
--- a/debian/patches/Fix-examples-install-target.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Wed, 25 Nov 2015 12:14:29 +0000
-Subject: Fix examples install target.
-
-- Disable install of examples runtime executable.
-- Inject desired examples install directory.
----
- src/examples/CMakeLists.txt | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
---- a/src/examples/CMakeLists.txt
-+++ b/src/examples/CMakeLists.txt
-@@ -47,7 +47,5 @@
-         OUTPUT_NAME ${EXAMPLE}
-         RUNTIME_OUTPUT_DIRECTORY ${DIR_NAME})
- 
--    INSTALL(FILES ${FILE} DESTINATION "share/clFFT/examples")
--    INSTALL(TARGETS ${EXAMPLE_NAME}
--        RUNTIME DESTINATION "share/clFFT/examples")
-+    INSTALL(FILES ${FILE} DESTINATION share/doc/libclfft-doc/examples)
- ENDFOREACH()
diff --git a/debian/patches/fix-docs-output.patch b/debian/patches/fix-docs-output.patch
deleted file mode 100644
index 5875eff..0000000
--- a/debian/patches/fix-docs-output.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: fix output directory for documentation
- Use default doxygen directory, i.e. under docs/html, rather than the 
- inappropriate path set by upstream.
-Author: Ghislain Antony Vaillant <ghisvail at gmail.com> 
-Forwarded: no 
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/docs/clFFT.doxy
-+++ b/docs/clFFT.doxy
-@@ -58,7 +58,7 @@
- # entered, it will be relative to the location where doxygen was started. If
- # left blank the current directory will be used.
- 
--OUTPUT_DIRECTORY       = ../../bindoc
-+OUTPUT_DIRECTORY       = 
- 
- # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
- # directories (in 2 levels) under the output directory of each output format and
diff --git a/debian/patches/restore-missing-install-targets.patch b/debian/patches/restore-missing-install-targets.patch
deleted file mode 100644
index d0b3d87..0000000
--- a/debian/patches/restore-missing-install-targets.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: Restore missing install targets
- Upstream disabled / removed important install targets for the client
- application and pkg-config file. This patch restores them.
-Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Bug: https://github.com/clMathLibraries/clFFT/issues/114 
-Forwarded: no 
-Last-Update: 2015-10-27
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/library/CMakeLists.txt
-+++ b/src/library/CMakeLists.txt
-@@ -91,13 +91,13 @@
- set_target_properties( clFFT PROPERTIES SOVERSION ${CLFFT_SOVERSION} )
- set_target_properties( clFFT PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
- 
--# if( CMAKE_COMPILER_IS_GNUCC )
--#     configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/clFFT.pc.in
--#                     ${CMAKE_CURRENT_BINARY_DIR}/clFFT.pc @ONLY )
--# 
--#     install( FILES ${CMAKE_CURRENT_BINARY_DIR}/clFFT.pc
--#              DESTINATION lib${SUFFIX_LIB}/pkgconfig )
--# endif( )
-+if( CMAKE_COMPILER_IS_GNUCC )
-+    configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/clFFT.pc.in
-+                    ${CMAKE_CURRENT_BINARY_DIR}/clFFT.pc @ONLY )
-+
-+    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/clFFT.pc
-+             DESTINATION lib${SUFFIX_LIB}/pkgconfig )
-+endif( )
- 
- # CPack configuration; include the executable into the package
- install( TARGETS clFFT
---- a/src/client/CMakeLists.txt
-+++ b/src/client/CMakeLists.txt
-@@ -51,3 +51,7 @@
-     set_target_properties( clFFT-client PROPERTIES INSTALL_RPATH "@loader_path/../lib${SUFFIX_LIB}")
- endif()
- 
-+install(TARGETS clFFT-client
-+        RUNTIME DESTINATION bin${SUFFIX_BIN}
-+        LIBRARY DESTINATION lib${SUFFIX_LIB}
-+        ARCHIVE DESTINATION lib${SUFFIX_LIB}/import)
diff --git a/debian/patches/series b/debian/patches/series
index 6bbbfa2..1b4e920 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,6 @@
 disable-multilib-cflags.patch
 fix-client-no-symlink.patch
-fix-docs-output.patch
 use-system-mathjax.patch
 reproducible-build.patch
 use-boost-dynamic-libs.patch
-restore-missing-install-targets.patch
-Fix-examples-install-target.patch
 Enable-support-for-kFreeBSD.patch

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