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

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

2011-05-14 Thread Francesco Paolo Lovergine

The following commit has been merged in the release1.2 branch:
commit a367d92b7be5ed6766fe0108189e3ef1c2db2751
Author: Francesco Paolo Lovergine fran...@debian.org
Date:   Sat May 14 17:25:07 2011 +0200

Added no-undefined flag at linking time.

diff --git a/debian/patches/noundefined b/debian/patches/noundefined
new file mode 100644
index 000..52b1785
--- /dev/null
+++ b/debian/patches/noundefined
@@ -0,0 +1,23 @@
+Index: liblas/src/Makefile.am
+===
+--- liblas.orig/src/Makefile.am2011-05-14 17:16:52.0 +0200
 liblas/src/Makefile.am 2011-05-14 17:17:06.0 +0200
+@@ -38,4 +38,4 @@
+ 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
+Index: liblas/src/Makefile.in
+===
+--- liblas.orig/src/Makefile.in2011-05-14 17:19:21.0 +0200
 liblas/src/Makefile.in 2011-05-14 17:19:30.0 +0200
+@@ -226,7 +226,7 @@
+   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
+ all: all-recursive
+ 
+ .SUFFIXES:
diff --git a/debian/patches/series b/debian/patches/series
index f035ff3..40dc548 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 # no patches
 missing.diff
 gcc4.5
+noundefined

-- 
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

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

2011-05-14 Thread Francesco Paolo Lovergine

The following commit has been merged in the release1.2 branch:
commit 351f3a806d90a4983a1ac7196e03bb06d532de90
Author: Francesco Paolo Lovergine fran...@debian.org
Date:   Sat May 14 18:02:32 2011 +0200

Added tiff library linking

diff --git a/debian/patches/noundefined b/debian/patches/noundefined
index 52b1785..a395814 100644
--- a/debian/patches/noundefined
+++ b/debian/patches/noundefined
@@ -1,23 +1,18 @@
 Index: liblas/src/Makefile.am
 ===
 liblas.orig/src/Makefile.am2011-05-14 17:16:52.0 +0200
-+++ liblas/src/Makefile.am 2011-05-14 17:17:06.0 +0200
-@@ -38,4 +38,4 @@
+--- liblas.orig/src/Makefile.am2011-05-14 17:53:34.0 +0200
 liblas/src/Makefile.am 2011-05-14 17:54:17.0 +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_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
-Index: liblas/src/Makefile.in
-===
 liblas.orig/src/Makefile.in2011-05-14 17:19:21.0 +0200
-+++ liblas/src/Makefile.in 2011-05-14 17:19:30.0 +0200
-@@ -226,7 +226,7 @@
-   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
- all: all-recursive
- 
- .SUFFIXES:

-- 
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

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

2011-05-14 Thread Francesco Paolo Lovergine

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.in2011-05-14 18:03:12.0 +0200
-+++ liblas/Makefile.in 2011-05-14 18:04:23.0 +0200
+--- liblas.orig/Makefile.in2011-05-14 18:19:38.0 +0200
 liblas/Makefile.in 2011-05-14 18:22:46.0 +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.0 +0200
-+++ liblas/aclocal.m4  2011-05-14 18:04:24.0 +0200
+--- liblas.orig/aclocal.m4 2011-05-14 18:19:38.0 +0200
 liblas/aclocal.m4  2011-05-14 18:21:35.0 +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.0 +0200
-+++ liblas/apps/Makefile.in2011-05-14 18:04:24.0 +0200
+--- liblas.orig/apps/Makefile.in   2011-05-14 18:19:38.0 +0200
 liblas/apps/Makefile.in2011-05-14 18:22:45.0 +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.0 +0200
-+++ liblas/configure   2011-05-14 18:04:24.0 +0200
+--- liblas.orig/configure  2011-05-14 18:19:38.0 +0200
 liblas/configure   2011-05-14 18:22:43.0 +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.in2011-05-14 18:03:12.0 +0200
-+++ liblas/include/Makefile.in 2011-05-14 18:04:24.0 +0200
+--- liblas.orig/include/Makefile.in2011-05-14 18:19:38.0 +0200
 liblas/include/Makefile.in 2011-05-14 18:22:45.0 +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.in2011-05-14 18:03:12.0 +0200
-+++ liblas/src/Makefile.in 2011-05-14 18:04:24.0 +0200
+--- liblas.orig/src/Makefile.in2011-05-14 18:19:38.0 +0200
 liblas/src/Makefile.in 2011-05-14 18:22:45.0 +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

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

2011-05-14 Thread Francesco Paolo Lovergine

The following commit has been merged in the release1.2 branch:
commit 2c2f7a1ee56150d38251af043a53070d6cdd9faf
Author: Francesco Paolo Lovergine fran...@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.in2011-05-14 18:19:38.0 +0200
-+++ liblas/Makefile.in 2011-05-14 18:22:46.0 +0200
+--- liblas.orig/Makefile.in2011-05-14 18:34:02.0 +0200
 liblas/Makefile.in 2011-05-14 18:37:41.0 +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.0 +0200
-+++ liblas/aclocal.m4  2011-05-14 18:21:35.0 +0200
+--- liblas.orig/aclocal.m4 2011-05-14 18:34:02.0 +0200
 liblas/aclocal.m4  2011-05-14 18:37:06.0 +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.0 +0200
-+++ liblas/apps/Makefile.in2011-05-14 18:22:45.0 +0200
+--- liblas.orig/apps/Makefile.in   2011-05-14 18:34:02.0 +0200
 liblas/apps/Makefile.in2011-05-14 18:37:41.0 +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@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@GDAL_CPPFLAGS = @GDAL_INC@ -DHAVE_GDAL=1
+@@ -233,7 +261,7 @@
+ txt2las_SOURCES = txt2las.c
+ bin_SCRIPTS = liblas-config
+ @GDAL_IS_CONFIG_TRUE@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.0 +0200
-+++ liblas/configure   2011-05-14 18:22:43.0 +0200

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

2011-05-14 Thread Francesco Paolo Lovergine

The following commit has been merged in the release1.2 branch:
commit 369c4ddbf64bf18793e06cb5424e83ff9ed7cf69
Author: Francesco Paolo Lovergine fran...@debian.org
Date:   Sat May 14 19:31:11 2011 +0200

Annotated for fixing #555283

diff --git a/debian/changelog b/debian/changelog
index 63edf1e..a7221f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+liblas (1.2.1-3) unstable; urgency=low
+
+  * Added a couple of new patches: now linking explictly libtiff and
+reautotoolized with current version of tools.
+(closes: #555283)
+
+ -- Francesco Paolo Lovergine fran...@debian.org  Sat, 14 May 2011 19:28:59 
+0200
+
 liblas (1.2.1-2) unstable; urgency=high
 
   * Fixed GCC 4.5 failure due to construction of temporary object.

-- 
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

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

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

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

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

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

5 matches

Site Navigation

Mail list logo

Footer information