[SCM] spatialite-gui branch, master, updated. debian/1.6.0-1-18-g4f7ed01
Bas Couwenberg
sebastic at xs4all.nl
Mon Sep 30 21:34:10 UTC 2013
The following commit has been merged in the master branch:
commit 52657473c8788994c9c53914b1f25e34165efe15
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Sep 30 22:23:34 2013 +0200
Refresh patches.
diff --git a/debian/patches/00-fix_buildsystem.patch b/debian/patches/00-fix_buildsystem.patch
index ebb1ee2..22570bd 100644
--- a/debian/patches/00-fix_buildsystem.patch
+++ b/debian/patches/00-fix_buildsystem.patch
@@ -3,15 +3,9 @@ Subject: fix buildsystem
Origin: vendor
Forwarded: no
----
- Makefile.am | 2 +-
- configure.ac | 2 +-
- m4/.gitignore | 1 +
- 3 files changed, 3 insertions(+), 2 deletions(-)
-
---- spatialite-gui.orig/configure.ac
-+++ spatialite-gui/configure.ac
-@@ -6,7 +6,7 @@ AC_INIT(spatialite_gui, 1.6.0, a.furieri
+--- a/configure.ac
++++ b/configure.ac
+@@ -6,7 +6,7 @@ AC_INIT(spatialite_gui, 1.7.1, a.furieri
AC_LANG(C)
AC_CONFIG_MACRO_DIR([m4])
@@ -20,18 +14,14 @@ Forwarded: no
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
---- /dev/null
-+++ spatialite-gui/m4/.gitignore
-@@ -0,0 +1 @@
-+# empty dir to make "autoreconf" work
---- spatialite-gui.orig/Makefile.am
-+++ spatialite-gui/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
@@ -13,7 +13,7 @@ spatialite_gui_SOURCES = Classdef.h Blob
- TextCsv.cpp
+ TextCsv.cpp Wfs.cpp
LDADD = @WX_LIBS@ @LIBGAIAGRAPHICS_LIBS@ @LIBSPATIALITE_LIBS@ \
-- @LIBFREEXL_LIBS@
-+ @LIBFREEXL_LIBS@ -lgeos_c
+- @LIBFREEXL_LIBS@ @LIBXML2_LIBS@
++ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ -lgeos_c
EXTRA_DIST = Makefile-static-MinGW \
Makefile-static-Linux \
diff --git a/debian/patches/01-fix_binary_name.patch b/debian/patches/01-fix_binary_name.patch
index f9b79fd..d3336c3 100644
--- a/debian/patches/01-fix_binary_name.patch
+++ b/debian/patches/01-fix_binary_name.patch
@@ -8,8 +8,8 @@ Forwarded: no
configure.ac | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---- spatialite-gui.orig/Makefile.am
-+++ spatialite-gui/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
@@ -1,6 +1,6 @@
ACLOCAL_AMFLAGS = -I m4
@@ -18,14 +18,14 @@ Forwarded: no
INCLUDES = @CFLAGS@
INCLUDES += -I$(top_srcdir)
---- spatialite-gui.orig/configure.ac
-+++ spatialite-gui/configure.ac
+--- a/configure.ac
++++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
--AC_INIT(spatialite_gui, 1.6.0, a.furieri at lqt.it)
-+AC_INIT(spatialite-gui, 1.6.0, a.furieri at lqt.it)
+-AC_INIT(spatialite_gui, 1.7.1, a.furieri at lqt.it)
++AC_INIT(spatialite-gui, 1.7.1, a.furieri at lqt.it)
AC_LANG(C)
AC_CONFIG_MACRO_DIR([m4])
diff --git a/debian/patches/02-fix_typos.patch b/debian/patches/02-fix_typos.patch
index 213023a..ec91ce9 100644
--- a/debian/patches/02-fix_typos.patch
+++ b/debian/patches/02-fix_typos.patch
@@ -10,9 +10,9 @@ Forwarded: no
TableTree.cpp | 4 ++--
5 files changed, 12 insertions(+), 12 deletions(-)
---- spatialite-gui.orig/Exif.cpp
-+++ spatialite-gui/Exif.cpp
-@@ -60,8 +60,8 @@ void MyFrame::ImportExifPhotos(wxString
+--- a/Exif.cpp
++++ b/Exif.cpp
+@@ -64,8 +64,8 @@ void MyFrame::ImportExifPhotos(wxString
else
cnt = ExifLoadFile(path, gps_only, metadata);
::wxEndBusyCursor();
@@ -23,9 +23,9 @@ Forwarded: no
wxMessageBox(wxString::FromUTF8(msg), wxT("spatialite_gui"),
wxOK | wxICON_INFORMATION, this);
InitTableTree();
---- spatialite-gui.orig/Dialogs.cpp
-+++ spatialite-gui/Dialogs.cpp
-@@ -4326,7 +4326,7 @@ void AutoSaveDialog::OnChangePath(wxComm
+--- a/Dialogs.cpp
++++ b/Dialogs.cpp
+@@ -5306,7 +5306,7 @@ void AutoSaveDialog::OnChangePath(wxComm
MainFrame->SetExternalSqlitePath(pth);
if (MainFrame->MemoryDbSave() == true)
{
@@ -34,9 +34,9 @@ Forwarded: no
wxT("spatialite_gui"), wxOK | wxICON_INFORMATION, this);
wxFileName file(fileDialog.GetPath());
lastDir = file.GetPath();
---- spatialite-gui.orig/Main.cpp
-+++ spatialite-gui/Main.cpp
-@@ -1730,7 +1730,7 @@ void MyFrame::OnMemoryDbSave(wxCommandEv
+--- a/Main.cpp
++++ b/Main.cpp
+@@ -2022,7 +2022,7 @@ void MyFrame::OnMemoryDbSave(wxCommandEv
{
if (MemoryDbSave() == true)
{
@@ -45,7 +45,7 @@ Forwarded: no
wxT("spatialite_gui"), wxOK | wxICON_INFORMATION, this);
if (AutoSaveInterval <= 0)
{
-@@ -1770,7 +1770,7 @@ void MyFrame::OnMemoryDbSave(wxCommandEv
+@@ -2062,7 +2062,7 @@ void MyFrame::OnMemoryDbSave(wxCommandEv
ExternalSqlitePath = fileDialog.GetPath();
if (MemoryDbSave() == true)
{
@@ -54,7 +54,7 @@ Forwarded: no
wxT("spatialite_gui"), wxOK | wxICON_INFORMATION, this);
wxFileName file(fileDialog.GetPath());
lastDir = file.GetPath();
-@@ -1988,10 +1988,10 @@ void MyFrame::OnVacuum(wxCommandEvent &
+@@ -2316,10 +2316,10 @@ void MyFrame::OnVacuum(wxCommandEvent &
} else
{
DbPagesCount(&totalPages2, &freePages2);
@@ -67,7 +67,7 @@ Forwarded: no
totalPages - totalPages2);
msg += wxString::FromUTF8(dummy);
}
-@@ -2314,7 +2314,7 @@ void MyFrame::OnSqlScript(wxCommandEvent
+@@ -2642,7 +2642,7 @@ void MyFrame::OnSqlScript(wxCommandEvent
break;
}
sprintf(dummy,
@@ -76,7 +76,7 @@ Forwarded: no
stmt);
msg = wxString::FromUTF8(dummy);
wxMessageBox(msg, wxT("spatialite_gui"), wxOK | wxICON_INFORMATION,
-@@ -3216,7 +3216,7 @@ void MyFrame::LastDitchMemoryDbSave()
+@@ -3724,7 +3724,7 @@ void MyFrame::LastDitchMemoryDbSave()
ExternalSqlitePath = fileDialog.GetPath();
if (MemoryDbSave() == true)
{
@@ -85,8 +85,8 @@ Forwarded: no
wxT("spatialite_gui"), wxOK | wxICON_INFORMATION,
this);
break;
---- spatialite-gui.orig/MalformedGeoms.cpp
-+++ spatialite-gui/MalformedGeoms.cpp
+--- a/MalformedGeoms.cpp
++++ b/MalformedGeoms.cpp
@@ -1009,7 +1009,7 @@ void MalformedGeomsDialog::OnRepair(wxCo
goto clean_up;
}
@@ -96,9 +96,9 @@ Forwarded: no
wxT("spatialite_gui"), wxOK | wxICON_INFORMATION, this);
wxDialog::EndModal(wxID_OK);
return;
---- spatialite-gui.orig/TableTree.cpp
-+++ spatialite-gui/TableTree.cpp
-@@ -2302,7 +2302,7 @@ void MyTableTree::OnCmdRecoverSpatialInd
+--- a/TableTree.cpp
++++ b/TableTree.cpp
+@@ -2374,7 +2374,7 @@ void MyTableTree::OnCmdRecoverSpatialInd
if (retval)
wxMessageBox(wxT("Spatial Index idx_") + obj->GetName() +
wxT("_") + obj->GetColumn() +
@@ -107,7 +107,7 @@ Forwarded: no
wxOK | wxICON_INFORMATION, this);
else
wxMessageBox(wxT("ERROR: unable to recover Spatial Index idx_") +
-@@ -3078,7 +3078,7 @@ void MyTableTree::OnCmdRepairPolygons(wx
+@@ -3150,7 +3150,7 @@ void MyTableTree::OnCmdRepairPolygons(wx
if (count > 0)
{
char str[256];
--
user-friendly graphical user interface for spatialite
More information about the Pkg-grass-devel
mailing list