[ode] 05/05: Solving some lintian messages
Leopold Palomo-Avellaneda
leo at alaxarxa.net
Mon Sep 14 11:44:38 UTC 2015
This is an automated email from the git hooks/post-receive script.
lepalom-guest pushed a commit to branch master
in repository ode.
commit a9aefd5d25c1ded4e4e7a222ac0cbfe42a8fcaad
Author: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
Date: Mon Sep 14 13:44:18 2015 +0200
Solving some lintian messages
---
debian/control | 2 +-
debian/copyright | 80 +++++++++++++++++++++++++++++---------------------------
2 files changed, 43 insertions(+), 39 deletions(-)
diff --git a/debian/control b/debian/control
index 670a832..aa89bb4 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Barry deFreese <bddebian at comcast.net>,
Leopold Palomo-Avellaneda <leo at alaxarxa.net>
Build-Depends: debhelper (>= 9), docbook-to-man, autotools-dev,
- automake (>= 1.11), libtool,
+ automake, libtool,
libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev,
libccd-dev, pkg-config, dh-exec
Standards-Version: 3.9.6
diff --git a/debian/copyright b/debian/copyright
index 5e58331..d7b04d3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -68,24 +68,6 @@ License: LGPL-3.0+
Files: ou/*
Copyright: 2008 Oleh Derevenko
License: Zlib or GPL-3 or BSD-3-Clause
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
- .
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
- .
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- .
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- .
- 3. This notice may not be removed or altered from any source
- distribution.
Files: bindings/python/*
Copyright: 2004 PyODE developers
@@ -115,10 +97,7 @@ License: BSD-3-Clause
Files: contrib/InteractiveCollisions/*
Copyright: 2011 Daniel K. O. <danielosmari at users.sourceforge.net>
License: GPL-3
- On Debian systems, the full text of the GNU General Public License
- version 2 can be found in the file `/usr/share/common-licenses/GPL-2',
- and the full text of the GNU General Public License version 3 can be
- found in the file `/usr/share/common-licenses/GPL-3'.
+
Files: contrib/InteractiveCollisions/deps/AntTweakBar/*
Copyright: 2005-2011 Philippe Decaudin
@@ -128,6 +107,22 @@ Files: contrib/Mac_CFMCarbon/*
Copyright: 2001 Russell L. Smith. <russ at q12.org>
Frank Condello <pox at planetquake.com>
License: LGPL-2.1+
+
+Files: contrib/OdeModelProcessor/*
+Copyright: 2007 Department Of Information Science, University of Otago, Dunedin, New Zealand.
+ Richard Barrington <barri662 at student.otago.ac.nz>
+License: BSD-3-Clause
+
+Files: contrib/Ode.NET/*
+Copyright: 2006 Jason Perkins <starkos at industriousone.com>
+License: BSD-3-Clause
+
+Files: contrib/TerrainAndCone/*
+Copyright: 2001-2002 Russell L. Smith
+ 2001-2002 Russell L. Smith
+License: BSD-3-Clause
+
+License: LGPL-2.1+
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
@@ -147,20 +142,6 @@ License: LGPL-2.1+
.
On Debian systems, the complete text of the GNU Lesser General Public License
Version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
-
-Files: contrib/OdeModelProcessor/*
-Copyright: 2007 Department Of Information Science, University of Otago, Dunedin, New Zealand.
- Richard Barrington <barri662 at student.otago.ac.nz>
-License: BSD-3-Clause
-
-Files: contrib/Ode.NET/*
-Copyright: 2006 Jason Perkins <starkos at industriousone.com>
-License: BSD-3-Clause
-
-Files: contrib/TerrainAndCone/*
-Copyright: 2001-2002 Russell L. Smith
- 2001-2002 Russell L. Smith
-License: BSD-3-Clause
License: BSD-3-Clause
Redistribution and use in source and binary forms, with or without
@@ -189,9 +170,32 @@ License: BSD-3-Clause
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: Zlib
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
.
- On Debian systems, the complete text of the BSD 3-clause "New" or "Revised"
- License can be found in `/usr/share/common-licenses/BSD'.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ .
+ 3. This notice may not be removed or altered from any source
+ distribution.
+
+License: GPL-3
+ On Debian systems, the full text of the GNU General Public License
+ version 2 can be found in the file `/usr/share/common-licenses/GPL-2',
+ and the full text of the GNU General Public License version 3 can be
+ found in the file `/usr/share/common-licenses/GPL-3'.
Files: debian/*
Copyright: 2003 Guus Sliepen <guus at debian.org>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ode.git
More information about the Pkg-games-commits
mailing list