[SCM] liblas branch, master, updated. debian/1.2.1-1-21-gf6b31a1

David Paleino dapal at debian.org
Mon Apr 23 16:05:32 UTC 2012


The following commit has been merged in the master branch:
commit f6b31a105ee887ceaf8d23f2307fbcef311bcba9
Author: David Paleino <dapal at debian.org>
Date:   Mon Apr 23 18:05:24 2012 +0200

    Libraries split: liblas(2) and liblas-c(2), since both a C and a C++ version is provided. The same applies for the -dev packages.

diff --git a/debian/changelog b/debian/changelog
index aaae478..453c316 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ liblas (1.7.0-1) UNRELEASED; urgency=low
   * Moved from CDBS to dh
   * Added myself to Uploaders
   * Dropped patches, no more needed
+  * Libraries split: liblas(2) and liblas-c(2), since both a C and a C++
+    version is provided. The same applies for the -dev packages.
 
   [ Francesco Paolo Lovergine ]
   * New upstream version with SONAME bumping.
@@ -18,7 +20,7 @@ liblas (1.7.0-1) UNRELEASED; urgency=low
   * Debhelper level set to 9.
   * debian/copyright now is in format 1.0.
 
- -- David Paleino <dapal at debian.org>  Mon, 23 Apr 2012 13:07:23 +0200
+ -- David Paleino <dapal at debian.org>  Mon, 23 Apr 2012 18:04:37 +0200
 
 liblas (1.2.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 055b02c..ea15cbd 100644
--- a/debian/control
+++ b/debian/control
@@ -18,14 +18,14 @@ Homepage: http://liblas.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/liblas.git
 Vcs-Git: git://git.debian.org/git/pkg-grass/liblas.git
 
-Package: liblas1
+Package: liblas2
 Architecture: any
 Section: libs
 Suggests: libgeotiff-epsg
 Depends:
  ${shlibs:Depends}
  , ${misc:Depends}
-Description: ASPRS LiDAR data translation library
+Description: ASPRS LiDAR data translation library - C++ version
  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
  used to store data from sensors and as intermediate processing storage
@@ -35,19 +35,39 @@ Description: ASPRS LiDAR data translation library
  target. The prevalent method to determine distance to an object or
  surface is to use laser pulses.
  .
- This package contains the shared library used by applications.
+ This package contains the C++ shared library used by applications.
+
+Package: liblas-c2
+Architecture: any
+Section: libs
+Suggests: libgeotiff-epsg
+Depends:
+ ${shlibs:Depends}
+ , ${misc:Depends}
+ , liblas2 (= ${binary:Version})
+Description: ASPRS LiDAR data translation library - C version
+ 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
+ used to store data from sensors and as intermediate processing storage
+ by some LiDAR-related applications. LiDAR (Light Detection and Ranging)
+ is an optical remote sensing technology that measures properties of
+ scattered light to find range and/or other information of a distant
+ target. The prevalent method to determine distance to an object or
+ surface is to use laser pulses.
+ .
+ This package contains the C shared library used by applications.
 
 Package: liblas-dev
 Architecture: any
 Section: libdevel
 Depends:
- liblas1 (= ${binary:Version})
+ liblas2 (= ${binary:Version})
  , libtiff5-dev | libtiff-dev
  , libgeotiff-dev
  , libgdal1-dev
  , ${shlibs:Depends}
  , ${misc:Depends}
-Description: ASPRS LiDAR data translation library - development 
+Description: ASPRS LiDAR data translation library - C++ development files
  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
  used to store data from sensors and as intermediate processing storage
@@ -57,14 +77,35 @@ Description: ASPRS LiDAR data translation library - development
  target. The prevalent method to determine distance to an object or
  surface is to use laser pulses.
  .
- This package contains the development files to build applications.
+ This package contains the development files to build applications in C++.
 
-Package: liblas-bin
+Package: liblas-c-dev
 Architecture: any
+Section: libdevel
 Depends:
- liblas1 (= ${binary:Version})
+ liblas-c2 (= ${binary:Version})
+ , liblas-dev (= ${binary:Version})
+ , libgeotiff-dev
+ , libgdal1-dev
  , ${shlibs:Depends}
  , ${misc:Depends}
+Description: ASPRS LiDAR data translation library - C development files
+ 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
+ used to store data from sensors and as intermediate processing storage
+ by some LiDAR-related applications. LiDAR (Light Detection and Ranging)
+ is an optical remote sensing technology that measures properties of
+ scattered light to find range and/or other information of a distant
+ target. The prevalent method to determine distance to an object or
+ surface is to use laser pulses.
+ .
+ This package contains the development files to build applications in C.
+
+Package: liblas-bin
+Architecture: any
+Depends:
+ ${shlibs:Depends}
+ , ${misc:Depends}
 Suggests: libgeotiff-epsg
 Description: ASPRS LiDAR data translation toolset
  libLAS is a C/C++ library for reading and writing ASPRS LAS versions
diff --git a/debian/liblas-c-dev.install b/debian/liblas-c-dev.install
new file mode 100644
index 0000000..c0836c2
--- /dev/null
+++ b/debian/liblas-c-dev.install
@@ -0,0 +1,2 @@
+usr/lib/liblas_c.so
+usr/include/liblas/capi/
diff --git a/debian/liblas-c2.install b/debian/liblas-c2.install
new file mode 100644
index 0000000..c24dc37
--- /dev/null
+++ b/debian/liblas-c2.install
@@ -0,0 +1 @@
+usr/lib/liblas_c.so.2.*
diff --git a/debian/liblas-c2.links b/debian/liblas-c2.links
new file mode 100644
index 0000000..24d83a3
--- /dev/null
+++ b/debian/liblas-c2.links
@@ -0,0 +1 @@
+usr/lib/liblas_c.so.2.*	usr/lib/liblas_c.so.2
diff --git a/debian/liblas-dev.install b/debian/liblas-dev.install
index f8881ed..f6e8055 100644
--- a/debian/liblas-dev.install
+++ b/debian/liblas-dev.install
@@ -1,4 +1,3 @@
-usr/lib/liblas.a
 usr/lib/liblas.so
 usr/include
 usr/bin/liblas-config
diff --git a/debian/liblas2.install b/debian/liblas2.install
new file mode 100644
index 0000000..73705d1
--- /dev/null
+++ b/debian/liblas2.install
@@ -0,0 +1 @@
+usr/lib/liblas.so.2.*
diff --git a/debian/liblas2.links b/debian/liblas2.links
new file mode 100644
index 0000000..614d502
--- /dev/null
+++ b/debian/liblas2.links
@@ -0,0 +1 @@
+usr/lib/liblas.so.2.*	usr/lib/liblas.so.2
diff --git a/debian/rules b/debian/rules
index a9d2f01..745f141 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,5 +10,11 @@ override_dh_auto_configure:
 		-DWITH_GEOTIFF=TRUE \
 		-DGEOTIFF_INCLUDE_DIR=/usr/include/geotiff
 
+override_dh_install:
+	dh_install
+
+	# remove capi from liblas-dev
+	rm -vrf $(CURDIR)/debian/liblas-dev/usr/include/liblas/capi/
+
 override_dh_auto_test:
 	# don't run tests

-- 
ASPRS LiDAR data translation library



More information about the Pkg-grass-devel mailing list