[SCM] spatialite-gui branch, master, updated. debian/1.6.0-1
David Paleino
dapal at debian.org
Sat Dec 1 21:04:05 UTC 2012
The following commit has been merged in the master branch:
commit 8ec7011446a4ff32b65a135d23ba8a736639e6f6
Author: David Paleino <dapal at debian.org>
Date: Sat Dec 1 21:29:39 2012 +0100
Patch removed
diff --git a/debian/changelog b/debian/changelog
index edfd2d1..94c8480 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,6 @@
spatialite-gui (1.6.0-1) UNRELEASED; urgency=low
* New upstream version
- * Updated 00-fix_build.patch to include debugging symbols during
- compilation
-- David Paleino <dapal at debian.org> Sat, 01 Dec 2012 21:28:15 +0100
diff --git a/debian/patches/00-fix_build.patch b/debian/patches/00-fix_build.patch
deleted file mode 100644
index d9547a3..0000000
--- a/debian/patches/00-fix_build.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: David Paleino <dapal at debian.org>
-Subject: fix buildsystem
-Forwarded: no
-
----
- Makefile-linux | 16 +++++++---------
- 1 file changed, 7 insertions(+), 9 deletions(-)
-
---- spatialite-gui.orig/Makefile-linux
-+++ spatialite-gui/Makefile-linux
-@@ -6,24 +6,22 @@ SRC = Main.cpp TableTree.cpp QueryView.c
- MetadataInit.cpp
- OBJ = Main.o TableTree.o QueryView.o ResultSetView.o BlobExplorer.o Dialogs.o \
- Shapefiles.o Network.o Exif.o TextCsv.o Objects.o MetadataInit.o
--EXE = ./bin/spatialite-gui
-+EXE = spatialite-gui
- INCLUDE = Classdef.h
-
- # Define default flags:
--CXXFLAGS = $(shell wx-config --cxxflags)
--LIB = $(shell wx-config --libs) -lgeotiff
-+CXXFLAGS = $(shell wx-config --cxxflags) -g
-+LIB = $(shell wx-config --libs) \
-+ -lspatialite -lgeos_c -lproj -lrasterlite -lsqlite3
- EXTRAFLAGS = -Wall -Wextra -Wno-ctor-dtor-privacy \
-- -fno-strict-aliasing -I/usr/local/include -D_LARGE_FILE=1 \
-+ -fno-strict-aliasing -I/usr/include -D_LARGE_FILE=1 \
- -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1
--EXTRALIBS = /usr/local/lib/libspatialite.a /usr/local/lib/libgeos_c.a \
-- /usr/local/lib/libgeos.a /usr/local/lib/libproj.a \
-- /usr/local/lib/librasterlite.a /usr/local/lib/libgeotiff.a
-+EXTRALIBS =
-
- all: $(EXE)
-
--$(EXE): $(OBJ) $(EXTRALIBS)
-+$(EXE): $(OBJ)
- $(CXX) $(OBJ) -o $(EXE) $(LIB) $(EXTRALIBS)
-- strip --strip-all $(EXE)
-
- clean :
- $(RM) $(OBJ) $(EXE)
--
user-friendly graphical user interface for spatialite
More information about the Pkg-grass-devel
mailing list