[SCM] python-liblas branch, master, updated. upstream/1.6.0-18-g0c0b0f4

2013-12-28 Thread Francesco Paolo Lovergine
The following commit has been merged in the master branch:
commit 2b1df759b2788b6b69d4df09d1ed16f6ceec1185
Author: Francesco Paolo Lovergine fran...@debian.org
Date:   Sat Dec 28 16:32:27 2013 +0100

Changes to support current Python development and liblas.

diff --git a/debian/changelog b/debian/changelog
index c1a26a0..8adeacb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,6 @@
-python-liblas (1.6.0-1) UNRELEASED; urgency=low
-
-  ***DON'T UPLOAD***
-  TODO: liblas transition should be handled first. Also,
-00-fix_library_search.patch should be checked, since
-maybe liblas 1.6.0 changed the library name to
-liblas_c.so.
-  **
+python-liblas (1.6.0-1) unstable; urgency=low
 
+  [ David Paleino ]
   * New upstream version
   * Use 3.0 (quilt) source format
 - drop quilt from Build-Depends
@@ -22,7 +16,14 @@ python-liblas (1.6.0-1) UNRELEASED; urgency=low
   * Fix Vcs-* fields to point to Git repository
   * Rename oci2las.py to oci2las, using dh7 override targets
 
- -- David Paleino da...@debian.org  Sat, 12 Feb 2011 18:08:59 +0100
+  [ Francesco Paolo Lovergine ]
+  * Ready for liblas 1.6+.
+  * Policy bumped to 3.9.5.
+  * Debhelper compatibility set to 9.
+  * Changed b-d on current liblas-c-dev (C binding)
+  * Dropped 00-fix_library_search.patch, now obsolete.
+
+ -- Francesco Paolo Lovergine fran...@debian.org  Sat, 28 Dec 2013 15:56:05 
+0100
 
 python-liblas (1.2.1-2) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 0d5082e..2c0f961 100644
--- a/debian/control
+++ b/debian/control
@@ -1,28 +1,29 @@
 Source: python-liblas
 Section: python
-Priority: extra
+Priority: optional
 Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
 Uploaders:
  Francesco Paolo Lovergine fran...@debian.org
  , David Paleino da...@debian.org
 Build-Depends:
- debhelper (= 7.0.50~)
- , liblas-dev
- , python-all
+ debhelper (= 9)
+ , liblas-c-dev (= 1.7.0~)
+ , python-all (= 2.6.6-3~)
 Build-Depends-Indep:
- python-support
+ dh-python
  , python-setuptools
-Standards-Version: 3.9.1
+Standards-Version: 3.9.5
 Homepage: http://pypi.python.org/pypi/libLAS
-Vcs-Browser: http://git.debian.org/?p=pkg-grass/python-liblas.git
-Vcs-Git: git://git.debian.org/pkg-grass/python-liblas.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/liblas.git
+Vcs-Git: git://anonscm.debian.org/pkg-grass/liblas.git
+X-Python-Version: = 2.5
 
 Package: python-liblas
 Architecture: all
 Depends:
  ${misc:Depends}
  , ${python:Depends}
- , liblas1
+ , liblas-c2
  , 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
diff --git a/debian/patches/00-fix_library_search.patch 
b/debian/patches/00-fix_library_search.patch
deleted file mode 100644
index 6301cce..000
--- a/debian/patches/00-fix_library_search.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: David Paleino da...@debian.org
-Subject: fix incorrect usage of ctypes' find_library
-Bug-Debian: http://bugs.debian.org/595603
- http://bugs.debian.org/595608
-Forwarded: no
-

- liblas/core.py |4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
 python-liblas.orig/liblas/core.py
-+++ python-liblas/liblas/core.py
-@@ -150,8 +150,8 @@ elif os.name == 'posix':
- lib_name = 'liblas_c.dylib'
- free = ctypes.CDLL(find_library('libc')).free
- else:
--lib_name = 'liblas_c.so'
--free = ctypes.CDLL(find_library('libc.so.6')).free
-+lib_name = 'liblas.so.1'
-+free = ctypes.CDLL(find_library('c')).free
- las = ctypes.CDLL(lib_name)
- else:
- raise LASException('Unsupported OS %s' % os.name)
diff --git a/debian/patches/series b/debian/patches/series
index 61ecef4..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-00-fix_library_search.patch
diff --git a/debian/pyversions b/debian/pyversions
deleted file mode 100644
index 8b253bc..000
--- a/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.4-

-- 
Python module to use the ASPRS LiDAR data translation library

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] python-liblas branch, master, updated. upstream/1.6.0-18-g0c0b0f4

2013-12-28 Thread Francesco Paolo Lovergine
The following commit has been merged in the master branch:
commit 0c0b0f4cf020db462e73f312e4841d17d5b088af
Author: Francesco Paolo Lovergine fran...@debian.org
Date:   Sat Dec 28 16:35:49 2013 +0100

Other changes to support dh_python2

diff --git a/debian/pycompat b/debian/pycompat
deleted file mode 100644
index 0cfbf08..000
--- a/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/debian/rules b/debian/rules
index aae4ea2..11162e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 #export DH_VERBOSE=1
 
 %:
-   dh $@
+   dh $@ --with python2
 
 override_dh_auto_install:
dh_auto_install

-- 
Python module to use the ASPRS LiDAR data translation library

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel