The following commit has been merged in the release1.2 branch: commit 40171d3a220f612429a41886b79e199122cd770b Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Sat May 14 18:25:22 2011 +0200
Changed a bit noundefined patch diff --git a/debian/patches/autoreconf b/debian/patches/autoreconf index fc295a1..a191782 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:03:12.000000000 +0200 -+++ liblas/Makefile.in 2011-05-14 18:04:23.000000000 +0200 +--- liblas.orig/Makefile.in 2011-05-14 18:19:38.000000000 +0200 ++++ liblas/Makefile.in 2011-05-14 18:22:46.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:03:12.000000000 +0200 -+++ liblas/aclocal.m4 2011-05-14 18:04:24.000000000 +0200 +--- liblas.orig/aclocal.m4 2011-05-14 18:19:38.000000000 +0200 ++++ liblas/aclocal.m4 2011-05-14 18:21:35.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:03:12.000000000 +0200 -+++ liblas/apps/Makefile.in 2011-05-14 18:04:24.000000000 +0200 +--- 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 @@ -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. @@ -5616,8 +5616,8 @@ Index: liblas/apps/Makefile.in .NOEXPORT: Index: liblas/configure =================================================================== ---- liblas.orig/configure 2011-05-14 18:03:12.000000000 +0200 -+++ liblas/configure 2011-05-14 18:04:24.000000000 +0200 +--- liblas.orig/configure 2011-05-14 18:19:38.000000000 +0200 ++++ liblas/configure 2011-05-14 18:22:43.000000000 +0200 @@ -1,62 +1,85 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. @@ -23972,8 +23972,8 @@ Index: liblas/configure Index: liblas/include/Makefile.in =================================================================== ---- liblas.orig/include/Makefile.in 2011-05-14 18:03:12.000000000 +0200 -+++ liblas/include/Makefile.in 2011-05-14 18:04:24.000000000 +0200 +--- 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 @@ -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 +24293,8 @@ Index: liblas/include/Makefile.in .NOEXPORT: Index: liblas/src/Makefile.in =================================================================== ---- liblas.orig/src/Makefile.in 2011-05-14 18:03:12.000000000 +0200 -+++ liblas/src/Makefile.in 2011-05-14 18:04:24.000000000 +0200 +--- 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 @@ -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. @@ -24452,20 +24452,13 @@ Index: liblas/src/Makefile.in top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = . -@@ -219,6 +270,7 @@ - @GEOTIFF_IS_CONFIG_TRUE@GEOTIFF_CPPFLAGS = @GEOTIFF_INC@ -DHAVE_LIBGEOTIFF=1 - AM_CPPFLAGS = $(GEOTIFF_CPPFLAGS) $(GDAL_CPPFLAGS) -I../include -I../include/detail - lib_LTLIBRARIES = liblas.la -+liblas_la_LIBADD = -ltiff - liblas_la_SOURCES = laserror.cpp laspoint.cpp lasheader.cpp \ - lasvariablerecord.cpp lasreader.cpp laswriter.cpp lasfile.cpp \ - las_c_api.cpp lascolor.cpp lasspatialreference.cpp \ -@@ -226,7 +278,7 @@ +@@ -226,7 +277,8 @@ detail/reader12.cpp detail/writer.cpp detail/writer10.cpp \ detail/writer11.cpp detail/writer12.cpp detail/file.cpp \ $(am__append_1) -liblas_la_LDFLAGS = -version-info 1:0:0 +liblas_la_LDFLAGS = -version-info 1:0:0 -Wl,-no-undefined ++liblas_la_LIBADD = -ltiff all: all-recursive .SUFFIXES: @@ -24890,8 +24883,8 @@ Index: liblas/src/Makefile.in .NOEXPORT: Index: liblas/test/Makefile.in =================================================================== ---- liblas.orig/test/Makefile.in 2011-05-14 18:03:21.000000000 +0200 -+++ liblas/test/Makefile.in 2011-05-14 18:04:24.000000000 +0200 +--- 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 @@ -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. @@ -25287,8 +25280,8 @@ Index: liblas/test/Makefile.in .NOEXPORT: Index: liblas/test/unit/Makefile.in =================================================================== ---- liblas.orig/test/unit/Makefile.in 2011-05-14 18:03:30.000000000 +0200 -+++ liblas/test/unit/Makefile.in 2011-05-14 18:04:24.000000000 +0200 +--- 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 @@ -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 a395814..883f54f 100644 --- a/debian/patches/noundefined +++ b/debian/patches/noundefined @@ -1,18 +1,11 @@ Index: liblas/src/Makefile.am =================================================================== ---- liblas.orig/src/Makefile.am 2011-05-14 17:53:34.000000000 +0200 -+++ liblas/src/Makefile.am 2011-05-14 17:54:17.000000000 +0200 -@@ -12,6 +12,7 @@ - AM_CPPFLAGS = $(GEOTIFF_CPPFLAGS) $(GDAL_CPPFLAGS) -I../include -I../include/detail - - lib_LTLIBRARIES = liblas.la -+liblas_la_LIBADD = -ltiff - - liblas_la_SOURCES = \ - laserror.cpp \ -@@ -38,4 +39,4 @@ +--- 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 +@@ -38,4 +38,5 @@ liblas_la_SOURCES += gt_wkt_srs.cpp gt_citation.cpp tifvsi.cpp endif -liblas_la_LDFLAGS = -version-info 1:0:0 +liblas_la_LDFLAGS = -version-info 1:0:0 -Wl,-no-undefined ++liblas_la_LIBADD = -ltiff -- ASPRS LiDAR data translation library _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel