[liblas] 09/23: Use pybuild instead of python_distutils buildsystem.

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch master
in repository liblas.

commit d8d31846a7f2b7e2dc7fd72018d84e2fa258c4e5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Feb 5 01:52:51 2014 +0100

    Use pybuild instead of python_distutils buildsystem.
---
 debian/changelog |  2 ++
 debian/control   |  3 +--
 debian/rules     | 39 +++++++++++++++++++--------------------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c577286..de94b67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ liblas (1.7.0+dfsg-3) UNRELEASED; urgency=low
     symbols are problematic for C++ libraries.
   * Enable verbose build logs.
   * Add patch from python-liblas to fix the library search path.
+  * Use pybuild instead of python_distutils buildsystem.
+    Thanks Graham Inggs for the patch.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 31 Jan 2014 01:37:27 +0100
 
diff --git a/debian/control b/debian/control
index 8336b96..8cfebcb 100644
--- a/debian/control
+++ b/debian/control
@@ -129,10 +129,9 @@ Package: python-liblas
 Architecture: all
 Section: python
 Depends:
- ${shlibs:Depends}
+ liblas-c2
  , ${misc:Depends}
  , ${python:Depends}
- , python (>= 2.5) | python-ctypes
 Description: Python module to use the ASPRS LiDAR data translation library
  libLAS is a C/C++ library for reading and writing ASPRS LAS versions
  1.0, 1.1 and 1.2 data. The LAS format is a sequential binary format
diff --git a/debian/rules b/debian/rules
index 845692c..f5b2fa2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,16 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with python2 \
-	      --buildsystem cmake
+	dh $@ --buildsystem cmake \
+	      --parallel
 
-override_dh_auto_clean:
-	dh_auto_clean
-	dh_auto_clean --sourcedirectory $(CURDIR)/python --buildsystem python_distutils
+override_dh_auto_clean-indep:
+	dh_auto_clean --sourcedirectory $(CURDIR)/python --buildsystem pybuild
 
 override_dh_clean:
 	dh_clean
 
 	rm -rf $(CURDIR)/README.txt
-	rm -rf $(CURDIR)/python/build
-	rm -rf $(CURDIR)/python/libLAS.egg-info
 
 override_dh_auto_configure:
 	dh_auto_configure --buildsystem cmake -- \
@@ -22,23 +19,25 @@ override_dh_auto_configure:
 		-DWITH_GEOTIFF=TRUE \
 		-DGEOTIFF_INCLUDE_DIR=/usr/include/geotiff
 
-override_dh_auto_build:
-	dh_auto_build
-	dh_auto_build --sourcedirectory $(CURDIR)/python --buildsystem python_distutils
+override_dh_auto_configure-indep:
+	dh_auto_configure --sourcedirectory $(CURDIR)/python --buildsystem pybuild
 
-override_dh_auto_install:
-	dh_auto_install
-	dh_auto_install --sourcedirectory $(CURDIR)/python --buildsystem python_distutils
+override_dh_auto_build-indep:
+	dh_auto_build --sourcedirectory $(CURDIR)/python --buildsystem pybuild
 
-override_dh_install:
-	dh_install
+override_dh_auto_test:
+	# don't run tests
+
+override_dh_auto_install-indep:
+	dh_auto_install --sourcedirectory $(CURDIR)/python --buildsystem pybuild
+
+override_dh_install-arch:
+	dh_install --arch
 
 	# remove capi from liblas-dev
 	rm -vrf $(CURDIR)/debian/liblas-dev/usr/include/liblas/capi/
 
-override_dh_auto_test:
-	# don't run tests
-
-override_dh_python2:
-	dh_python2 -ppython-liblas $(CURDIR)/python
+override_dh_install-indep:
+	dh_install --indep
+	dh_python2 --indep
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/liblas.git