[SCM] saga branch, master, updated. upstream/2.0.8-138-g9611d39
The following commit has been merged in the master branch: commit 0dcc655b65d3b2291a4d47778cfe91c28ffce4a0 Author: Johan Van de Wauw johan.vandew...@gmail.com Date: Thu Nov 14 20:38:07 2013 -0500 Use upstream .desktop file diff --git a/debian/saga.install b/debian/saga.install index 3ff0d6e..6f08cd6 100644 --- a/debian/saga.install +++ b/debian/saga.install @@ -1,6 +1,5 @@ -src/saga_core/saga_gui/res/xpm/saga_icon_32.xpm /usr/share/pixmaps/ -src/saga_core/saga_gui/res/xpm/saga_icon_16.xpm /usr/share/pixmaps/ -debian/saga_gui.desktop /usr/share/applications/ +src/saga_core/saga_gui/res/saga.desktop /usr/share/applications/ +src/saga_core/saga_gui/res/saga.png /usr/share/pixmaps/ src/saga_core/saga_gui/res/saga_tip.txt /usr/share/saga/ usr/bin usr/lib/saga/*.so diff --git a/debian/saga_gui.desktop b/debian/saga_gui.desktop deleted file mode 100644 index 17e3684..000 --- a/debian/saga_gui.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=SAGA GIS -GenericName=A System for an Automated Geographical Analysis -Comment=View and manipulate geographical information -Type=Application -Exec=saga_gui -Icon=/usr/share/saga/saga_icon_32.xpm -Categories=Science;Education;Geography; -- Saga GIS ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] saga branch, master, updated. upstream/2.0.8-138-g9611d39
The following commit has been merged in the master branch: commit 3afd0a7a7082487fa3877e42e071ad59f08c3860 Author: Johan Van de Wauw johan.vandew...@gmail.com Date: Thu Nov 14 20:40:17 2013 -0500 Update copyright wxpropgrid no longer part of distribution other fixes diff --git a/debian/copyright b/debian/copyright index 7248404..3c707e6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -12,21 +12,18 @@ On two places files were removed to adhere to the DFSG: ***Saga API and cli/gui - Copyright*** src/saga_core/*: -Copyright: 2001-2011 Olaf Conrad +Copyright: 2001-2013 Olaf Conrad Copyright: 2003-2006 Victor Olaya Copyright: 2001-2004 Andre Ringeler Copyright: 2007 Thomas Schorr -Copyright: 2003-2011 Volker Wichmann - -src/saga_core/saga_gui/wx/propgrid/* -Copyright: 2004-2007 Jaakko Salli -http://wxpropgrid.sourceforge.net/ +Copyright: 2003-2013 Volker Wichmann src/saga_core/saga_api/mat_formula.cpp contains code base on work by: Copyright 1993-1998 Herald Helfgott src/saga_core/saga_api/clipper.cpp +src/saga_core/saga_api/clipper.hpp Copyright 2010-2011, Angus Johnson http://www.angusj.com src/saga_core/saga_odbc/otlv4.h @@ -39,6 +36,7 @@ src/saga_core/saga_odbc/* License: LGPGL-2.1 available on debian at: /usr/share/common-licenses/LGPL-2.1 src/saga_core/saga_api/clipper.cpp +src/saga_core/saga_api/clipper.hpp License: Boost Software License ver 1. Boost Software License - Version 1.0 - August 17th, 2003 @@ -87,64 +85,10 @@ src/saga_core/saga_gui/* src/saga_core/saga_cmd/* License: GPL-2 available on debian at: /usr/share/common-licenses/GPL-2 -src/saga_core/saga_gui/wx/propgrid/* -License: wxWindows Library License, this equals the LPGL with exception that object code may be distributed under own terms. -wxWindows library licence: -Copyright (c) 1998 Julian Smart, Robert Roebling [, ...] - -Everyone is permitted to copy and distribute verbatim copies -of this licence document, but changing it is not allowed. - -WXWINDOWS LIBRARY LICENCE - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -This library is free software; you can redistribute it and/or modify it -under the terms of the GNU Library General Public Licence as published by -the Free Software Foundation; either version 2 of the Licence, or (at -your option) any later version. - -This library is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library -General Public Licence for more details. - -You should have received a copy of the GNU Library General Public Licence -along with this software, available on debian systems at: -/usr/share/common-licenses/GPL-2 -If not, write to the Free Software Foundation, Inc., 51 Franklin Street, -Fifth Floor, Boston, MA 02110-1301 USA - -EXCEPTION NOTICE - -1. As a special exception, the copyright holders of this library give -permission for additional uses of the text contained in this release of -the library as licenced under the wxWindows Library Licence, applying -either version 3 of the Licence, or (at your option) any later version of -the Licence as published by the copyright holders of version 3 of the -Licence document. - -2. The exception is that you may use, copy, link, modify and distribute -under the user's own terms, binary object code versions of works based -on the Library. - -3. If you copy code from files distributed under the terms of the GNU -General Public Licence or the GNU Library General Public Licence into a -copy of this library, as this licence permits, the exception does not -apply to the code that you add in this way. To avoid misleading anyone as -to the status of such modified files, you must delete this exception -notice from such code and/or adjust the licensing conditions notice -accordingly. - -4. If you write modifications of your own for this library, it is your -choice whether to permit this exception to apply to your modifications. -If you do not wish that, you must delete the exception notice from such -code and/or adjust the licensing conditions notice accordingly. - *** SAGA modules: Copyright *** src/modules/* src/modules_* -Copyright: 2001-2011 Olaf Conrad +Copyright: 2001-2013 Olaf Conrad Copyright: 2002-2010 SAGA User Group Association Copyright: 2003-2006 Victor Olaya Copyright: 2001-2009 Andre Ringeler @@ -155,6 +99,11 @@ Copyright: 2004 Gianluca Massei Copyright: 2006 Stefan Liersch Copyright: Alessandro Perego Copyright: 2007-2011 Johan Van de Wauw +Copyright: 2013 Benjamin Bechteld +Copyright: 2012 Magnus Bremer +Copyright: 2012 Muhammed Setiawan +Copyright: 2013 Luca Piras + License: GPL-2 available on debian at: /usr/share/common-licenses/GPL-2 Some modules contain (parts of) previously published software: -- Saga GIS ___ Pkg-grass-devel mailing list
[SCM] saga branch, master, updated. upstream/2.0.8-138-g9611d39
The following commit has been merged in the master branch: commit 1315179c1421f8e679c334b30988efcf35aa409b Merge: ba55476a6b9e3009b03a21f4d743a215c3bcb95d ddc5f2dbdb2f95d77bfec8c92d338bfa958b6463 Author: Johan Van de Wauw johan.vandew...@gmail.com Date: Thu Nov 14 20:30:33 2013 -0500 Merge tag 'upstream/2.1.0+dfsg' into saga2.1.0 Upstream version 2.1.0+dfsg -- Saga GIS ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] saga branch, master, updated. upstream/2.0.8-138-g9611d39
The following commit has been merged in the master branch: commit ba55476a6b9e3009b03a21f4d743a215c3bcb95d Merge: dd522f08aa6a04efc150d14d098a9652879a5b66 3e618e7acf3182ed414dfe1ace37e43dbb15cab7 Author: Johan Van de Wauw johan.vandew...@gmail.com Date: Thu Nov 14 20:30:17 2013 -0500 Merge tag 'upstream/2.1.0' into saga2.1.0 Upstream version 2.1.0 -- Saga GIS ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] saga branch, master, updated. upstream/2.0.8-138-g9611d39
The following commit has been merged in the master branch:
commit 262eb7a6ee4324b4042232dad42ac382a5099365
Author: Johan Van de Wauw johan.vandew...@gmail.com
Date: Thu Nov 14 20:41:23 2013 -0500
Update control file + remove control.in
control.in was not used
diff --git a/debian/control b/debian/control
index bf66eba..31c4c68 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ Section: science
Priority: optional
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Uploaders: Johan Van de Wauw johan.vandew...@gmail.com, Francesco Paolo
Lovergine fran...@debian.org
-Build-Depends: libwxgtk2.8-dev, wx-common, libgdal-dev, libexpat-dev,
+Build-Depends: libwxgtk3.0-dev, wx-common, libgdal-dev, libexpat-dev,
libogdi3.2-dev, libproj-dev, libgrib2c-dev, debhelper (=8), swig,
libqhull-dev, libhpdf-dev, python-dev, liblas-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://www.saga-gis.org/
Vcs-Git: git://git.debian.org/pkg-grass/saga.git
Vcs-Browser: http://git.debian.org/?p=pkg-grass/saga.git
@@ -43,7 +43,7 @@ Package: libsaga
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: libsaga-2.0.8
+Provides: libsaga-2.1.0
Description: SAGA GIS development files
SAGA GIS (System for Automated Geoscientific Analyses) is a geographic
information system used for editing and analysing spatial data.
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index f14e600..000
--- a/debian/control.in
+++ /dev/null
@@ -1,62 +0,0 @@
-Source: saga
-Section: science
-Priority: optional
-Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
-Uploaders: Johan Van de Wauw johan.vandew...@gmail.com, Francesco Paolo
Lovergine fran...@debian.org
-Build-Depends: libwxgtk2.8-dev, wx-common, libgdal-dev, libexpat-dev,
- libogdi3.2-dev, libproj-dev, libgrib2c-dev, debhelper (=8), swig,
- libqhull-dev, libhpdf-dev, python-dev, liblas-dev
-Standards-Version: 3.9.3
-Homepage: http://www.saga-gis.org/
-Vcs-Git: git://git.debian.org/pkg-grass/saga.git
-Vcs-Browser: http://git.debian.org/?p=pkg-grass/saga.git
-
-Package: saga
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libsaga (= ${binary:Version})
-Description: System for Automated Geoscientific Analyses
- SAGA GIS (System for Automated Geoscientific Analyses) is a free and
- open source geographic information system used for editing and
- analysing spatial data. It includes a large number of modules for the
- analysis of vector (point, line and polygon), table, grid and image
- data. Among others the package includes modules for geostatistics,
- image classification, projections, simulation of dynamic processes
- (hydrology, landscape development) and terrain analysis.
- The functionality can be accessed through a GUI, the command line or
- by using the C++ API.
-
-Package: libsaga-dev
-Section: libdevel
-Architecture: any
-Suggests: saga (= ${binary:Version})
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libsaga ( 2.0.4+dfsg-3~)
-Breaks: libsaga ( 2.0.4+dfsg-3~)
-Description: SAGA GIS development files
- SAGA GIS (System for Automated Geoscientific Analyses) is a geographic
- information system used for editing and analysing spatial data.
- .
- This package contains the header files for developing with SAGA.
- Install this package if you wish to develop software that uses the SAGA API.
-
-Package: libsaga
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: libsaga-@VERSION@
-Description: SAGA GIS development files
- SAGA GIS (System for Automated Geoscientific Analyses) is a geographic
- information system used for editing and analysing spatial data.
- .
- This package contains the library files for developing with SAGA.
-
-Package: python-saga
-Section: python
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libsaga (=
${binary:Version})
-Suggests: saga (= ${binary:Version})
-Description: SAGA GIS python bindings
- SAGA GIS (System for Automated Geoscientific Analyses) is a geographic
- information system used for editing and analysing spatial data.
- .
- This package contains the python bindings to SAGA.
--
Saga GIS
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] saga branch, master, updated. upstream/2.0.8-138-g9611d39
The following commit has been merged in the master branch: commit 3ad252a43358715b424a3497713a62b29c1efc2b Author: Johan Van de Wauw johan.vandew...@gmail.com Date: Fri Nov 15 00:07:43 2013 -0500 Use qhull instead of triangle diff --git a/debian/patches/0004-Use-qhull-instead-of-triangle.patch b/debian/patches/0004-Use-qhull-instead-of-triangle.patch new file mode 100644 index 000..8b465ba --- /dev/null +++ b/debian/patches/0004-Use-qhull-instead-of-triangle.patch @@ -0,0 +1,96 @@ +From: Johan Van de Wauw johan.vandew...@gmail.com +Date: Fri, 15 Nov 2013 00:06:46 -0500 +Subject: Use qhull instead of triangle + +--- + src/modules/grid/grid_gridding/Makefile.am | 3 +-- + src/modules/grid/grid_gridding/Makefile.in | 13 ++--- + src/modules/grid/grid_gridding/nn/delaunay.c | 2 +- + 3 files changed, 4 insertions(+), 14 deletions(-) + +diff --git a/src/modules/grid/grid_gridding/Makefile.am b/src/modules/grid/grid_gridding/Makefile.am +index 75c79c9..bc55004 100644 +--- a/src/modules/grid/grid_gridding/Makefile.am b/src/modules/grid/grid_gridding/Makefile.am +@@ -13,7 +13,7 @@ endif + DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD + CXX_INCS = -I$(top_srcdir)/src/saga_core + AM_CXXFLAGS= -fPIC $(CXX_INCS) $(DEP_DEFS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +-AM_LDFLAGS = -fPIC -shared -avoid-version ++AM_LDFLAGS = -fPIC -shared -avoid-version -lqhull + pkglib_LTLIBRARIES = libgrid_gridding.la + libgrid_gridding_la_SOURCES =\ + Interpolation.cpp\ +@@ -34,7 +34,6 @@ Shepard.cpp\ + ./nn/nnai.c\ + ./nn/nncommon.c\ + ./nn/nnpi.c\ +-./nn/triangle.c\ + Interpolation.h\ + Interpolation_AngularDistance.h\ + Interpolation_InverseDistance.h\ +diff --git a/src/modules/grid/grid_gridding/Makefile.in b/src/modules/grid/grid_gridding/Makefile.in +index 4ff6a48..1fdaa47 100644 +--- a/src/modules/grid/grid_gridding/Makefile.in b/src/modules/grid/grid_gridding/Makefile.in +@@ -133,7 +133,7 @@ am_libgrid_gridding_la_OBJECTS = Interpolation.lo \ + Interpolation_NearestNeighbour.lo Interpolation_Shepard.lo \ + Interpolation_Triangulation.lo kernel_density.lo \ + MLB_Interface.lo Shapes2Grid.lo Shepard.lo delaunay.lo hash.lo \ +- istack.lo lpi.lo nnai.lo nncommon.lo nnpi.lo triangle.lo ++ istack.lo lpi.lo nnai.lo nncommon.lo nnpi.lo + libgrid_gridding_la_OBJECTS = $(am_libgrid_gridding_la_OBJECTS) + AM_V_lt = $(am__v_lt_@AM_V@) + am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +@@ -371,7 +371,7 @@ top_srcdir = @top_srcdir@ + DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD + CXX_INCS = -I$(top_srcdir)/src/saga_core + AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEP_DEFS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS) +-AM_LDFLAGS = -fPIC -shared -avoid-version ++AM_LDFLAGS = -fPIC -shared -avoid-version -lqhull + pkglib_LTLIBRARIES = libgrid_gridding.la + libgrid_gridding_la_SOURCES = \ + Interpolation.cpp\ +@@ -392,7 +392,6 @@ Shepard.cpp\ + ./nn/nnai.c\ + ./nn/nncommon.c\ + ./nn/nnpi.c\ +-./nn/triangle.c\ + Interpolation.h\ + Interpolation_AngularDistance.h\ + Interpolation_InverseDistance.h\ +@@ -510,7 +509,6 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nnai.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nncommon.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nnpi.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/triangle.Plo@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $ +@@ -582,13 +580,6 @@ nnpi.lo: ./nn/nnpi.c + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nnpi.lo `test -f './nn/nnpi.c' || echo '$(srcdir)/'`./nn/nnpi.c + +-triangle.lo: ./nn/triangle.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT triangle.lo -MD -MP -MF $(DEPDIR)/triangle.Tpo -c -o triangle.lo `test -f './nn/triangle.c' || echo '$(srcdir)/'`./nn/triangle.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/triangle.Tpo $(DEPDIR)/triangle.Plo +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='./nn/triangle.c' object='triangle.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o triangle.lo `test -f './nn/triangle.c' || echo
[SCM] saga branch, master, updated. upstream/2.0.8-138-g9611d39
The following commit has been merged in the master branch: commit d106aa7acbbd08a3ebd6171327b54dac8fcd961c Author: Johan Van de Wauw johan.vandew...@gmail.com Date: Thu Nov 14 21:17:51 2013 -0500 Update changelog diff --git a/debian/changelog b/debian/changelog index a521a1b..96aaf01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +saga (2.1.0+dfsg-1) UNRELEASED; urgency=low + + * Update to new upstream version + * Uses wxwidgets 3.0 instead of 2.8 + + -- Johan Van de Wauw johan.vandew...@gmail.com Thu, 14 Nov 2013 21:16:53 -0500 + saga (2.0.8+dfsg-4) unstable; urgency=low * Correct saga-depends -- Saga GIS ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] saga branch, master, updated. upstream/2.0.8-138-g9611d39
The following commit has been merged in the master branch: commit 2ce5e4b1562b77b0ad21284175eabe04ad9ffcc9 Author: Johan Van de Wauw johan.vandew...@gmail.com Date: Thu Nov 14 22:00:09 2013 -0500 Update patches diff --git a/debian/patches/0001-Remove-references-to-libfire.patch b/debian/patches/0001-Remove-references-to-libfire.patch index 83173b4..d5299c9 100644 --- a/debian/patches/0001-Remove-references-to-libfire.patch +++ b/debian/patches/0001-Remove-references-to-libfire.patch @@ -2,6 +2,7 @@ From: Johan Van de Wauw johan.vandew...@gmail.com Date: Thu, 14 Nov 2013 20:58:08 -0500 Subject: Remove references to libfire +libfire --- configure.in | 2 -- src/modules_simulation/Makefile.am | 2 +- diff --git a/debian/patches/0003-Autoconf-fi-result.patch b/debian/patches/0003-Autoreconf-fi-result.patch similarity index 99% rename from debian/patches/0003-Autoconf-fi-result.patch rename to debian/patches/0003-Autoreconf-fi-result.patch index a541bba..b41832b 100644 --- a/debian/patches/0003-Autoconf-fi-result.patch +++ b/debian/patches/0003-Autoreconf-fi-result.patch @@ -1,6 +1,6 @@ From: Johan Van de Wauw johan.vandew...@gmail.com -Date: Thu, 14 Nov 2013 21:02:10 -0500 -Subject: Autoconf -fi result +Date: Thu, 14 Nov 2013 21:58:12 -0500 +Subject: Autoreconf -fi result --- INSTALL|15 +- diff --git a/debian/patches/series b/debian/patches/series index 9fd442d..7b093d3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ 0001-Remove-references-to-libfire.patch 0002-Use-debian-version-of-grib2.patch -0003-Autoconf-fi-result.patch +0003-Autoreconf-fi-result.patch -- Saga GIS ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] saga branch, master, updated. upstream/2.0.8-138-g9611d39
The following commit has been merged in the master branch: commit 0723a94518b2375320bc3a0414ef11e57c589936 Author: Johan Van de Wauw johan.vandew...@gmail.com Date: Thu Nov 14 22:11:50 2013 -0500 Use autoreconf diff --git a/debian/control b/debian/control index 31c4c68..808e071 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Johan Van de Wauw johan.vandew...@gmail.com, Francesco Paolo Lovergine fran...@debian.org Build-Depends: libwxgtk3.0-dev, wx-common, libgdal-dev, libexpat-dev, libogdi3.2-dev, libproj-dev, libgrib2c-dev, debhelper (=8), swig, - libqhull-dev, libhpdf-dev, python-dev, liblas-dev + libqhull-dev, libhpdf-dev, python-dev, liblas-dev, dh-autoreconf Standards-Version: 3.9.4 Homepage: http://www.saga-gis.org/ Vcs-Git: git://git.debian.org/pkg-grass/saga.git diff --git a/debian/rules b/debian/rules index 5a1b3ea..399e5fa 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f %: - dh $@ --with python2 + dh $@ --with python2 --with autoreconf override_dh_auto_configure: dh_auto_configure -- --enable-unicode --prefix=/usr --enable-python -- Saga GIS ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] saga branch, master, updated. upstream/2.0.8-138-g9611d39
The following commit has been merged in the master branch:
commit f33ac5481952b0bea9ba7a3732a16e1c5614853a
Author: Johan Van de Wauw johan.vandew...@gmail.com
Date: Fri Nov 15 00:12:26 2013 -0500
Enable hardening fix security warnings
diff --git a/debian/patches/0005-Fix-gcc-security-warnings.patch
b/debian/patches/0005-Fix-gcc-security-warnings.patch
new file mode 100644
index 000..71621f0
--- /dev/null
+++ b/debian/patches/0005-Fix-gcc-security-warnings.patch
@@ -0,0 +1,38 @@
+From: Johan Van de Wauw johan.vandew...@gmail.com
+Date: Fri, 15 Nov 2013 01:57:38 -0500
+Subject: Fix gcc security warnings
+
+---
+ src/modules_io/grid/io_grid/esri_arcinfo.cpp | 8
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/modules_io/grid/io_grid/esri_arcinfo.cpp
b/src/modules_io/grid/io_grid/esri_arcinfo.cpp
+index 477dd41..970eb71 100644
+--- a/src/modules_io/grid/io_grid/esri_arcinfo.cpp
b/src/modules_io/grid/io_grid/esri_arcinfo.cpp
+@@ -594,13 +594,13 @@ bool CESRI_ArcInfo_Export::On_Execute(void)
+ {
+ if( x 0 )
+ {
+- fprintf(Stream.Get_Stream(), );
++ fputs( ,Stream.Get_Stream());
+ }
+
+- fprintf(Stream.Get_Stream(),
Write_Value(pGrid-asDouble(x, y), Precision, bComma).b_str());
++ fputs(Write_Value(pGrid-asDouble(x, y),
Precision, bComma).b_str(),Stream.Get_Stream());
+ }
+
+- fprintf(Stream.Get_Stream(), \n);
++ fputs(\n, Stream.Get_Stream());
+ }
+
+ pGrid-Get_Projection().Save(SG_File_Make_Path(NULL, fName,
SG_T(prj)));
+@@ -671,7 +671,7 @@ bool CESRI_ArcInfo_Export::Write_Header(CSG_File Stream,
CSG_Grid *pGrid, bool
+ s += CSG_String::Format(SG_T(%s %s\n) ,
HDR_BYTEORDER , Parameters(BYTEORD)-asInt() == 1 ? HDR_BYTEORDER_LO :
HDR_BYTEORDER_HI);
+ }
+
+- fprintf(Stream.Get_Stream(), s.b_str());
++ fputs(s.b_str(),Stream.Get_Stream());
+
+ return( true );
+ }
diff --git a/debian/patches/series b/debian/patches/series
index ff689cf..091527e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
0002-Use-debian-version-of-grib2.patch
0003-Autoreconf-fi-result.patch
0004-Use-qhull-instead-of-triangle.patch
+0005-Fix-gcc-security-warnings.patch
diff --git a/debian/rules b/debian/rules
index 399e5fa..07d393c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
dh $@ --with python2 --with autoreconf
override_dh_auto_configure:
- dh_auto_configure -- --enable-unicode --prefix=/usr --enable-python
+ dh_auto_configure -- --enable-unicode --prefix=/usr --enable-python
$(shell dpkg-buildflags --export=configure)
VERSION := $(shell grep '^AC_INIT' configure.in | \
sed 's/AC_INIT(saga, \([0-9|\.]*\)\,.*)/\1/g')
--
Saga GIS
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] saga branch, master, updated. upstream/2.0.8-138-g9611d39
The following commit has been merged in the master branch: commit 9611d3945847d387e913131d13bb81a53a3a122f Author: Johan Van de Wauw johan.vandew...@gmail.com Date: Fri Nov 15 04:57:49 2013 -0500 Delete saga_api.py on clean diff --git a/debian/rules b/debian/rules index 07d393c..e359d00 100755 --- a/debian/rules +++ b/debian/rules @@ -16,6 +16,10 @@ debian/% :: debian/%.in override_dh_python2: dh_python2 --no-guessing-versions +override_dh_clean: + dh_clean + rm -f src/saga_core/saga_api/saga_api.py + get-orig-source: wget $(UPSTREAM_URL) gunzip *.tar.gz -- Saga GIS ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
