[med-svn] r5951 - trunk/packages/ensembl/ensembl/57/debian

[Steffen Möller]

Author: moeller
Date: 2011-02-11 14:13:48 +0000 (Fri, 11 Feb 2011)
New Revision: 5951

Modified:
   trunk/packages/ensembl/ensembl/57/debian/README.source
   trunk/packages/ensembl/ensembl/57/debian/changelog
   trunk/packages/ensembl/ensembl/57/debian/rules
Log:
Preparations for upload -7.


Modified: trunk/packages/ensembl/ensembl/57/debian/README.source
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/README.source	2011-02-11 13:54:51 UTC (rev 5950)
+++ trunk/packages/ensembl/ensembl/57/debian/README.source	2011-02-11 14:13:48 UTC (rev 5951)
@@ -56,5 +56,14 @@
 The BuildSynteny.jar file is removed from the source tree since it is
 binary. It does ship with the sources.
 
-The jalview sources are not redistributed. The dependency on the jalview
-.jar renders the Ensembl package non-free for the time speaking.
+Since Jalview is not yet part of Debian, its source code is also not
+yet available through or distribution. To better comply with the GPL,
+the source code of Ensembl also ships the sources for Jalview.  It was
+downloaded from http://www.jalview.org/source/jalview_2_6_1.tar.gz
+with embedded jars removed.  This dependency on the jalview .jar renders
+the Ensembl package non-free for the time being. The situtation shall
+improve over the course of 2011. The such repacked jar file is located
+in the Ensembl package's source tree at
+          ensembl-57/htdocs/jalview/jalview_2.6.1_nojars.orig.tar.gz .
+Many thanks go to Jim, Will and especially to Torsten for discussing
+how to best deal with that binary.

Modified: trunk/packages/ensembl/ensembl/57/debian/changelog
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/changelog	2011-02-11 13:54:51 UTC (rev 5950)
+++ trunk/packages/ensembl/ensembl/57/debian/changelog	2011-02-11 14:13:48 UTC (rev 5951)
@@ -1,11 +1,19 @@
-ensembl (57-6) experimental; urgency=low
+ensembl (57-7) experimental; urgency=low
 
-  * Yet another revised upload (Closes: #589818).
+  * Adding sources of version 2.6.1 for Jalview
+    to help GPL compliance.
+  * Reupload (Closes: #589818).
+
+ -- Steffen Moeller <moeller at debian.org>  Fri, 11 Feb 2011 15:07:58 +0100
+
+ensembl (57-6) UNRELEASED; urgency=low
+
+  * Yet another revised upload.
     - removal of PDFs from source tree
-    - removal of .jar 
+    - removal of .jar of BuildSynteny
   * Another jar (of jalview) cannot be removed for the moment and
     thus remains and renders the package non-free. But we are working
-    on getting Jalview into the distrbution. This cannot take too
+    on getting Jalview into the distribution. This cannot take too
     much longer.
 
  -- Steffen Moeller <moeller at debian.org>  Thu, 10 Feb 2011 16:37:34 +0100

Modified: trunk/packages/ensembl/ensembl/57/debian/rules
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/rules	2011-02-11 13:54:51 UTC (rev 5950)
+++ trunk/packages/ensembl/ensembl/57/debian/rules	2011-02-11 14:13:48 UTC (rev 5951)
@@ -122,9 +122,8 @@
 	done
 
 	# some cleanup
-	find debian -name Makefile.PL | xargs -r rm -f
+	find debian -name Makefile.PL -o -name "*.tar.gz" | xargs -r rm -f
 	rm -rf debian/libensembl-variation-perl/usr/share/ensembl/ensembl-variation/C_code
-