This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository spatialite-gui.
commit 4d18cd4cda3291a85b9437ac2579fc669c730b99 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sat Jun 20 15:49:39 2015 +0200 Drop patches applied upstream, refresh remaining patches. --- debian/changelog | 1 + debian/patches/00-fix_buildsystem.patch | 12 ++++++------ debian/patches/01-fix_binary_name.patch | 8 ++++---- debian/patches/02-fix_typos.patch | 26 +++++++++++--------------- debian/patches/03-link-sqlite3.patch | 4 ++-- debian/patches/04-wx3.0-compat.patch | 26 -------------------------- debian/patches/05-setlocale.patch | 17 ----------------- debian/patches/series | 2 -- 8 files changed, 24 insertions(+), 72 deletions(-) diff --git a/debian/changelog b/debian/changelog index 111bead..06f1355 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ spatialite-gui (2.0.0~devel-1) UNRELEASED; urgency=medium * Update copyright file, changes: - Update copyright years - Drop .0 from GPL license shortnames. + * Drop patches applied upstream, refresh remaining patches. -- Bas Couwenberg <sebas...@debian.org> Fri, 19 Jun 2015 23:58:37 +0200 diff --git a/debian/patches/00-fix_buildsystem.patch b/debian/patches/00-fix_buildsystem.patch index 22570bd..1f8a2b5 100644 --- a/debian/patches/00-fix_buildsystem.patch +++ b/debian/patches/00-fix_buildsystem.patch @@ -5,7 +5,7 @@ Forwarded: no --- a/configure.ac +++ b/configure.ac -@@ -6,7 +6,7 @@ AC_INIT(spatialite_gui, 1.7.1, a.furieri +@@ -6,7 +6,7 @@ AC_INIT(spatialite_gui, 2.0.0-devel, a.f AC_LANG(C) AC_CONFIG_MACRO_DIR([m4]) @@ -16,12 +16,12 @@ Forwarded: no --- a/Makefile.am +++ b/Makefile.am -@@ -13,7 +13,7 @@ spatialite_gui_SOURCES = Classdef.h Blob - TextCsv.cpp Wfs.cpp +@@ -15,7 +15,7 @@ spatialite_gui_SOURCES = Classdef.h Blob + VectorSymbolizers2.cpp - LDADD = @WX_LIBS@ @LIBGAIAGRAPHICS_LIBS@ @LIBSPATIALITE_LIBS@ \ -- @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ -+ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ -lgeos_c + 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/01-fix_binary_name.patch b/debian/patches/01-fix_binary_name.patch index d3336c3..d459a9f 100644 --- a/debian/patches/01-fix_binary_name.patch +++ b/debian/patches/01-fix_binary_name.patch @@ -16,16 +16,16 @@ Forwarded: no -bin_PROGRAMS = spatialite_gui +bin_PROGRAMS = spatialite-gui - INCLUDES = @CFLAGS@ - INCLUDES += -I$(top_srcdir) + AM_CPPFLAGS = @CFLAGS@ + AM_CPPFLAGS += -I$(top_srcdir) --- 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.7.1, a.furi...@lqt.it) -+AC_INIT(spatialite-gui, 1.7.1, a.furi...@lqt.it) +-AC_INIT(spatialite_gui, 2.0.0-devel, a.furi...@lqt.it) ++AC_INIT(spatialite-gui, 2.0.0-devel, a.furi...@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 ec91ce9..02b7527 100644 --- a/debian/patches/02-fix_typos.patch +++ b/debian/patches/02-fix_typos.patch @@ -25,7 +25,7 @@ Forwarded: no InitTableTree(); --- a/Dialogs.cpp +++ b/Dialogs.cpp -@@ -5306,7 +5306,7 @@ void AutoSaveDialog::OnChangePath(wxComm +@@ -5576,7 +5576,7 @@ void AutoSaveDialog::OnChangePath(wxComm MainFrame->SetExternalSqlitePath(pth); if (MainFrame->MemoryDbSave() == true) { @@ -36,7 +36,7 @@ Forwarded: no lastDir = file.GetPath(); --- a/Main.cpp +++ b/Main.cpp -@@ -2022,7 +2022,7 @@ void MyFrame::OnMemoryDbSave(wxCommandEv +@@ -2412,7 +2412,7 @@ void MyFrame::OnMemoryDbSave(wxCommandEv { if (MemoryDbSave() == true) { @@ -45,7 +45,7 @@ Forwarded: no wxT("spatialite_gui"), wxOK | wxICON_INFORMATION, this); if (AutoSaveInterval <= 0) { -@@ -2062,7 +2062,7 @@ void MyFrame::OnMemoryDbSave(wxCommandEv +@@ -2452,7 +2452,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(); -@@ -2316,10 +2316,10 @@ void MyFrame::OnVacuum(wxCommandEvent & +@@ -2706,7 +2706,7 @@ void MyFrame::OnVacuum(wxCommandEvent & } else { DbPagesCount(&totalPages2, &freePages2); @@ -62,12 +62,8 @@ Forwarded: no + msg = wxT("Current DB was successfully optimized"); if (totalPages2 < totalPages) { -- sprintf(dummy, "\n\n%d unused pages where reclaimed", -+ sprintf(dummy, "\n\n%d unused pages were reclaimed", - totalPages - totalPages2); - msg += wxString::FromUTF8(dummy); - } -@@ -2642,7 +2642,7 @@ void MyFrame::OnSqlScript(wxCommandEvent + sprintf(dummy, "\n\n%d unused pages were reclaimed", +@@ -3032,7 +3032,7 @@ void MyFrame::OnSqlScript(wxCommandEvent break; } sprintf(dummy, @@ -76,7 +72,7 @@ Forwarded: no stmt); msg = wxString::FromUTF8(dummy); wxMessageBox(msg, wxT("spatialite_gui"), wxOK | wxICON_INFORMATION, -@@ -3724,7 +3724,7 @@ void MyFrame::LastDitchMemoryDbSave() +@@ -5070,7 +5070,7 @@ void MyFrame::LastDitchMemoryDbSave() ExternalSqlitePath = fileDialog.GetPath(); if (MemoryDbSave() == true) { @@ -87,7 +83,7 @@ Forwarded: no break; --- a/MalformedGeoms.cpp +++ b/MalformedGeoms.cpp -@@ -1009,7 +1009,7 @@ void MalformedGeomsDialog::OnRepair(wxCo +@@ -1012,7 +1012,7 @@ void MalformedGeomsDialog::OnRepair(wxCo goto clean_up; } ::wxEndBusyCursor(); @@ -98,8 +94,8 @@ Forwarded: no return; --- a/TableTree.cpp +++ b/TableTree.cpp -@@ -2374,7 +2374,7 @@ void MyTableTree::OnCmdRecoverSpatialInd - if (retval) +@@ -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"), @@ -107,7 +103,7 @@ Forwarded: no wxOK | wxICON_INFORMATION, this); else wxMessageBox(wxT("ERROR: unable to recover Spatial Index idx_") + -@@ -3150,7 +3150,7 @@ void MyTableTree::OnCmdRepairPolygons(wx +@@ -3971,7 +3971,7 @@ void MyTableTree::OnCmdRepairPolygons(wx if (count > 0) { char str[256]; diff --git a/debian/patches/03-link-sqlite3.patch b/debian/patches/03-link-sqlite3.patch index 73b4681..bdab20d 100644 --- a/debian/patches/03-link-sqlite3.patch +++ b/debian/patches/03-link-sqlite3.patch @@ -4,7 +4,7 @@ Bug: https://bugs.debian.org/713644 Last-Update: 2013-09-30 --- a/configure.ac +++ b/configure.ac -@@ -70,6 +70,8 @@ AC_CHECK_HEADERS(stddef.h,, [AC_MSG_ERRO +@@ -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])]) @@ -13,7 +13,7 @@ Last-Update: 2013-09-30 # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST -@@ -87,6 +89,8 @@ AC_FUNC_STAT +@@ -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]) diff --git a/debian/patches/04-wx3.0-compat.patch b/debian/patches/04-wx3.0-compat.patch deleted file mode 100644 index d7b9afe..0000000 --- a/debian/patches/04-wx3.0-compat.patch +++ /dev/null @@ -1,26 +0,0 @@ -Description: Fix to build with wxwidgets 3.0 -Author: Olly Betts <o...@survex.com> -Last-Update: 2014-05-01 - ---- a/configure -+++ b/configure -@@ -15543,7 +15543,7 @@ if test x$WX_CONFIG == xnot_found; then - fi - CXXFLAGS="$(wx-config --cxxflags)" - AM_CXXFLAGS="$(wx-config --cxxflags)" --WX_LIBS="$(wx-config --libs)" -+WX_LIBS="$(wx-config --libs std,aui)" - - - # Checks for header files. ---- a/configure.ac -+++ b/configure.ac -@@ -54,7 +54,7 @@ if test x$WX_CONFIG == xnot_found; then - fi - CXXFLAGS="$(wx-config --cxxflags)" - AM_CXXFLAGS="$(wx-config --cxxflags)" --WX_LIBS="$(wx-config --libs)" -+WX_LIBS="$(wx-config --libs std,aui)" - AC_SUBST(WX_LIBS) - - # Checks for header files. diff --git a/debian/patches/05-setlocale.patch b/debian/patches/05-setlocale.patch deleted file mode 100644 index e79b2d7..0000000 --- a/debian/patches/05-setlocale.patch +++ /dev/null @@ -1,17 +0,0 @@ -From: Alessandro Furieri <a.furi...@lqt.it> -Subject: Fix crash when using wxWidgets3.0 - -* Main.cpp: Use setlocale because wxWidgets does not seem to do it anymore - -Origin: upstream, email -Bug-Debian: http://bugs.debian.org/761629 ---- a/Main.cpp -+++ b/Main.cpp -@@ -104,6 +104,7 @@ wxFrame((wxFrame *) NULL, -1, title, pos - // - // main GUI frame constructor - // -+ setlocale(LC_ALL, ""); - MemoryDatabase = false; - AutoSaveInterval = 0; - LastTotalChanges = 0; diff --git a/debian/patches/series b/debian/patches/series index f05fa24..b8c0f86 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,5 +2,3 @@ 01-fix_binary_name.patch 02-fix_typos.patch 03-link-sqlite3.patch -04-wx3.0-compat.patch -05-setlocale.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