[clblas] 01/02: Install examples to doc package.

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Wed Nov 25 17:23:53 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 clblas.

commit e029e904c68e8a3ca819e6812c91a4c1e4583098
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Nov 25 11:03:43 2015 +0000

    Install examples to doc package.
---
 debian/libclblas-doc.install                     |  1 +
 debian/patches/Fix-examples-install-target.patch | 24 ++++++++++++++++
 debian/patches/series                            |  1 +
 debian/rules                                     | 35 ++++++++++++++----------
 4 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/debian/libclblas-doc.install b/debian/libclblas-doc.install
new file mode 100644
index 0000000..7276ecd
--- /dev/null
+++ b/debian/libclblas-doc.install
@@ -0,0 +1 @@
+usr/share/doc
diff --git a/debian/patches/Fix-examples-install-target.patch b/debian/patches/Fix-examples-install-target.patch
new file mode 100644
index 0000000..cfa2780
--- /dev/null
+++ b/debian/patches/Fix-examples-install-target.patch
@@ -0,0 +1,24 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Wed, 25 Nov 2015 17:12:28 +0000
+Subject: Fix examples install target.
+
+---
+ src/samples/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/samples/CMakeLists.txt b/src/samples/CMakeLists.txt
+index 4227244..bd778e5 100644
+--- a/src/samples/CMakeLists.txt
++++ b/src/samples/CMakeLists.txt
+@@ -264,9 +264,9 @@ configure_file( "${PROJECT_SOURCE_DIR}/samples/CMakeLists.pack"
+ 		"${PROJECT_BINARY_DIR}/samples/CMakeLists.txt" COPYONLY )
+ 		
+ if( WIN32 )
+-    set( CLBLAS_SAMPLE_INSTALL_DESTINATION samples CACHE PATH "")
++    set( CLBLAS_SAMPLE_INSTALL_DESTINATION samples)
+ else( )
+-    set( CLBLAS_SAMPLE_INSTALL_DESTINATION share/clBLAS/samples/src CACHE PATH "")
++    set( CLBLAS_SAMPLE_INSTALL_DESTINATION "/usr/share/doc/libclblas-doc/examples")
+ endif()
+ 		
+ install(FILES
diff --git a/debian/patches/series b/debian/patches/series
index ca25ec5..4235415 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ use-system-mathjax.patch
 reproducible-build.patch
 use-boost-dynamic-libs.patch
 add-missing-stdlib-include.patch
+Fix-examples-install-target.patch
diff --git a/debian/rules b/debian/rules
index 69e075b..6245832 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,29 +20,33 @@ DEB_CFLAGS_MAINT_APPEND += -mno-altivec
 DEB_CXXFLAGS_MAINT_APPEND += -mno-altivec
 endif
 
+# Common build options.
+export CMAKE_BUILD_OPTIONS = \
+	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+	-DBUILD_RUNTIME=ON \
+	-DBUILD_TEST=OFF \
+	-DBUILD_PERFORMANCE=OFF \
+	-DBUILD_CLIENT=ON \
+	-DBUILD_KTEST=OFF \
+	-DBUILD_SHARED_LIBS=ON \
+	-DSUFFIX_LIB=/${DEB_HOST_MULTIARCH}
+
 %:
 	dh $@ --parallel \
 		--sourcedirectory=src \
 		--dbg-package=libclblas2-dbg
 
-override_dh_auto_configure:
-	dh_auto_configure -- \
-		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-		-DBUILD_RUNTIME=ON \
-		-DBUILD_TEST=OFF \
-		-DBUILD_PERFORMANCE=OFF \
-		-DBUILD_SAMPLE=OFF \
-		-DBUILD_CLIENT=ON \
-		-DBUILD_KTEST=OFF \
-		-DBUILD_SHARED_LIBS=ON \
-		-DSUFFIX_LIB=/${DEB_HOST_MULTIARCH}
+override_dh_auto_configure-arch:
+	dh_auto_configure -- ${CMAKE_BUILD_OPTIONS} \
+		-DBUILD_SAMPLE=OFF
+
+override_dh_auto_configure-indep:
+	dh_auto_configure -- ${CMAKE_BUILD_OPTIONS} \
+		-DBUILD_SAMPLE=ON
 
 override_dh_auto_build-indep:
 	cd doc && doxygen clBLAS.doxy
 
-override_dh_auto_install-indep:
-	# Pass.
-
 override_dh_auto_clean-indep:
 	rm -rf doc/html
 	rm -f doc/doxygen_sqlite3.db
@@ -50,3 +54,6 @@ override_dh_auto_clean-indep:
 override_dh_installdocs-indep:
 	dh_installdocs --indep
 	dh_doxygen --indep
+
+override_dh_compress:
+	dh_compress --exclude=examples

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



More information about the debian-science-commits mailing list