[SCM] librasterlite branch, master, updated. debian/1.0-3-10-g3bc8f1e

David Paleino dapal at debian.org
Tue Sep 27 08:50:34 UTC 2011


The following commit has been merged in the master branch:
commit 3bc8f1e1502e218d4df36a2922d9b66b373b574e
Author: David Paleino <dapal at debian.org>
Date:   Tue Sep 27 10:48:38 2011 +0200

    Remove useless linking

diff --git a/debian/patches/01-fix_build.patch b/debian/patches/01-fix_build.patch
index df5c5a6..7c4e340 100644
--- a/debian/patches/01-fix_build.patch
+++ b/debian/patches/01-fix_build.patch
@@ -3,9 +3,9 @@ Subject: fix compile- and link-time issues
 Forwarded: no
 
 ---
- lib/Makefile.am |    3 ++-
- src/Makefile.am |    5 +++--
- 2 files changed, 5 insertions(+), 3 deletions(-)
+ lib/Makefile.am |    6 +++---
+ src/Makefile.am |    7 ++++---
+ 2 files changed, 7 insertions(+), 6 deletions(-)
 
 --- librasterlite.orig/lib/Makefile.am
 +++ librasterlite/lib/Makefile.am
@@ -17,14 +17,15 @@ Forwarded: no
  
  lib_LTLIBRARIES = librasterlite.la 
  
-@@ -22,6 +23,6 @@ librasterlite_la_SOURCES = \
+@@ -22,6 +23,5 @@ librasterlite_la_SOURCES = \
  librasterlite_la_LDFLAGS = -version-info 1:0:1 -no-undefined
  
  librasterlite_la_LIBADD = \
 -	-lepsilon \
+-	-lgeotiff -ltiff -ljpeg -lpng -lspatialite -lproj
+-
 +	-lepsilon -lsqlite3 \
- 	-lgeotiff -ltiff -ljpeg -lpng -lspatialite -lproj
- 
++	-lgeotiff -ltiff -ljpeg -lpng -lspatialite
 --- librasterlite.orig/src/Makefile.am
 +++ librasterlite/src/Makefile.am
 @@ -10,6 +10,7 @@ bin_PROGRAMS =rasterlite_load \
@@ -41,7 +42,8 @@ Forwarded: no
  
 -LDADD = ../lib/.libs/librasterlite.a \
 -        -lepsilon \
+-        -lgeotiff -ltiff -ljpeg -lpng -lspatialite -lproj
 +LDADD = ../lib/.libs/librasterlite.la \
-+        -lepsilon -lsqlite3 -lm \
-         -lgeotiff -ltiff -ljpeg -lpng -lspatialite -lproj
++        -lsqlite3 -lm \
++        -lgeotiff -ltiff -lspatialite
  

-- 
library supporting raster data sources for spatialite



More information about the Pkg-grass-devel mailing list