[clfft] 07/50: still not multi-arch

[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 6e6dde7b240b275bd5999244defd6ad78efe985a
Author: Jerome Kieffer <jerome.kieffer at esrf.fr>
Date:   Wed Apr 8 14:08:24 2015 +0200

    still not multi-arch
---
 debian/clfft-dev.dirs    |  2 --
 debian/clfft-dev.install |  2 --
 debian/clfft1.dirs       |  1 -
 debian/clfft2.install    |  2 +-
 debian/compat            |  2 +-
 debian/control           |  5 +++--
 debian/rules             | 10 ++++++----
 7 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/debian/clfft-dev.dirs b/debian/clfft-dev.dirs
deleted file mode 100644
index 4418816..0000000
--- a/debian/clfft-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib
-usr/include
diff --git a/debian/clfft-dev.install b/debian/clfft-dev.install
index 5774e64..41a1414 100644
--- a/debian/clfft-dev.install
+++ b/debian/clfft-dev.install
@@ -1,3 +1 @@
 usr/include/*
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
diff --git a/debian/clfft1.dirs b/debian/clfft1.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/clfft1.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/clfft2.install b/debian/clfft2.install
index d0dbfd1..86572f3 100644
--- a/debian/clfft2.install
+++ b/debian/clfft2.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/lib*.so* 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 9c9d96e..78629eb 100644
--- a/debian/control
+++ b/debian/control
@@ -5,13 +5,13 @@ Build-Depends: debhelper (>= 9), cmake, opencl-icd, ocl-icd-dev
 Standards-Version: 3.9.4
 Section: libs
 Homepage: https://github.com/clMathLibraries/clFFT
-#Vcs-Git: git://git.debian.org/collab-maint/clfft.git
-#Vcs-Browser: http://git.debian.org/?p=collab-maint/clfft.git;a=summary
+Multi-Arch: same
 
 Package: clfft-dev
 Section: libdevel
 Architecture: any
 Depends: clfft2 (= ${binary:Version}), ocl-icd-dev
+Pre-Depends: ${misc:Pre-Depends}
 Description: clFFT is an open source OpenCL library implementation of FFT
  The FFT is an implementation of the Discrete Fourier Transform (DFT) that
  makes use of symmetries in the FFT definition to reduce the mathematical
@@ -27,6 +27,7 @@ Package: clfft2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, opencl-icd
+Pre-Depends: ${misc:Pre-Depends}
 Description: clFFT is an open source OpenCL library implementation of FFT
  The FFT is an implementation of the Discrete Fourier Transform (DFT) that
  makes use of symmetries in the FFT definition to reduce the mathematical
diff --git a/debian/rules b/debian/rules
index 76a1136..46718ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,10 +7,12 @@
 # This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 
 %:
-	dh $@ --sourcedirectory=src
+	dh $@ --buildsystem cmake --parallel --sourcedirectory=src 
+#--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) 
 
-#override_dh_auto_configure:
-#	dh_auto_configure -- -DBUILD_SHARED_LIBS=ON -DBUILD_DEMOS=OFF -DBUILD_EXTRAS=OFF src

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