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
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
