[critterding] 06/24: Fix d/copyright according to format 1.0.

Gabriele Giacone gg0-guest at moszumanska.debian.org
Sat Aug 2 22:43:30 UTC 2014


This is an automated email from the git hooks/post-receive script.

gg0-guest pushed a commit to branch master
in repository critterding.

commit cadf1d633ecf7edb70c8aeeb798b1d6d64a2474c
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Fri Nov 8 16:38:59 2013 +0100

    Fix d/copyright according to format 1.0.
---
 debian/changelog |   1 +
 debian/copyright | 203 +++++++++++++++++++++++++++++++------------------------
 2 files changed, 116 insertions(+), 88 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f51d24b..d84ac37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ critterding (1.0-beta12.1-2) UNRELEASED; urgency=low
     libsdl-image1.2-dev to B-D.
   * Remove DMUA flag.
   * Add parallel building support.
+  * Fix d/copyright according to format specification 1.0.
 
  -- Gabriele Giacone <1o5g4r8o at gmail.com>  Fri, 08 Nov 2013 12:57:29 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 01da0a7..1fca249 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,19 +1,48 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: Critterding - Evolving Artificial Life
-Maintainer: Bob Winckelmans <bob.winckelmans at telenet.be>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Critterding - Evolving Artificial Life
+Upstream-Contact: Bob Winckelmans <bob.winckelmans at telenet.be>
 Source: http://critterding.sourceforge.net/
 
+Files: *
 Copyright: 2008-2010, Bob Winckelmans <bob.winckelmans at telenet.be>
 License: GPL-2+
- On Debian systems the full text of the GNU General Public 
- License can be found in the `/usr/share/common-licenses/GPL-2'
- file.
 
 Files: src/utils/ftgl/*
 Copyright: 2001-2004, Henry Maddocks <ftgl at opengl.geek.nz>
-	   2008, Éric Beets <ericbeets at free.fr>
-	   2008, Sam Hocevar <sam at zoy.org>
-License: other
+ 2008 Daniel Remenak <dtremenak at users.sourceforge.net>
+ 2008 Sam Hocevar <sam at zoy.org>
+ 2008 Sean Morrison <learner at brlcad.org>
+ 2008 Éric Beets <ericbeets at free.fr>
+License: Expat
+
+Files: src/utils/bullet/*
+Copyright: 2003-2006, Erwin Coumans http://continuousphysics.com/Bullet/
+License: Zlib
+
+Files: src/utils/bullet/BulletCollision/Gimpact/*
+Copyright: 2006-2007, Francisco Leon Najera <projectileman at yahoo.com>
+License: LGPL-2.1+ or BSD-3-clause or Zlib
+
+Files: src/utils/bullet/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp, \
+ src/utils/bullet/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
+Copyright: 2001-2002, Russell L. Smith. <russ at q12.org>
+License: Zlib
+
+Files: src/utils/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h, \
+ src/utils/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
+Copyright: 2007, Starbreeze Studios
+License: Zlib
+
+Files: src/utils/bullet/LinearMath/btConvexHull.h, \
+ src/utils/bullet/LinearMath/btConvexHull.cpp
+Copyright: 2003-2006, Stan Melax http://www.melax.com/
+License: Zlib
+
+Files: debian/*
+Copyright: 2010, Gabriele Giacone <1o5g4r8o at gmail.com>
+License: GPL-3+
+
+License: Expat
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the
  "Software"), to deal in the Software without restriction, including
@@ -31,68 +60,74 @@ License: other
  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-Files: src/utils/bullet/*
-Copyright: 2003-2006, Erwin Coumans http://continuousphysics.com/Bullet/
-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.
- 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-2+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program 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 General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ 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'.
 
-Files: src/utils/bullet/BulletCollision/Gimpact/*
-Copyright: 2006-2007, Francisco Leon Najera <projectileman at yahoo.com>
-License: LGPL-2.1+ or BSD or zlib
+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
+ version 2.1 of the License, 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ USA.
+ .
  On Debian systems the full text of the GNU Lesser General Public
  License can be found in the `/usr/share/common-licenses/LGPL-2.1'
  file.
- On Debian systems the full text of the BSD License can be found
- in the `/usr/share/common-licenses/BSD' file.
- Zlib license is the following one:
- 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: src/utils/bullet/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp, \
- src/utils/bullet/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
-Copyright: 2001-2002, Russell L. Smith. <russ at q12.org>
-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.
- 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: BSD-3-clause
+ 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. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 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.
 
-Files: src/utils/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h, \
- src/utils/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
-Copyright: 2007, Starbreeze Studios
-License: zlib
+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.
@@ -107,27 +142,19 @@ License: zlib
     misrepresented as being the original software.
  3. This notice may not be removed or altered from any source distribution.
 
-Files: src/utils/bullet/LinearMath/btConvexHull.h, \
- src/utils/bullet/LinearMath/btConvexHull.cpp
-Copyright: 2003-2006, Stan Melax http://www.melax.com/
-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.
- 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: debian/*
-Copyright: 2010, Gabriele Giacone <1o5g4r8o at gmail.com>
 License: GPL-3+
- On Debian systems the full text of the GNU General Public 
- License can be found in the `/usr/share/common-licenses/GPL-3'
- file.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program 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 General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems the full text of the GNU General Public License
+ can be found in the `/usr/share/common-licenses/GPL-3' file.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/critterding.git



More information about the debian-science-commits mailing list