[SCM] liblas branch, release1.2, updated. debian/1.2.1-1-9-g369c4dd

Francesco Paolo Lovergine frankie at debian.org
Sat May 14 17:31:44 UTC 2011 

The following commit has been merged in the release1.2 branch:
commit 2c2f7a1ee56150d38251af043a53070d6cdd9faf
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Sat May 14 18:38:11 2011 +0200

    Fixed apps.

diff --git a/debian/patches/autoreconf b/debian/patches/autoreconf
index a191782..ea53568 100644
--- a/debian/patches/autoreconf
+++ b/debian/patches/autoreconf
@@ -1,7 +1,7 @@
 Index: liblas/Makefile.in
 ===================================================================
---- liblas.orig/Makefile.in	2011-05-14 18:19:38.000000000 +0200
-+++ liblas/Makefile.in	2011-05-14 18:22:46.000000000 +0200
+--- liblas.orig/Makefile.in	2011-05-14 18:34:02.000000000 +0200
++++ liblas/Makefile.in	2011-05-14 18:37:41.000000000 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -530,8 +530,8 @@ Index: liblas/Makefile.in
  # Otherwise a system limit (for SysV at least) may be exceeded.
 Index: liblas/aclocal.m4
 ===================================================================
---- liblas.orig/aclocal.m4	2011-05-14 18:19:38.000000000 +0200
-+++ liblas/aclocal.m4	2011-05-14 18:21:35.000000000 +0200
+--- liblas.orig/aclocal.m4	2011-05-14 18:34:02.000000000 +0200
++++ liblas/aclocal.m4	2011-05-14 18:37:06.000000000 +0200
 @@ -1,7 +1,7 @@
 -# generated automatically by aclocal 1.10 -*- Autoconf -*-
 +# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
@@ -5158,8 +5158,8 @@ Index: liblas/aclocal.m4
  # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 Index: liblas/apps/Makefile.in
 ===================================================================
---- liblas.orig/apps/Makefile.in	2011-05-14 18:19:38.000000000 +0200
-+++ liblas/apps/Makefile.in	2011-05-14 18:22:45.000000000 +0200
+--- liblas.orig/apps/Makefile.in	2011-05-14 18:34:02.000000000 +0200
++++ liblas/apps/Makefile.in	2011-05-14 18:37:41.000000000 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -5183,7 +5183,7 @@ Index: liblas/apps/Makefile.in
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
-@@ -45,9 +47,9 @@
+@@ -45,40 +47,61 @@
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
  CONFIG_CLEAN_FILES = liblas-config
@@ -5194,11 +5194,36 @@ Index: liblas/apps/Makefile.in
  PROGRAMS = $(bin_PROGRAMS)
  am_las2las_OBJECTS = las2las.$(OBJEXT) lascommon.$(OBJEXT)
  las2las_OBJECTS = $(am_las2las_OBJECTS)
-@@ -74,11 +76,32 @@
+ las2las_LDADD = $(LDADD)
+-las2las_DEPENDENCIES = ../src/liblas.la
++las2las_DEPENDENCIES = $(top_builddir)/src/liblas.la
+ am__las2ogr_SOURCES_DIST = las2ogr.cpp
+ @GDAL_IS_CONFIG_TRUE at am_las2ogr_OBJECTS = las2ogr.$(OBJEXT)
+ las2ogr_OBJECTS = $(am_las2ogr_OBJECTS)
+ las2ogr_LDADD = $(LDADD)
+-las2ogr_DEPENDENCIES = ../src/liblas.la
++las2ogr_DEPENDENCIES = $(top_builddir)/src/liblas.la
+ am_las2txt_OBJECTS = las2txt.$(OBJEXT) lascommon.$(OBJEXT)
+ las2txt_OBJECTS = $(am_las2txt_OBJECTS)
+ las2txt_LDADD = $(LDADD)
+-las2txt_DEPENDENCIES = ../src/liblas.la
++las2txt_DEPENDENCIES = $(top_builddir)/src/liblas.la
+ am_lasinfo_OBJECTS = lasinfo.$(OBJEXT) lascommon.$(OBJEXT)
+ lasinfo_OBJECTS = $(am_lasinfo_OBJECTS)
+ lasinfo_LDADD = $(LDADD)
+-lasinfo_DEPENDENCIES = ../src/liblas.la
++lasinfo_DEPENDENCIES = $(top_builddir)/src/liblas.la
+ am_lasmerge_OBJECTS = lasmerge.$(OBJEXT) lascommon.$(OBJEXT)
+ lasmerge_OBJECTS = $(am_lasmerge_OBJECTS)
+ lasmerge_LDADD = $(LDADD)
+-lasmerge_DEPENDENCIES = ../src/liblas.la
++lasmerge_DEPENDENCIES = $(top_builddir)/src/liblas.la
+ am_txt2las_OBJECTS = txt2las.$(OBJEXT)
  txt2las_OBJECTS = $(am_txt2las_OBJECTS)
  txt2las_LDADD = $(LDADD)
- txt2las_DEPENDENCIES = ../src/liblas.la
+-txt2las_DEPENDENCIES = ../src/liblas.la
 -binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
