[ismrmrd] 103/129: d/{control, rules}: merge hdf5 and xsd python bindings

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository ismrmrd.

commit 8045897acc8394f889c59984721a620264ab5f3b
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu Jun 5 20:06:54 2014 +0100

    d/{control,rules}: merge hdf5 and xsd python bindings
---
 debian/control | 19 -------------------
 debian/rules   |  4 ++--
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/debian/control b/debian/control
index d9cb878..34a5aae 100644
--- a/debian/control
+++ b/debian/control
@@ -122,25 +122,6 @@ Description: ISMRM Raw Data format (ISMRMRD) - Python bindings
  .
  This package provides the SWIG generated Python bindings.
 
-Package: python-ismrmrd-xsd
-Section: python
-Architecture: any
-Depends:
- python-ismrmrd (= ${source:Version}),
- ${misc:Depends},
- ${python:Depends},
-Description: ISMRM Raw Data format (ISMRMRD) - Python XSD bindings
- The ISMRMRD format combines a mix of flexible data structures (XML header) 
- and fixed structures (equivalent to C-structs) to represent MRI data.
- .
- In addition, the ISMRMRD format also specifies an image header for storing 
- reconstructed images and the accompanying C++ library provides a convenient 
- way of writing such images into HDF5 files along with generic arrays for 
- storing less well defined data structures, e.g. coil sensitivity maps or 
- other calibration data.
- .
- This package provides the Python bindings for XSD generated with pyxb.
-
 Package: libismrmrd-java
 Section: java
 Architecture: any
diff --git a/debian/rules b/debian/rules
index f4ebe1e..a17e94c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,7 @@ BINARYPKG=lib$(SOURCEPKG)0
 APIDOCPKG=lib$(SOURCEPKG)-dev-doc
 JAVAPKG=lib$(SOURCEPKG)-java
 PYTHONPKG=python-${SOURCEPKG}
+PYTHONXSDPKG=${PYTHONPKG}-xsd
 
 %:
 	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --parallel
@@ -37,8 +38,7 @@ override_dh_auto_install:
 
 	: I: install SWIG Python bindings for the current Python verion
 	mkdir -p debian/$(PYTHONPKG)$(PYTHONDIR)
-	install -m 0644 debian/tmp/usr/${SOURCEPKG}/python/ismrmrd.py \
-		debian/tmp/usr/${SOURCEPKG}/python/_ismrmrd.so \
+	install -m 0644 debian/tmp/usr/${SOURCEPKG}/python/* \
 		debian/$(PYTHONPKG)$(PYTHONDIR)
 	dh_numpy --package=$(PYTHONPKG)
 

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