[SCM] spatialite-gui branch, master, updated. debian/1.6.0-1
David Paleino
dapal at debian.org
Sat Dec 1 21:04:06 UTC 2012
The following commit has been merged in the master branch:
commit d8e21af115ed637ba95fc0c4fc6ada2b542c1636
Author: David Paleino <dapal at debian.org>
Date: Sat Dec 1 21:32:52 2012 +0100
Patches refreshed
diff --git a/debian/patches/00-fix_buildsystem.patch b/debian/patches/00-fix_buildsystem.patch
new file mode 100644
index 0000000..d9e8709
--- /dev/null
+++ b/debian/patches/00-fix_buildsystem.patch
@@ -0,0 +1,25 @@
+From: David Paleino <dapal at debian.org>
+Subject: fix buildsystem
+Origin: vendor
+Forwarded: no
+
+---
+ configure.ac | 2 +-
+ m4/.gitignore | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+--- spatialite-gui.orig/configure.ac
++++ spatialite-gui/configure.ac
+@@ -6,7 +6,7 @@ AC_INIT(spatialite_gui, 1.6.0, a.furieri
+ AC_LANG(C)
+ AC_CONFIG_MACRO_DIR([m4])
+
+-AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE([foreign])
+ AM_MAINTAINER_MODE
+ AM_CONFIG_HEADER(config.h)
+
+--- /dev/null
++++ spatialite-gui/m4/.gitignore
+@@ -0,0 +1 @@
++# empty dir to make "autoreconf" work
diff --git a/debian/patches/00-fix_geos_linking.patch b/debian/patches/00-fix_geos_linking.patch
deleted file mode 100644
index b46811e..0000000
--- a/debian/patches/00-fix_geos_linking.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: David Paleino <dapal at debian.org>
-Subject: don't try to link to the C++ version of libgeos
-Origin: vendor
-Forwarded: no
-
----
- configure.ac | 10 +++++-----
- m4/.gitignore | 1 +
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
---- spatialite-gui.orig/configure.ac
-+++ spatialite-gui/configure.ac
-@@ -6,7 +6,7 @@ AC_INIT(spatialite_gui, 1.5.0-stable, a.
- AC_LANG(C)
- AC_CONFIG_MACRO_DIR([m4])
-
--AM_INIT_AUTOMAKE
-+AM_INIT_AUTOMAKE([foreign])
- AM_MAINTAINER_MODE
-
- # Checks for programs.
-@@ -55,17 +55,17 @@ AC_FUNC_STRFTIME
- AC_CHECK_FUNCS([memset sqrt strcasecmp strerror strncasecmp strstr fdatasync ftruncate getcwd gettimeofday localtime_r memmove strerror])
-
- AC_CHECK_LIB(proj,pj_init_plus,,AC_MSG_ERROR(['libproj' is required but it doesn't seem to be installed on this system.]),-lm)
--AC_CHECK_LIB(geos_c,GEOSTopologyPreserveSimplify,,AC_MSG_ERROR(['libgeos_c' is required but it doesn't seem to be installed on this system.]),-lm -lgeos)
-+AC_CHECK_LIB(geos_c,GEOSTopologyPreserveSimplify,,AC_MSG_ERROR(['libgeos_c' is required but it doesn't seem to be installed on this system.]),-lm -lgeos_c)
-
--PKG_CHECK_MODULES([LIBGAIAGRAPHICS], [gaiagraphics], , AC_MSG_ERROR(['libgaiagraphics' is required but it doesn't seem to be installed on this system.]))
-+PKG_CHECK_MODULES([LIBGAIAGRAPHICS], [gaiagraphics], [], AC_MSG_ERROR(['libgaiagraphics' is required but it doesn't seem to be installed on this system.]))
- AC_SUBST(LIBGAIAGRAPHICS_CFLAGS)
- AC_SUBST(LIBGAIAGRAPHICS_LIBS)
-
--PKG_CHECK_MODULES([LIBFREEXL], [freexl], , AC_MSG_ERROR(['libfreexl' is required but it doesn't seem to be installed on this system.]))
-+PKG_CHECK_MODULES([LIBFREEXL], [freexl], [], AC_MSG_ERROR(['libfreexl' is required but it doesn't seem to be installed on this system.]))
- AC_SUBST(LIBFREEXL_CFLAGS)
- AC_SUBST(LIBFREEXL_LIBS)
-
--PKG_CHECK_MODULES([LIBSPATIALITE], [spatialite], , AC_MSG_ERROR(['libspatialite' is required but it doesn't seem to be installed on this system.]))
-+PKG_CHECK_MODULES([LIBSPATIALITE], [spatialite], [], AC_MSG_ERROR(['libspatialite' is required but it doesn't seem to be installed on this system.]))
- AC_SUBST(LIBSPATIALITE_CFLAGS)
- AC_SUBST(LIBSPATIALITE_LIBS)
-
---- /dev/null
-+++ spatialite-gui/m4/.gitignore
-@@ -0,0 +1 @@
-+# empty dir to make "autoreconf" work
diff --git a/debian/patches/01-fix_binary_name.patch b/debian/patches/01-fix_binary_name.patch
index a32aedf..f9b79fd 100644
--- a/debian/patches/01-fix_binary_name.patch
+++ b/debian/patches/01-fix_binary_name.patch
@@ -10,23 +10,22 @@ Forwarded: no
--- spatialite-gui.orig/Makefile.am
+++ spatialite-gui/Makefile.am
-@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
- CXXFLAGS += @LIBGAIAGRAPHICS_CFLAGS@ @LIBSPATIALITE_CFLAGS@ \
- @LIBFREEXL_CFLAGS@
+@@ -1,6 +1,6 @@
+ ACLOCAL_AMFLAGS = -I m4
-bin_PROGRAMS = spatialite_gui
+bin_PROGRAMS = spatialite-gui
INCLUDES = @CFLAGS@
-
+ INCLUDES += -I$(top_srcdir)
--- spatialite-gui.orig/configure.ac
+++ spatialite-gui/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.5.0-stable, a.furieri at lqt.it)
-+AC_INIT(spatialite-gui, 1.5.0-stable, a.furieri at lqt.it)
+-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_LANG(C)
AC_CONFIG_MACRO_DIR([m4])
diff --git a/debian/patches/02-fix_typos.patch b/debian/patches/02-fix_typos.patch
index fb689f3..edc5db9 100644
--- a/debian/patches/02-fix_typos.patch
+++ b/debian/patches/02-fix_typos.patch
@@ -25,7 +25,7 @@ Forwarded: no
InitTableTree();
--- spatialite-gui.orig/Dialogs.cpp
+++ spatialite-gui/Dialogs.cpp
-@@ -3837,7 +3837,7 @@ void AutoSaveDialog::OnChangePath(wxComm
+@@ -4326,7 +4326,7 @@ void AutoSaveDialog::OnChangePath(wxComm
MainFrame->SetExternalSqlitePath(pth);
if (MainFrame->MemoryDbSave() == true)
{
@@ -36,7 +36,7 @@ Forwarded: no
lastDir = file.GetPath();
--- spatialite-gui.orig/Main.cpp
+++ spatialite-gui/Main.cpp
-@@ -1548,7 +1548,7 @@ void MyFrame::OnMemoryDbSave(wxCommandEv
+@@ -1730,7 +1730,7 @@ void MyFrame::OnMemoryDbSave(wxCommandEv
{
if (MemoryDbSave() == true)
{
@@ -45,7 +45,7 @@ Forwarded: no
wxT("spatialite_gui"), wxOK | wxICON_INFORMATION, this);
if (AutoSaveInterval <= 0)
{
-@@ -1588,7 +1588,7 @@ void MyFrame::OnMemoryDbSave(wxCommandEv
+@@ -1770,7 +1770,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();
-@@ -1770,10 +1770,10 @@ void MyFrame::OnVacuum(wxCommandEvent &
+@@ -1988,10 +1988,10 @@ void MyFrame::OnVacuum(wxCommandEvent &
} else
{
DbPagesCount(&totalPages2, &freePages2);
@@ -67,7 +67,7 @@ Forwarded: no
totalPages - totalPages2);
msg += wxString::FromUTF8(dummy);
}
-@@ -2083,7 +2083,7 @@ void MyFrame::OnSqlScript(wxCommandEvent
+@@ -2314,7 +2314,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,
-@@ -2986,7 +2986,7 @@ void MyFrame::LastDitchMemoryDbSave()
+@@ -3216,7 +3216,7 @@ void MyFrame::LastDitchMemoryDbSave()
ExternalSqlitePath = fileDialog.GetPath();
if (MemoryDbSave() == true)
{
@@ -87,7 +87,7 @@ Forwarded: no
break;
--- spatialite-gui.orig/MalformedGeoms.cpp
+++ spatialite-gui/MalformedGeoms.cpp
-@@ -909,7 +909,7 @@ void MalformedGeomsDialog::OnRepair(wxCo
+@@ -1009,7 +1009,7 @@ void MalformedGeomsDialog::OnRepair(wxCo
goto clean_up;
}
::wxEndBusyCursor();
@@ -98,7 +98,7 @@ Forwarded: no
return;
--- spatialite-gui.orig/TableTree.cpp
+++ spatialite-gui/TableTree.cpp
-@@ -1960,7 +1960,7 @@ void MyTableTree::OnCmdRecoverSpatialInd
+@@ -2302,7 +2302,7 @@ void MyTableTree::OnCmdRecoverSpatialInd
if (retval)
wxMessageBox(wxT("Spatial Index idx_") + obj->GetName() +
wxT("_") + obj->GetColumn() +
diff --git a/debian/patches/series b/debian/patches/series
index 7c97d68..c798e5e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-00-fix_geos_linking.patch
+00-fix_buildsystem.patch
01-fix_binary_name.patch
02-fix_typos.patch
--
user-friendly graphical user interface for spatialite
More information about the Pkg-grass-devel
mailing list