++txt2las_DEPENDENCIES = $(top_builddir)/src/liblas.la
 +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 +am__vpath_adj = case $$p in \
 +    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -5280,6 +5305,15 @@ Index: liblas/apps/Makefile.in
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  @GDAL_IS_CONFIG_TRUE at GDAL_CPPFLAGS = @GDAL_INC@ -DHAVE_GDAL=1
+@@ -233,7 +261,7 @@
+ txt2las_SOURCES = txt2las.c
+ bin_SCRIPTS = liblas-config
+ @GDAL_IS_CONFIG_TRUE at las2ogr_SOURCES = las2ogr.cpp
+-LDADD = ../src/liblas.la
++LDADD = $(top_builddir)/src/liblas.la
+ all: all-am
+ 
+ .SUFFIXES:
 @@ -242,14 +270,14 @@
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
@@ -5616,8 +5650,8 @@ Index: liblas/apps/Makefile.in
  .NOEXPORT:
 Index: liblas/configure
 ===================================================================
---- liblas.orig/configure	2011-05-14 18:19:38.000000000 +0200
-+++ liblas/configure	2011-05-14 18:22:43.000000000 +0200
+--- liblas.orig/configure	2011-05-14 18:34:02.000000000 +0200
++++ liblas/configure	2011-05-14 18:37:39.000000000 +0200
 @@ -1,62 +1,85 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -23972,8 +24006,8 @@ Index: liblas/configure
  
 Index: liblas/include/Makefile.in
 ===================================================================
---- liblas.orig/include/Makefile.in	2011-05-14 18:19:38.000000000 +0200
-+++ liblas/include/Makefile.in	2011-05-14 18:22:45.000000000 +0200
+--- liblas.orig/include/Makefile.in	2011-05-14 18:34:02.000000000 +0200
++++ liblas/include/Makefile.in	2011-05-14 18:37:41.000000000 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -24293,8 +24327,8 @@ Index: liblas/include/Makefile.in
  .NOEXPORT:
 Index: liblas/src/Makefile.in
 ===================================================================
---- liblas.orig/src/Makefile.in	2011-05-14 18:19:38.000000000 +0200
-+++ liblas/src/Makefile.in	2011-05-14 18:22:45.000000000 +0200
+--- liblas.orig/src/Makefile.in	2011-05-14 18:34:02.000000000 +0200
++++ liblas/src/Makefile.in	2011-05-14 18:37:41.000000000 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -24883,8 +24917,8 @@ Index: liblas/src/Makefile.in
  .NOEXPORT:
 Index: liblas/test/Makefile.in
 ===================================================================
---- liblas.orig/test/Makefile.in	2011-05-14 18:19:38.000000000 +0200
-+++ liblas/test/Makefile.in	2011-05-14 18:22:45.000000000 +0200
+--- liblas.orig/test/Makefile.in	2011-05-14 18:34:02.000000000 +0200
++++ liblas/test/Makefile.in	2011-05-14 18:37:41.000000000 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -25280,8 +25314,8 @@ Index: liblas/test/Makefile.in
  .NOEXPORT:
 Index: liblas/test/unit/Makefile.in
 ===================================================================
---- liblas.orig/test/unit/Makefile.in	2011-05-14 18:19:38.000000000 +0200
-+++ liblas/test/unit/Makefile.in	2011-05-14 18:22:45.000000000 +0200
+--- liblas.orig/test/unit/Makefile.in	2011-05-14 18:34:02.000000000 +0200
++++ liblas/test/unit/Makefile.in	2011-05-14 18:37:41.000000000 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
diff --git a/debian/patches/noundefined b/debian/patches/noundefined
index 883f54f..78b075a 100644
--- a/debian/patches/noundefined
+++ b/debian/patches/noundefined
@@ -1,7 +1,7 @@
 Index: liblas/src/Makefile.am
 ===================================================================
---- liblas.orig/src/Makefile.am	2011-05-14 18:19:38.000000000 +0200
-+++ liblas/src/Makefile.am	2011-05-14 18:21:21.000000000 +0200
+--- liblas.orig/src/Makefile.am	2011-05-14 18:24:34.000000000 +0200
++++ liblas/src/Makefile.am	2011-05-14 18:33:50.000000000 +0200
 @@ -38,4 +38,5 @@
  liblas_la_SOURCES += gt_wkt_srs.cpp gt_citation.cpp tifvsi.cpp
  endif
@@ -9,3 +9,13 @@ Index: liblas/src/Makefile.am
 -liblas_la_LDFLAGS = -version-info 1:0:0
 +liblas_la_LDFLAGS = -version-info 1:0:0 -Wl,-no-undefined
 +liblas_la_LIBADD = -ltiff
+Index: liblas/apps/Makefile.am
+===================================================================
+--- liblas.orig/apps/Makefile.am	2011-05-14 18:34:15.000000000 +0200
++++ liblas/apps/Makefile.am	2011-05-14 18:36:12.000000000 +0200
+@@ -24,4 +24,4 @@
+ bin_PROGRAMS += las2ogr
+ endif
+ 
+-LDADD = ../src/liblas.la
++LDADD = $(top_builddir)/src/liblas.la

-- 
ASPRS LiDAR data translation library

More information about the Pkg-grass-devel mailing list