This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository saga.
commit a7c23e160dbb7e8990d59f5fd66e44169db0749b Author: Bas Couwenberg <[email protected]> Date: Fri Mar 4 16:20:02 2016 +0100 Update copyright file. Changes: - Separate copyright years and holders with a comma - Files on separate lines --- debian/changelog | 3 +++ debian/copyright | 78 +++++++++++++++++++++++++++++++------------------------- 2 files changed, 46 insertions(+), 35 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0905d2f..b61ef81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ saga (2.2.5+dfsg-1) UNRELEASED; urgency=medium * Update watch file to handle common issues. * Import repacked upstream tarball. * Update version for virtual package. + * Update copyright file, changes: + - Separate copyright years and holders with a comma + - Files on separate lines -- Johan Van de Wauw <Johan Van de Wauw [email protected]> Fri, 04 Mar 2016 17:34:50 +0100 diff --git a/debian/copyright b/debian/copyright index f8a9cb1..78288db 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,52 +2,60 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: SAGA GIS Upstream-Contact: Olaf Conrad <[email protected]> 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/fireLib.* src/modules/io/io_grid_grib2/g2clib-1.0.4 src/modules/imagery/imagery_svm/svm.cpp src/modules/imagery/imagery_svm/svm.h +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/fireLib.* + 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: * -Copyright: 2001-2016 Olaf Conrad - 2003-2016 Volker Wichmann - 2010 Sun Zhuo - 2001-2004 Andre Ringeler - 2007 Thomas Schorr - 2003-2006 Victor Olaya +Copyright: 2001-2016, Olaf Conrad + 2003-2016, Volker Wichmann + 2010, Sun Zhuo + 2001-2004, Andre Ringeler + 2007, Thomas Schorr + 2003-2006, Victor Olaya License: GPL-2 Files: ltmain.sh Copyright: 1996-2001, 2003-2011, Free Software Foundation, Inc. License: GPL-2+ with Libtool exception -Files: src/saga_core/saga_api/* src/saga_core/saga_gdi/* -Copyright: 2001-2014 Olaf Conrad - 2003-2014 Volker Wichmann - 2007 Thomas Schorr - 2003-2006 Victor Olaya - 2001-2004 Andre Ringeler +Files: src/saga_core/saga_api/* + src/saga_core/saga_gdi/* +Copyright: 2001-2014, Olaf Conrad + 2003-2014, Volker Wichmann + 2007, Thomas Schorr + 2003-2006, Victor Olaya + 2001-2004, Andre Ringeler License: LGPL-2.1 -Files: src/saga_core/saga_api/clipper.cpp src/saga_core/saga_api/clipper.hpp +Files: src/saga_core/saga_api/clipper.cpp + src/saga_core/saga_api/clipper.hpp Copyright: 2010-2014, Angus Johnson License: BSL-1.0 Files: src/modules/* -Copyright: 2001-2013 Olaf Conrad - 2002-2010 SAGA User Group Association - 2003-2006 Victor Olaya - 2001-2009 Andre Ringeler - 2007 Thomas Schorr - 2003-2011 Volker Wichmann - 2004 Antonio Boggia - 2004 Gianluca Massei - 2006 Stefan Liersch - Alessandro Perego - 2007-2016 Johan Van de Wauw - 2010 Volker Wichmann - 2013 Benjamin Bechteld - 2012 Magnus Bremer - 2012 Muhammed Setiawan - 2013 Luca Piras - 2014-2015 Christian Alwardt +Copyright: 2001-2013, Olaf Conrad + 2002-2010, SAGA User Group Association + 2003-2006, Victor Olaya + 2001-2009, Andre Ringeler + 2007, Thomas Schorr + 2003-2011, Volker Wichmann + 2004, Antonio Boggia + 2004, Gianluca Massei + 2006, Stefan Liersch + Alessandro Perego + 2007-2016, Johan Van de Wauw + 2010, Volker Wichmann + 2013, Benjamin Bechteld + 2012, Magnus Bremer + 2012, Muhammed Setiawan + 2013, Luca Piras + 2014-2015, Christian Alwardt License: GPL-2 Files: src/modules/db/db_odbc/otlv4.h @@ -211,13 +219,13 @@ Copyright: 2004-2010, Victor Olaya <[email protected]> License: GPL-2+ Files: src/modules/imagery/imagery_tools/landsat_toar_core.cpp -Copyright: 2000-2005 Liam Girdwood - 2006 E. Jorge Tizado +Copyright: 2000-2005, Liam Girdwood + 2006, E. Jorge Tizado Comment: Contains code modified from libnova-0.12, grass License: GPL-2 Files: src/modules/grid/grid_gridding/nn/* src/modules/grid/grid_spline/csa.* -Copyright: 2000-2008 Pavel Sakov and CSIRO +Copyright: 2000-2008, Pavel Sakov and CSIRO License: BSD-4-clause Redistribution and use of material from the package `nn', with or without modification, are permitted provided that the following conditions are -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/saga.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
