[med-svn] r7852 - trunk/packages/mobyle/mobyle/trunk/debian

Sun Sep 18 00:27:34 UTC 2011

Author: plessy
Date: 2011-09-18 00:27:33 +0000 (Sun, 18 Sep 2011)
New Revision: 7852

Modified:
   trunk/packages/mobyle/mobyle/trunk/debian/copyright
Log:
Corrected and normalised debian/copyright with ?\226?\128?\152config-edit?\226?\128?\153.


Modified: trunk/packages/mobyle/mobyle/trunk/debian/copyright
===================================================================

--- trunk/packages/mobyle/mobyle/trunk/debian/copyright	2011-09-17 18:02:49 UTC (rev 7851)
+++ trunk/packages/mobyle/mobyle/trunk/debian/copyright	2011-09-18 00:27:33 UTC (rev 7852)
@@ -12,6 +12,29 @@
            2011 Catherine Letondal      <letondal at pasteur.fr>
            2011 Olivier Sallou    <olivier.sallou at irisa.fr>
 License: GPL-2+
+
+Files: Src/Portal/htdocs/MobylePortal/js/blank.html
+Copyright: 2007 Brian Dillard <bdillard at pathf.com>
+           2007 Brad Neuberg
+License: MIT
+
+Files: Src/Portal/htdocs/MobylePortal/images/*
+Copyright: 2011 Mark James
+License: CC-BY-SA-3.0
+
+Files: Tools/validation/iso_*.xsl
+Copyright: RickJelliffe
+License: zlib
+
+Files: Src/Mobyle/Captcha
+Copyright: 2004 Micah Dowty
+License: MIT
+
+Files: debian/*
+Copyright: 2011 Olivier Sallou <olivier.sallou at irisa.fr>
+License: GPL-2+
+
+License: GPL-2+
  This package 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
@@ -28,9 +51,6 @@
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-Files: Src/Portal/htdocs/MobylePortal/js/blank.html
-Copyright: 2007 Brian Dillard <bdillard at pathf.com>
-2007 Brad Neuberg
 License: MIT
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
@@ -50,9 +70,7 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
 
-Files: Src/Portal/htdocs/MobylePortal/images/*
-Copyright:  2011 Mark James
-License: Creative Commons Attribute Share-Alike v3.0
+License: CC-BY-SA-3.0
  THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
  .
  BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
@@ -110,9 +128,7 @@
  This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
  The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
 
-Files: Tools/validation/iso_*.xsl
-Copyright: RickJelliffe
-License: zlib/libpng License
+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:
@@ -123,43 +139,3 @@
  .
  3. This notice may not be removed or altered from any source distribution.
 
-Files: Src/Mobyle/Captcha
-Copyright: 2004 Micah Dowty
-License:
- 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 without limitation the rights to
- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- of the Software, and to permit persons to whom the Software is furnished to do
- so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
-
-Files: debian/*
-Copyright: 2011 Olivier Sallou <olivier.sallou at irisa.fr>
-License: GPL-2+
- This package 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 package 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 complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-


