This is an automated email from the git hooks/post-receive script. mafm pushed a commit to branch master in repository ogre-1.9.
commit 5f13bc97bbb266c8b0d0e1dbe99a27f3d3cd9a1c Author: Manuel A. Fernandez Montecelo <[email protected]> Date: Fri Jul 31 12:48:16 2015 +0100 Fix minor problems in debian/copyright Update the location of Docs/manual in copyright file and resolve minor issues (e.g. "dep5-copyright-license-name-not-unique" by renaming "License: other" to "License: otherN") --- debian/changelog | 3 +++ debian/copyright | 21 ++++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index a511b16..be79ddb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ ogre-1.9 (1.9.0+dfsg1-5) experimental; urgency=medium * Address new lintian warning "embedded-javascript-library": add Depends on libjs-jquery in the -doc package, and create a symbolic link instead of install the local copy of the file "jquery.js" + * Update the location of Docs/manual in copyright file and resolve minor + issues (e.g. "dep5-copyright-license-name-not-unique" by renaming + "License: other" to "License: otherN") -- Manuel A. Fernandez Montecelo <[email protected]> Fri, 31 Jul 2015 12:11:39 +0100 diff --git a/debian/copyright b/debian/copyright index ea1a014..7d0781b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -90,7 +90,7 @@ Files: RenderSystems/GL/include/GL/glext.h RenderSystems/GL/include/GL/glxext.h RenderSystems/GL/include/GL/wglext.h Copyright: 1991-2004 Silicon Graphics, Inc. -License: other +License: other1 License Applicability. Except to the extent portions of this file are made subject to an alternative license as permitted in the SGI Free Software License B, Version 1.1 (the "License"), the contents of this @@ -120,7 +120,7 @@ License: other Files: RenderSystems/GL/include/GL/gl.h Copyright: 1991-1999 Silicon Graphics, Inc. -License: other +License: other2 The contents of this file are subject to the GLX Public License Version 1.0 (the "License"). You may not use this file except in compliance with the License. You may obtain a copy of the License at Silicon Graphics, Inc., @@ -140,7 +140,7 @@ License: other Files: RenderSystems/GL/include/GL/glxtokens.h Copyright: 1991-2000 Silicon Graphics, Inc. -License: other +License: other3 License Applicability. Except to the extent portions of this file are made subject to an alternative license as permitted in the SGI Free Software License B, Version 1.1 (the "License"), the contents of this @@ -175,7 +175,7 @@ License: other Files: RenderSystems/GL/src/nvparse/* Copyright: © NVIDIA Corporation -License: other +License: other4 All files in this distribution can be used however you want. Comment: These files are found in NVParse which is available from NVIDIA at http://developer.nvidia.com/object/nvparse.html. @@ -197,7 +197,7 @@ License: MIT Files: RenderSystems/GL3Plus/include/GL/glxtokens-backup.h Copyright: 1991-2000 Silicon Graphics, Inc. -License: other +License: other5 License Applicability. Except to the extent portions of this file are made subject to an alternative license as permitted in the SGI Free Software License B, Version 1.1 (the "License"), the contents of this @@ -266,15 +266,13 @@ Files: Tools/MayaExport/* Copyright: 2006 Francesco Giordana <[email protected]> License: LGPL-2+ -Files: Tools/XMLConverter/include/tinyxml.h - Tools/XMLConverter/src/tinyxmlerror.cpp - Tools/XMLConverter/src/tinyxmlparser.cpp +Files: Tools/XMLConverter/*/tiny* Copyright: 2000-2006, Lee Thomason (www.grinninglizard.com) License: zlib/libpng -Files: Docs/manual/* Docs/api/* +Files: Docs/src/manual* Copyright: Copyright © 2008 Torus Knot Software Ltd -License: Creative Commons Attribution-ShareAlike 3.0 Unported License +License: CC-BY-SA-3.0 License: MIT @@ -326,7 +324,8 @@ License: zlib/libpng misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. -License: Creative Commons Attribution-ShareAlike 3.0 Unported License +License: CC-BY-SA-3.0 +Comment: Creative Commons Attribution-ShareAlike 3.0 Unported License You are free: to Share (to copy, distribute and transmit the work) and to Remix (to adapt the work) under the following conditions: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ogre-1.9.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
