[med-svn] r11883 - trunk/packages/phy-spread/trunk/debian

[Andreas Tille]

Author: tille
Date: 2012-07-24 14:45:47 +0000 (Tue, 24 Jul 2012)
New Revision: 11883

Modified:
   trunk/packages/phy-spread/trunk/debian/changelog
   trunk/packages/phy-spread/trunk/debian/copyright
Log:
DEP5 and some new files with differen (BSD) license


Modified: trunk/packages/phy-spread/trunk/debian/changelog
===================================================================
--- trunk/packages/phy-spread/trunk/debian/changelog	2012-07-24 14:36:37 UTC (rev 11882)
+++ trunk/packages/phy-spread/trunk/debian/changelog	2012-07-24 14:45:47 UTC (rev 11883)
@@ -10,6 +10,9 @@
   * debian/upstream:
      - separate authors by ' and ' rather than by ','
      - Move DOI+PMID to References
+  * debian/copyright
+     - DEP5
+     - new: Files: src/colorpicker/*
 
  -- Andreas Tille <tille at debian.org>  Tue, 24 Jul 2012 16:13:49 +0200
 

Modified: trunk/packages/phy-spread/trunk/debian/copyright
===================================================================
--- trunk/packages/phy-spread/trunk/debian/copyright	2012-07-24 14:36:37 UTC (rev 11882)
+++ trunk/packages/phy-spread/trunk/debian/copyright	2012-07-24 14:45:47 UTC (rev 11883)
@@ -1,13 +1,45 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Spread
 Upstream-Contact: Filip Bielejec <filip.bielejec at rega.kuleuven.be>
-Original-Source: http://www.kuleuven.be/aidslab/phylogeography/SPREAD.html
+Source: https://github.com/phylogeography/SPREAD/downloads
 
-Copyright: 2004-2011 Filip Bielejec <filip.bielejec at rega.kuleuven.be>,
+Files: *
+Copyright: © 2004-2011 Filip Bielejec <filip.bielejec at rega.kuleuven.be>,
                      Andrew Rambaut <a.rambaut at ed.ac.uk>,
                      Marc A. Suchard <msuchard at gmail.com>,
                      Philippe Lemey
 License: LGPL-3+
+
+Files: src/colorpicker/*
+Copyright: © 2011, Jeremy Wood
+License: Modified-BSD
+ 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.
+    * Neither the name of the <organization> 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 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 <COPYRIGHT HOLDER> 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: debian/*
+Copyright: © 2012 Andreas Tille <tille at debian.org>
+License: LGPL-3+
+
+License: LGPL-3+
  This program 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 3 of the License, or
@@ -25,7 +57,3 @@
  in the file ‘/usr/share/common-licenses/LGPL-3’, and the GNU GPL license
  version 3 is included in the file ‘/usr/share/common-licenses/GPL-3’.
 
-Files: debian/*
-Copyright: © 2012 Andreas Tille <tille at debian.org>
-License: LGPL-3+
- Same license as the software itself