This is an automated email from the git hooks/post-receive script. johanvdw-guest pushed a commit to branch master in repository saga.
commit 4698bb96525d4cfffc36691e1faf84bc5bbc4f7d Author: Johan Van de Wauw <johan.vandew...@gmail.com> Date: Thu Oct 9 21:09:56 2014 +0200 Fix some errors in debian/copyright --- debian/changelog | 2 +- debian/copyright | 77 ++++++-------------------------------------------------- 2 files changed, 9 insertions(+), 70 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9b056aa..b8a63e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ saga (2.1.2+dfsg-3) unstable; urgency=medium * Revert "Temporarily disable building saga gui on arm" - bug resolved in gcc * Fix provides tag - -- Johan Van de Wauw <johan.vandew...@gmail.com> Wed, 08 Oct 2014 01:35:45 +0200 + -- Johan Van de Wauw <johan.vandew...@gmail.com> Thu, 09 Oct 2014 21:09:35 +0200 saga (2.1.2+dfsg-2) unstable; urgency=medium diff --git a/debian/copyright b/debian/copyright index e3b4220..6ae6c9d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -13,7 +13,7 @@ Copyright: 2001-2014 Olaf Conrad 2003-2014 Volker Wichmann License: GPL-2 -Files: src/saga_core/saga_api/* src/saga_core/saga_gdi/* src/saga_core/saga_odbc/* +Files: src/saga_core/saga_api/* src/saga_core/saga_gdi/* Copyright: 2001-2014 Olaf Conrad 2003-2006 Victor Olaya 2001-2004 Andre Ringeler @@ -23,7 +23,7 @@ License: LGPL-2.1 Files: src/saga_core/saga_api/clipper.cpp src/saga_core/saga_api/clipper.hpp Copyright: 2010-2011, Angus Johnson -License: Boost Software License version 1.0 +License: Boost_Software_License Boost Software License - Version 1.0 - August 17th, 2003 . Permission is hereby granted, free of charge, to any person or organization @@ -48,8 +48,8 @@ License: Boost Software License version 1.0 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Files: src/saga_core/saga_odbc/otlv4.h -Copyright:1996-2010, Sergei Kuchin +Files: src/modules/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, Copyright (C) 1996-2010, Sergei Kuchin (skuc...@gmail.com) @@ -85,7 +85,7 @@ Copyright: 2001-2013 Olaf Conrad 2013 Luca Piras License: GPL-2 -Files: src/modules_io/esri_e00/io_esri_e00/e00compr/* +Files: src/modules/io/io_esri_e00/e00compr/* Copyright: 1998-1999 Frank Warmerdam and Daniel Morisette License: MIT Permission is hereby granted, free of charge, to any person obtaining a @@ -106,75 +106,14 @@ License: MIT FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Files: shapes/io_shapes_dxf/dxflib +Files: src/modules/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/shapes/shapes_lines_ex/* -Copyright: 2001 de Halleux Jonathan -License: LGPL-2.1+ -Comment: this file seems to have moved - should check http://pgl.codeplex.com/ - -Files: src/modules_projection/pj_georeference/pj_georeference/* -Copyright: 1999, University of Chicago -Comment: check if still needed -License: Minpack Copyright Notice - Minpack Copyright Notice (1999) University of Chicago. All rights reserved - . - Redistribution and use in source and binary forms, with or - without modification, are permitted provided that the - following conditions are met: - . - 1. Redistributions of source code must retain the above - copyright notice, this list of conditions and the following - disclaimer. - . - 2. Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials - provided with the distribution. - . - 3. The end-user documentation included with the - redistribution, if any, must include the following - acknowledgment: - . - "This product includes software developed by the - University of Chicago, as Operator of Argonne National - Laboratory. - . - Alternately, this acknowledgment may appear in the software - itself, if and wherever such third-party acknowledgments - normally appear. - . - 4. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS" - WITHOUT WARRANTY OF ANY KIND. THE COPYRIGHT HOLDER, THE - UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND - THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES - OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE - OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY - OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR - USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF - THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4) - DO NOT WARRANT THAT THE SOFTWARE WILL FUNCTION - UNINTERRUPTED, THAT IT IS ERROR-FREE OR THAT ANY ERRORS WILL - BE CORRECTED. - . - 5. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT - HOLDER, THE UNITED STATES, THE UNITED STATES DEPARTMENT OF - ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT, - INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF - ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF - PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER - SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT - (INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE, - EVEN IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE - POSSIBILITY OF SUCH LOSS OR DAMAGES. -Files: src/modules/grid/grid_gridding/nn/*.[c|h] src/modules/grid/grid_spline/csa.[c|h] +Files: src/modules/grid/grid_gridding/nn/* src/modules/grid/grid_spline/csa.* Copyright:2000-2008 Pavel Sakov and CSIRO -License: BSD-4 clause +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 met: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/saga.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