This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository spatialite-gui.
commit 95f6775d1acbec8f6db16383ae6fa222acc29640
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sat Jun 27 16:44:42 2015 +0200
Drop patches applied upstream, refresh remaining patches.
---
debian/patches/00-fix_buildsystem.patch | 27 --------
debian/patches/02-fix_typos.patch | 114 --------------------------------
debian/patches/03-link-sqlite3.patch | 26 --------
debian/patches/series | 3 -
4 files changed, 170 deletions(-)
diff --git a/debian/patches/00-fix_buildsystem.patch
b/debian/patches/00-fix_buildsystem.patch
deleted file mode 100644
index 179a7e5..0000000
--- a/debian/patches/00-fix_buildsystem.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: David Paleino <da...@debian.org>
-Subject: fix buildsystem
-Origin: vendor
-Forwarded:
https://groups.google.com/d/msg/spatialite-users/kIZA-n4f9kk/ouO4UhLUZFMJ
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -6,7 +6,7 @@ AC_INIT(spatialite_gui, 2.0.0-devel, a.f
- AC_LANG(C)
- AC_CONFIG_MACRO_DIR([m4])
-
--AM_INIT_AUTOMAKE
-+AM_INIT_AUTOMAKE([foreign])
- AM_MAINTAINER_MODE
- AM_CONFIG_HEADER(config.h)
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -15,7 +15,7 @@ spatialite_gui_SOURCES = Classdef.h Blob
- VectorSymbolizers2.cpp
-
- LDADD = @WX_LIBS@ @LIBSPATIALITE_LIBS@ \
-- @LIBRASTERLITE2_LIBS@ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@
-+ @LIBRASTERLITE2_LIBS@ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ -lgeos_c
-
- EXTRA_DIST = Makefile-static-MinGW \
- Makefile-static-Linux \
diff --git a/debian/patches/02-fix_typos.patch
b/debian/patches/02-fix_typos.patch
deleted file mode 100644
index d610316..0000000
--- a/debian/patches/02-fix_typos.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From: David Paleino <da...@debian.org>
-Subject: fix typos in source code
-Forwarded:
https://groups.google.com/d/msg/spatialite-users/kIZA-n4f9kk/ouO4UhLUZFMJ
-
----
- Dialogs.cpp | 2 +-
- Exif.cpp | 4 ++--
- Main.cpp | 12 ++++++------
- MalformedGeoms.cpp | 2 +-
- TableTree.cpp | 4 ++--
- 5 files changed, 12 insertions(+), 12 deletions(-)
-
---- a/Exif.cpp
-+++ b/Exif.cpp
-@@ -64,8 +64,8 @@ void MyFrame::ImportExifPhotos(wxString
- else
- cnt = ExifLoadFile(path, gps_only, metadata);
- ::wxEndBusyCursor();
-- sprintf(msg, "%d EXIF photo%s succesfully inserted into the DB\n", cnt,
-- (cnt > 1) ? "s where" : " was");
-+ sprintf(msg, "%d EXIF photo%s successfully inserted into the DB\n", cnt,
-+ (cnt > 1) ? "s were" : " was");
- wxMessageBox(wxString::FromUTF8(msg), wxT("spatialite_gui"),
- wxOK | wxICON_INFORMATION, this);
- InitTableTree();
---- a/Dialogs.cpp
-+++ b/Dialogs.cpp
-@@ -5576,7 +5576,7 @@ void AutoSaveDialog::OnChangePath(wxComm
- MainFrame->SetExternalSqlitePath(pth);
- if (MainFrame->MemoryDbSave() == true)
- {
-- wxMessageBox(wxT("Ok, MEMORY-DB was succesfully saved"),
-+ wxMessageBox(wxT("Ok, MEMORY-DB was successfully saved"),
- wxT("spatialite_gui"), wxOK | wxICON_INFORMATION,
this);
- wxFileName file(fileDialog.GetPath());
- lastDir = file.GetPath();
---- a/Main.cpp
-+++ b/Main.cpp
-@@ -2412,7 +2412,7 @@ void MyFrame::OnMemoryDbSave(wxCommandEv
- {
- if (MemoryDbSave() == true)
- {
-- wxMessageBox(wxT("Ok, MEMORY-DB was succesfully saved"),
-+ wxMessageBox(wxT("Ok, MEMORY-DB was successfully saved"),
- wxT("spatialite_gui"), wxOK | wxICON_INFORMATION,
this);
- if (AutoSaveInterval <= 0)
- {
-@@ -2452,7 +2452,7 @@ void MyFrame::OnMemoryDbSave(wxCommandEv
- ExternalSqlitePath = fileDialog.GetPath();
- if (MemoryDbSave() == true)
- {
-- wxMessageBox(wxT("Ok, MEMORY-DB was succesfully saved"),
-+ wxMessageBox(wxT("Ok, MEMORY-DB was successfully saved"),
- wxT("spatialite_gui"), wxOK | wxICON_INFORMATION,
this);
- wxFileName file(fileDialog.GetPath());
- lastDir = file.GetPath();
-@@ -2706,7 +2706,7 @@ void MyFrame::OnVacuum(wxCommandEvent &
- } else
- {
- DbPagesCount(&totalPages2, &freePages2);
-- msg = wxT("Current DB was succesfully optimized");
-+ msg = wxT("Current DB was successfully optimized");
- if (totalPages2 < totalPages)
- {
- sprintf(dummy, "\n\n%d unused pages were reclaimed",
-@@ -3032,7 +3032,7 @@ void MyFrame::OnSqlScript(wxCommandEvent
- break;
- }
- sprintf(dummy,
-- "SQL Script normal termination\n\n%d SQL statements where
performed",
-+ "SQL Script normal termination\n\n%d SQL statements were
performed",
- stmt);
- msg = wxString::FromUTF8(dummy);
- wxMessageBox(msg, wxT("spatialite_gui"), wxOK | wxICON_INFORMATION,
-@@ -5070,7 +5070,7 @@ void MyFrame::LastDitchMemoryDbSave()
- ExternalSqlitePath = fileDialog.GetPath();
- if (MemoryDbSave() == true)
- {
-- wxMessageBox(wxT("Ok, MEMORY-DB was succesfully saved"),
-+ wxMessageBox(wxT("Ok, MEMORY-DB was successfully saved"),
- wxT("spatialite_gui"), wxOK | wxICON_INFORMATION,
- this);
- break;
---- a/MalformedGeoms.cpp
-+++ b/MalformedGeoms.cpp
-@@ -1012,7 +1012,7 @@ void MalformedGeomsDialog::OnRepair(wxCo
- goto clean_up;
- }
- ::wxEndBusyCursor();
-- wxMessageBox(wxT("Repair completed succesfully"),
-+ wxMessageBox(wxT("Repair completed successfully"),
- wxT("spatialite_gui"), wxOK | wxICON_INFORMATION, this);
- wxDialog::EndModal(wxID_OK);
- return;
---- a/TableTree.cpp
-+++ b/TableTree.cpp
-@@ -3088,7 +3088,7 @@ void MyTableTree::OnCmdRecoverSpatialInd
- else if (retval)
- wxMessageBox(wxT("Spatial Index idx_") + obj->GetName() +
- wxT("_") + obj->GetColumn() +
-- wxT(" was succesfully recovered"), wxT("spatialite_gui"),
-+ wxT(" was successfully recovered"),
wxT("spatialite_gui"),
- wxOK | wxICON_INFORMATION, this);
- else
- wxMessageBox(wxT("ERROR: unable to recover Spatial Index idx_") +
-@@ -3971,7 +3971,7 @@ void MyTableTree::OnCmdRepairPolygons(wx
- if (count > 0)
- {
- char str[256];
-- sprintf(str, "%d Geometries were succesfully updated", count);
-+ sprintf(str, "%d Geometries were successfully updated", count);
- wxMessageBox(wxString::FromUTF8(str), wxT("spatialite_gui"),
- wxOK | wxICON_INFORMATION, this);
- ::wxEndBusyCursor();
diff --git a/debian/patches/03-link-sqlite3.patch
b/debian/patches/03-link-sqlite3.patch
deleted file mode 100644
index 136cf97..0000000
--- a/debian/patches/03-link-sqlite3.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Link to sqlite3 library.
-Author: Bas Couwenberg <sebas...@debian.org>
-Bug: https://bugs.debian.org/713644
-Last-Update: 2013-09-30
-Forwarded:
https://groups.google.com/d/msg/spatialite-users/kIZA-n4f9kk/YDoKnechHBgJ
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -98,6 +98,8 @@ AC_CHECK_HEADERS(stddef.h,, [AC_MSG_ERRO
- AC_CHECK_HEADERS(stdint.h,, [AC_MSG_ERROR([cannot find stdint.h, bailing
out])])
- AC_CHECK_HEADERS(sys/time.h,, [AC_MSG_ERROR([cannot find sys/time.h, bailing
out])])
- AC_CHECK_HEADERS(unistd.h,, [AC_MSG_ERROR([cannot find unistd.h, bailing
out])])
-+AC_CHECK_HEADERS(sqlite3.h,, [AC_MSG_ERROR([cannot find sqlite3.h, bailing
out])])
-+AC_CHECK_HEADERS(sqlite3ext.h,, [AC_MSG_ERROR([cannot find sqlite3ext.h,
bailing out])])
-
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
-@@ -115,6 +117,8 @@ AC_FUNC_STAT
- AC_FUNC_STRFTIME
- AC_CHECK_FUNCS([memset sqrt strcasecmp strerror strncasecmp strstr fdatasync
ftruncate getcwd gettimeofday localtime_r memmove strerror])
-
-+# Checks for installed libraries
-+AC_CHECK_LIB(sqlite3,sqlite3_prepare_v2,,AC_MSG_ERROR(['libsqlite3' is
required but it doesn't seem to be installed on this system.]),-lm)
- 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)
-
- #-----------------------------------------------------------------------
diff --git a/debian/patches/series b/debian/patches/series
index b8c0f86..1e9839c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-00-fix_buildsystem.patch
01-fix_binary_name.patch
-02-fix_typos.patch
-03-link-sqlite3.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/spatialite-gui.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
