[python-pdal] 01/02: Drop python3-pdal package, libpdal-plang is built with Python 2.

Bas Couwenberg sebastic at debian.org
Mon Jan 23 18:47:26 UTC 2017


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

sebastic pushed a commit to branch master
in repository python-pdal.

commit 0d822702ace3a621836668db883de4f308730a9c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jan 23 19:35:41 2017 +0100

    Drop python3-pdal package, libpdal-plang is built with Python 2.
---
 debian/changelog                         |  6 ++++++
 debian/control                           | 29 +----------------------------
 debian/patches/pdal-python-version.patch | 14 --------------
 debian/patches/series                    |  1 -
 debian/rules                             |  6 +-----
 5 files changed, 8 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a597c03..9ceeb07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-pdal (1.4.0+ds-2) UNRELEASED; urgency=medium
+
+  * Drop python3-pdal package, libpdal-plang is built with Python 2.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 23 Jan 2017 19:34:45 +0100
+
 python-pdal (1.4.0+ds-1) unstable; urgency=medium
 
   * Move from experimental to unstable.
diff --git a/debian/control b/debian/control
index 0fba1a6..3d12a0a 100644
--- a/debian/control
+++ b/debian/control
@@ -6,16 +6,11 @@ Uploaders: Bas Couwenberg <sebastic at debian.org>
 Build-Depends: debhelper (>= 9),
                dh-python,
                cython,
-               cython3,
                libpdal-dev (>= 1.4.0),
                python-all-dev,
                python-numpy,
                python-packaging,
-               python-setuptools,
-               python3-all-dev,
-               python3-numpy,
-               python3-packaging,
-               python3-setuptools
+               python-setuptools
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/python-pdal.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-grass/python-pdal.git
@@ -43,25 +38,3 @@ Description: Point Data Abstraction Library - Python 2 extension
  .
  This package contains the PDAL extension for Python 2.
 
-Package: python3-pdal
-Architecture: any
-Section: python
-Depends: ${python3:Depends},
-         ${shlibs:Depends},
-         ${misc:Depends}
-Description: Point Data Abstraction Library - Python 3 extension
- PDAL is a BSD licensed library for translating and manipulating point
- cloud data of various formats. PDAL can be used to read, write and
- translate point cloud data in many formats. Support is included for
- input files of LAS, LAZ, SBET, BPF, QFIT and others. PDAL can also read
- from and write to databases that support point cloud storage, including
- Oracle, Postgres and SQLite.
- .
- PDAL should not be confused with PCL (Point Cloud Library). PCL is a
- library specifically designed to provide algorithmic analysis and
- modification of point clouds. PDAL provides a limited interface to the
- facilities of PCL, but does not in general attempt to duplicate its
- capabilities.
- .
- This package contains the PDAL extension for Python 3.
-
diff --git a/debian/patches/pdal-python-version.patch b/debian/patches/pdal-python-version.patch
deleted file mode 100644
index 0572986..0000000
--- a/debian/patches/pdal-python-version.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Don't throw exception for PDAL Python version mismatch.
-Author: Bas Couwenberg <sebastic at debian.org>
-
---- a/setup.py
-+++ b/setup.py
-@@ -123,7 +123,7 @@ if pdal_config and "clean" not in sys.ar
-                 running_major = int(sys.version_info[0])
-                 if built_major != running_major:
-                     message = "Version mismatch. PDAL Python support was compiled against version %d.x but setup is running version is %d.x. "
--                    raise Exception(message % (built_major, running_major))
-+                    print(message % (built_major, running_major))
- 
-     # older versions of pdal-config do not include --python-version switch
-     except ValueError:
diff --git a/debian/patches/series b/debian/patches/series
index 9545438..691a82a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-pdal-python-version.patch
 skip-tests-for-missing-data.patch
diff --git a/debian/rules b/debian/rules
index 24a9f6f..5eabcf2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 export PYBUILD_NAME=pdal
 
 %:
-	dh $@ --with python2,python3 --buildsystem pybuild --parallel
+	dh $@ --with python2 --buildsystem pybuild --parallel
 
 override_dh_install:
 	dh_install --list-missing
@@ -17,7 +17,3 @@ override_dh_python2:
 	dh_python2 -ppython-pdal
 	dh_numpy -ppython-pdal
 
-override_dh_python3:
-	dh_python3 -ppython3-pdal
-	dh_numpy3 -ppython3-pdal
-

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



More information about the Pkg-grass-devel mailing list