[med-svn] [emperor] 04/15: DEP5 fixes

Afif Elghraoui afif at moszumanska.debian.org
Thu Oct 13 06:22:55 UTC 2016


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

afif pushed a commit to branch master
in repository emperor.

commit d15ebe460e05899b544c508a25b6ae456174d721
Author: Andreas Tille <tille at debian.org>
Date:   Tue Feb 25 14:48:58 2014 +0000

    DEP5 fixes
---
 debian/copyright | 157 +++++++++++++++++--------------------------------------
 1 file changed, 47 insertions(+), 110 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 3989d58..3ac5611 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: EMPeror
 Upstream-Contact: Yoshiki Vázquez Baeza <yoshiki89 at gmail.com>
 Source: https://pypi.python.org/pypi/emperor
@@ -7,97 +7,66 @@ Files: *
 Copyright: © 2013, The Emperor Project
                 Antonio Gonzalez Pena <antgonza at gmail.com>
                 Meg Pirrung
-		Yoshiki Vázquez Baeza <yoshiki89 at gmail.com>
-		Rob Knight <rob at spot.colorado.edu>
+ 	Yoshiki Vázquez Baeza <yoshiki89 at gmail.com>
+ 	Rob Knight <rob at spot.colorado.edu>
 License: BSD
  See /usr/share/common-licenses/BSD
  .
  Emperor makes usage of all of the following copyrighted packages:
 
-
 Files: emperor/support_files/js/Three.js
 Copyright: (c) 2010-2013 three.js authors
-License: The MIT 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.
+License: MIT
 
 Files: emperor/support_files/js/jquery*
 Copyright: (c) 2013 jQuery Foundation and other contributors (http://jquery.com/)
-License: The MIT License
- As above.
+License: MIT
 
 Files: emperor/support_files/js/spectrum.js
 Copyright: (c) 2013, Brian Grinstead, http://briangrinstead.com
-License: The MIT License
- As above.
+License: MIT
 
 Files: emperor/support_files/js/jquery.colorPicker.js
 Copyright: (c) 2012 Lakshan Perera
-License: The MIT License
- As above.
+License: MIT
 
 Files: emperor/support_files/js/d3.parcords.*
 Copyright: (c) 2012, Kai Chang (Parallel Coordinates [v0.1.7])
-License:
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- 
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
- 
- * 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.
- 
- * The name Kai Chang may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 MICHAEL BOSTOCK 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.
+License: BSDlike
 
 Files: emperor/support_files/js/d3.v3.*
 Copyright: (c) 2013, Michael Bostock (d3 v3)
-License:
+License: BSDlike
+
+Files: emperor/support_files/js/THREEx.screenshot.js
+Copyright: (c) 2011 Jerome Etienne, http://jetienne.com
+License: MIT
+
+Files: emperor/support_files/js/FileSaver*.js 
+Copyright: (c) 2011 [Eli Grey](http://eligrey.com).
+License: MIT
+
+Files: debian/*
+Copyright: © 2014 Tim Booth <tbooth at ceh.ac.uk>
+             2014 Andreas Tille <tille at debian.org>
+License: MIT
+
+License: BSDlike
  All rights reserved.
- 
+ .
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
- 
+ .
  * Redistributions of source code must retain the above copyright notice, this
    list of conditions and the following disclaimer.
- 
+ .
  * 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.
- 
- * The name Michael Bostock may not be used to endorse or promote products
+ .
+ * The name Kai Chang may not be used to endorse or promote products
    derived from this software without specific prior written permission.
- 
+ .
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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
@@ -109,53 +78,21 @@ License:
  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Files: emperor/support_files/js/THREEx.screenshot.js
-Copyright: (c) 2011 Jerome Etienne, http://jetienne.com
-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: emperor/support_files/js/FileSaver*.js 
-Copyright: (c) 2011 [Eli Grey](http://eligrey.com).
-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: © 2014 Tim Booth <tbooth at ceh.ac.uk>,
 License: MIT
- As above.
+ 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.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/emperor.git



More information about the debian-med-commit mailing list