[med-svn] r6127 - trunk/packages/python-cogent/trunk/debian

Tue Mar 1 10:36:00 UTC 2011

Author: tille
Date: 2011-03-01 10:35:59 +0000 (Tue, 01 Mar 2011)
New Revision: 6127

Modified:
   trunk/packages/python-cogent/trunk/debian/changelog
   trunk/packages/python-cogent/trunk/debian/control
   trunk/packages/python-cogent/trunk/debian/copyright
   trunk/packages/python-cogent/trunk/debian/rules
Log:
Clarified license of two remaining non-free files and moved package to main; use python-support instead of python-central


Modified: trunk/packages/python-cogent/trunk/debian/changelog
===================================================================

--- trunk/packages/python-cogent/trunk/debian/changelog	2011-03-01 10:34:26 UTC (rev 6126)
+++ trunk/packages/python-cogent/trunk/debian/changelog	2011-03-01 10:35:59 UTC (rev 6127)
@@ -1,3 +1,12 @@
+python-cogent (1.5-2) unstable; urgency=low
+
+  * debian/copyright: Clarified license of two single non-free files
+    -> package can go to main
+  * Added myself to uploaders
+  * python-central -> python-support
+
+ -- Andreas Tille <tille at debian.org>  Tue, 01 Mar 2011 11:30:18 +0100
+
 python-cogent (1.5-1) unstable; urgency=low
 
   * Bumped standard to 3.9.1, no changes required.

Modified: trunk/packages/python-cogent/trunk/debian/control
===================================================================
--- trunk/packages/python-cogent/trunk/debian/control	2011-03-01 10:34:26 UTC (rev 6126)
+++ trunk/packages/python-cogent/trunk/debian/control	2011-03-01 10:35:59 UTC (rev 6127)
@@ -1,15 +1,16 @@
 Source: python-cogent
-Section: non-free/python
+Section: python
 Priority: extra
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Sri Girish Srinivasa Murthy <srigirish at evolbio.mpg.de>, Steffen Moeller <moeller at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, python, python-central, python-numpy (>= 1.3.0), python-all-dev
+Uploaders: Sri Girish Srinivasa Murthy <srigirish at evolbio.mpg.de>,
+ Steffen Moeller <moeller at debian.org>,
+ Andreas Tille <tille at debian.org>
+Build-Depends: debhelper (>= 7), cdbs, python, python-support, python-numpy (>= 1.3.0), python-all-dev
 Standards-Version: 3.9.1
 Homepage: http://pycogent.sourceforge.net/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/python-cogent/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/python-cogent/trunk/
 XS-Python-Version: >= 2.5
-XS-Autobuild: yes
 
 Package: python-cogent
 Architecture: any

Modified: trunk/packages/python-cogent/trunk/debian/copyright
===================================================================
--- trunk/packages/python-cogent/trunk/debian/copyright	2011-03-01 10:34:26 UTC (rev 6126)
+++ trunk/packages/python-cogent/trunk/debian/copyright	2011-03-01 10:35:59 UTC (rev 6127)
@@ -56,53 +56,20 @@
 
 Upstream author: Z. Yang <z.yang at ucl.ac.uk>
 
-Copyright: (C) Z. Yang and the University College London
+Copyright: (C) 1993 Z. Yang and the University College London
 
 License:
+    According to a mail to the Debian Med mailing list
+	http://lists.debian.org/debian-med/2011/03/msg00006.html
+    the author agreed to dual licensing of these two files with
+    the original license of the PAML project:
 
-    Redistribution is ok as long with proper copyright notice.
-    It is free to use/modify/redistribute only for academia. Others
-    need to contact the authors.
+	Redistribution is ok as long with proper copyright notice.
+	It is free to use/modify/redistribute only for academia. Others
+        need to contact the authors.
 
-    We clarified the situation by the following email exchange:
+    and GPL-2.  For the Debian packaging we choose GPL-2.
 
-	> On 07/23/2010 04:33 PM, Ziheng Yang wrote:
-	>>
-	>>
-	>> I have not signed up for any of the open source licenses.  Right now
-	>> paml is free for academics only.  For other users I am dealing with
-	>> the requests on a case-by-case basis.
-	>>
-	>> Yes, it will be fine for you to include paml programs in QIIME, or
-	>> compile executables using the source at the paml web site, as long as
-	>> you include appropriate acknowledgements.
-	>>
-	>> Best wishes,
-	>>
-	>> Ziheng Yang
-	>>
-	>>
-	>>
-	>> At 10:14 28/06/2010 +0200, srigirish wrote:
-	>>> Dear Prof. Yang,
-	>>>
-	>>> I am using the QIIME package
-	>>> <http://qiime.sourceforge.net/>http://qiime.sourceforge.net/ and
-	>>> found the local installation to be non-trivial. Together with my
-	>>> colleague I am now preparing all the build and runtime dependencies
-	>>> to Debian and Ubuntu, in the process of which I got to a note in the
-	>>> PyCogent package, suggesting to get your explicit OK for a
-	>>> redistribution of your code. May I go ahead? Also we'd need a
-	>>> clarification if your code may be modified and still be
-	>>> redistributed. There are plenty of Open Source licenses
-	>>> (<http://en.wikipedia.org/wiki/Open-source_license>http://en.wikipedia.org/wiki/Open-source_license),
-	>>> if you could pick one of these, this would be excellent.
-	>>>
-	>>> I am looking forward to your early reply.
-	>>>
-	>>> Best Regards,
-	>>>
-	>>> S. Sri Girish
 
 Files: debian/*
 

Modified: trunk/packages/python-cogent/trunk/debian/rules
===================================================================
--- trunk/packages/python-cogent/trunk/debian/rules	2011-03-01 10:34:26 UTC (rev 6126)
+++ trunk/packages/python-cogent/trunk/debian/rules	2011-03-01 10:35:59 UTC (rev 6127)
@@ -4,7 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DEB_PYTHON_SYSTEM=pycentral
+export DEB_PYTHON_SYSTEM=pysupport
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk


