[med-svn] r4879 - trunk/packages/gentle/trunk/debian

[Steffen Möller]

Author: moeller
Date: 2010-06-07 22:14:11 +0000 (Mon, 07 Jun 2010)
New Revision: 4879

Modified:
   trunk/packages/gentle/trunk/debian/README.Debian
   trunk/packages/gentle/trunk/debian/README.source
   trunk/packages/gentle/trunk/debian/control
   trunk/packages/gentle/trunk/debian/copyright
Log:
Series of updates - the ultimate ones prior to the initial upload?


Modified: trunk/packages/gentle/trunk/debian/README.Debian
===================================================================
--- trunk/packages/gentle/trunk/debian/README.Debian	2010-06-05 16:40:30 UTC (rev 4878)
+++ trunk/packages/gentle/trunk/debian/README.Debian	2010-06-07 22:14:11 UTC (rev 4879)
@@ -1,7 +1,14 @@
 gentle for Debian
 -----------------
 
-GENtle ships a series of sources of programs that Debian
-has in the past indicates as non-free.
+GENtle ships a programs that Debian has in the past indicates
+as non-free, i.e. ClustalW. It is redundant with the clustalw
+program that is already in the archive, and so is the tinyxml
+library.  Both folders have been removed from the source tree
+for this upload to achieve DFSG compliance.
 
- -- Steffen Moeller <moeller at debian.org>  Tue, 09 Mar 2010 10:42:41 +0100
+The coils package is available under the GPL, so it does not
+need to be separated for licensing issues. A later upload should
+however consider the distribution of coils as a separate package.
+
+ -- Steffen Moeller <moeller at debian.org>  Tue, 08 Jun 2010 00:12:15 +0200

Modified: trunk/packages/gentle/trunk/debian/README.source
===================================================================
--- trunk/packages/gentle/trunk/debian/README.source	2010-06-05 16:40:30 UTC (rev 4878)
+++ trunk/packages/gentle/trunk/debian/README.source	2010-06-07 22:14:11 UTC (rev 4879)
@@ -5,6 +5,7 @@
  - the CVS directories
  - the tinyxml directory (since redundant with Debian's libtinyxml)
  - the clustalw directory (since redundant and non-free)
+ - ncoils.cpp,ncoils.h and the coils directory
 
 Patches:
 

Modified: trunk/packages/gentle/trunk/debian/control
===================================================================
--- trunk/packages/gentle/trunk/debian/control	2010-06-05 16:40:30 UTC (rev 4878)
+++ trunk/packages/gentle/trunk/debian/control	2010-06-07 22:14:11 UTC (rev 4879)
@@ -1,7 +1,8 @@
 Source: gentle
 Section: contrib/science
 Priority: optional
-Maintainer: Steffen Moeller <moeller at debian.org>
+Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
+Uploaders: Steffen Moeller <moeller at debian.org>
 Build-Depends: debhelper (>= 7), autotools-dev, libwxgtk2.8-dev, quilt, cdbs, libtinyxml-dev, automake, autoconf
 Standards-Version: 3.8.4
 Homepage: http://gentle.magnusmanske.de

Modified: trunk/packages/gentle/trunk/debian/copyright
===================================================================
--- trunk/packages/gentle/trunk/debian/copyright	2010-06-05 16:40:30 UTC (rev 4878)
+++ trunk/packages/gentle/trunk/debian/copyright	2010-06-07 22:14:11 UTC (rev 4879)
@@ -15,13 +15,13 @@
 Copyright: Voxeo Corporation (http://evolution.voxeo.com)
 License: LGPL
 
-Files: coils/*
+Files: ncoils.h ncoild.cpp coils/*
 Authors: Rob Russel <robert.russell at bioquant.uni-heidelberg.de>
 	 Larry Harvie <harvie at owl.WPI.EDU>
          Reinhard Schneider <SCHNEIDER at EMBL-Heidelberg.DE>
 Copyright: EMBL Heidelberg
-License: none stated, the sources are publicly available
-	 on ftp://ftp.ebi.ac.uk/pub/software/unix/coils-2.2
+License: GPL-2+
+Source: Adapted from http://www.russell.embl.de/cgi-bin/coils-svr.pl
 
 Files: *
 
@@ -31,24 +31,13 @@
 Copyright:
     Magnus Manske <magnusmanske+gentle at googlemail.com>
 
-License:
+License: GPL-3+
 
-    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.
+On Debian systems, the complete text of the GNU General Public
+License version 3 can be found in "/usr/share/common-licenses/GPL-3",
+version 2 can be found in "/usr/share/common-licenses/GPL-2".
+The LGPL is found in "/usr/share/common-licenses/LGPL".
 
-    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 3 can be found in "/usr/share/common-licenses/GPL-3".
-
 The Debian packaging is:
 
     Copyright (C) 2010 Steffen Moeller <moeller at debian.org>