[Git][debian-gis-team/saga][experimental] 2 commits: Support both - and _ in tarball names

[Bas Couwenberg]

Bas Couwenberg pushed to branch experimental at Debian GIS Project / saga


Commits:
e514b9a5 by Johan Van de Wauw at 2018-03-22T22:52:00+01:00
Support both - and _ in tarball names

- - - - -
5f29dcdd by Johan Van de Wauw at 2018-03-22T22:55:50+01:00
Update exclude files - fix copyright paths

- - - - -


2 changed files:

- debian/copyright
- debian/watch


Changes:

=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,14 +3,14 @@ Upstream-Name: SAGA GIS
 Upstream-Contact: Olaf Conrad <oconrad at saga-gis.org>
 Source: http://www.saga-gis.org 
 Comment: Saga is generally licensed using two licenses: LGPL-2.1 for the libraries and GPL-2 for the rest of the program. 
-Files-Excluded: src/modules/grid/grid_gridding/nn/triangle.c src/modules/grid/grid_gridding/nn/triangle.h src/modules/simulation/sim_fire_spreading /src/modules/io/io_grid_grib2/g2clib-1.0.4/  src/modules/imagery/imagery_svm/svm.cpp  src/modules/imagery/imagery_svm/svm.h
+Files-Excluded: src/tools/grid/grid_gridding/nn/triangle.c src/tools/grid/grid_gridding/nn/triangle.h src/tools/simulation/sim_fire_spreading /src/tools/io/io_grid_grib2/g2clib-1.0.4/ src/tools/imagery/imagery_svm/svm.cpp  src/tools/imagery/imagery_svm/svm.h src/tools/riegl
 
 Files: *
-Copyright: 2001-2014 Olaf Conrad 
+Copyright: 2001-2018 Olaf Conrad 
  2003-2006 Victor Olaya 
  2001-2004 Andre Ringeler 
  2007      Thomas Schorr
- 2003-2014 Volker Wichmann
+ 2003-2018 Volker Wichmann
 License: GPL-2
 
 Files: src/saga_core/saga_api/* src/saga_core/saga_gdi/*  
@@ -21,7 +21,7 @@ Copyright: 2001-2014 Olaf Conrad
  2003-2014 Volker Wichmann
 License: LGPL-2.1
 
-Files: src/modules/*
+Files: src/tools/*
 Copyright: 2001-2013 Olaf Conrad 
  2002-2010 SAGA User Group Association
  2003-2006 Victor Olaya
@@ -32,14 +32,14 @@ Copyright: 2001-2013 Olaf Conrad
  2004 Gianluca Massei
  2006 Stefan Liersch
       Alessandro Perego
- 2007-2011 Johan Van de Wauw
+ 2007-2018 Johan Van de Wauw
  2013 Benjamin Bechteld
  2012 Magnus Bremer
  2012 Muhammed Setiawan
  2013 Luca Piras
 License: GPL-2
 
-Files:src/modules/imagery/imagery_tools/landsat_toar_core.cpp
+Files:src/tools/imagery/imagery_tools/landsat_toar_core.cpp
 Copyright: 2000-2005 Liam Girdwood
            2006 E. Jorge Tizado
 Comment: Contains code modified from libnova-0.12, grass
@@ -49,7 +49,7 @@ Files: src/saga_core/saga_api/clipper.cpp src/saga_core/saga_api/clipper.hpp
 Copyright: 2010-2011, Angus Johnson
 License: Boost_Software_License
 
-Files: src/modules/db/db_odbc/otlv4.h
+Files: src/tools/db/db_odbc/otlv4.h
 Copyright: 1996-2010 Sergei Kuchin
 License: BSD-2-clause
  ORACLE, ODBC and DB2/CLI Template Library, Version 4.0.210,
@@ -68,7 +68,7 @@ License: BSD-2-clause
  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-Files: src/modules/io/io_esri_e00/e00compr/*
+Files: src/tools/io/io_esri_e00/e00compr/*
 Copyright: 1998-1999 Frank Warmerdam and Daniel Morisette
 Comment: these files are also part of the package e00compr, it makes sense to build
  a library there
@@ -91,12 +91,12 @@ License: MIT
  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  DEALINGS IN THE SOFTWARE.
 
-Files: src/modules/io/io_shapes_dxf/dxflib/*
+Files: src/tools/io/io_shapes_dxf/dxflib/*
 Copyright: (C) 2001-2003 RibbonSoft. All rights reserved.
 	    (C) 2001 Robert J. Campbell Jr
 License: GPL-2
  
-Files: src/modules/grid/grid_gridding/nn/* src/modules/grid/grid_spline/csa.*
+Files: src/tools/grid/grid_gridding/nn/* src/tools/grid/grid_spline/csa.*
 Copyright:2000-2008 Pavel Sakov and CSIRO
 License: BSD-4-clause
  Redistribution and use of material from the package `nn', with or without


=====================================
debian/watch
=====================================
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts=dversionmangle=s/\+dfsg//,repacksuffix=+dfsg \
-http://sf.net/saga-gis/saga_(\d\.\d\.\d).tar\.gz
+http://sf.net/saga-gis/saga[_-](\d\.\d\.\d).tar\.gz



View it on GitLab: https://salsa.debian.org/debian-gis-team/saga/compare/610ebd3602a0f37adefd4f26d3caf96d83de67d5...5f29dcdd41161f2259926b267b7c09fa22c0c195

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/saga/compare/610ebd3602a0f37adefd4f26d3caf96d83de67d5...5f29dcdd41161f2259926b267b7c09fa22c0c195
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-grass-devel/attachments/20180323/a8f1564e/attachment-0001.html>