[xdmf] 33/38: Move python stuff to dist-packages

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository xdmf.

commit cc96c5febe2b5d33cb071af5174022a63e558983
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Nov 15 08:49:16 2016 +0000

    Move python stuff to dist-packages
---
 debian/rules | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 0aea707..158d15e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ CMAKE_FLAGS:= -DXDMF_SYSTEM_ZLIB=ON -DXDMF_SYSTEM_LIBXML2=ON -DXDMF_USE_BZIP2=ON
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DXDMF_WRAP_PYTHON=ON \
 		-DXDMF_REGENERATE_WRAPPERS=ON \
-		-DGZSTREAM_LIBRARY=/usr/lib/$(DEB_HOST_MULTIARCH)/libgzstream.so \
+		-DGZSTREAM_LIBRARY=$(LIBDIR)/libgzstream.so \
 		-DBUILD_SHARED_LIBS=TRUE 
 
 override_dh_auto_configure:
@@ -85,21 +85,24 @@ override_dh_auto_install:
 	cp debian/build-mpi-py2/_*.so    $(TMPDIR)/usr/lib/$(PY2)/xdmf
 	cp debian/build-serial-py2/_*.so $(TMPDIR)/usr/lib/$(PY2)/xdmf/NoMpi
 	cp debian/build-serial-py3/_*.so $(TMPDIR)/usr/lib/$(PY3)/xdmf/NoMpi
-	
 	#mv $(TMPDIR)/usr/lib/libXdmf.so.3	      $(TMPDIR)/$(LIBDIR)/libXdmf.so.3.0
 	#mkdir -p $(TMPDIR)/$(LIBDIR)/cmake
 	#mv $(TMPDIR)/usr/lib/XdmfCMake	$(TMPDIR)/$(LIBDIR)/cmake
-	## Fix perms.
-	#find Examples -type f -exec chmod -x {} \;
 	#dh_link -p libxdmf-dev $(LIBDIR)/libXdmf.so.3.0	 $(LIBDIR)/libXdmf.so
 	#dh_link -p libxdmf2 $(LIBDIR)/libXdmf.so.3.0	 $(LIBDIR)/libXdmf.so.3
 	## https://bugs.launchpad.net/ubuntu/+source/xdmf/+bug/1154071
 	#sed -e 's%@ARCH@%$(DEB_HOST_MULTIARCH)%' < debian/cmake.patch.in > debian/cmake.patch
 	#(cd $(TMPDIR)/$(LIBDIR)/cmake/XdmfCMake && patch < ../../../../../../cmake.patch )
+	mkdir -p $(TMPDIR)/usr/lib/$(PY2)/dist-packages $(TMPDIR)/usr/lib/$(PY3)/dist-packages
+	mv $(TMPDIR)/usr/lib/$(PY2)/xdmf $(TMPDIR)/usr/lib/$(PY2)/dist-packages/xdmf
+	mv $(TMPDIR)/usr/lib/$(PY3)/xdmf $(TMPDIR)/usr/lib/$(PY3)/dist-packages/xdmf
 
+override_dh_auto_fixperms:
+	dh_auto_fixperms
+	find debian/libxdmf-dev -type f -exec chmod 644 {} \;
 
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -f debian/cmake.patch libsrc/gzstream
-	find debian/libxdmf-dev -name CVS -delete 
+	-find $(CURDIR) -name CVS -exec rm -rf {} \;
 	rm -rf $(BUILD_DIRS)

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