[pkg-java] r15220 - trunk/jalview/debian

[Vincent Fourmond]

Author: fourmond
Date: 2011-10-19 19:52:55 +0000 (Wed, 19 Oct 2011)
New Revision: 15220

Modified:
   trunk/jalview/debian/changelog
   trunk/jalview/debian/control
   trunk/jalview/debian/copyright
   trunk/jalview/debian/new-upstream
Log:
[jalview] Fix final copyright glitches, ready for upload

Modified: trunk/jalview/debian/changelog
===================================================================
--- trunk/jalview/debian/changelog	2011-10-19 19:33:05 UTC (rev 15219)
+++ trunk/jalview/debian/changelog	2011-10-19 19:52:55 UTC (rev 15220)
@@ -5,5 +5,7 @@
     getting rid of the bundled precompiled JAR files (I love JAR files)
   * Using dh 7 and javahelper
   * Using jh_build for building
+  * Uploading to experimental as it works only with the version of jmol in
+    experimental
 
- -- Vincent Fourmond <fourmond at debian.org>  Mon, 17 Oct 2011 23:53:38 +0200
+ -- Vincent Fourmond <fourmond at debian.org>  Wed, 19 Oct 2011 20:19:46 +0200

Modified: trunk/jalview/debian/control
===================================================================
--- trunk/jalview/debian/control	2011-10-19 19:33:05 UTC (rev 15219)
+++ trunk/jalview/debian/control	2011-10-19 19:52:55 UTC (rev 15220)
@@ -23,7 +23,7 @@
 Package: jalview
 Architecture: all
 Depends: ${misc:Depends}, openjdk-6-jre | cacao-oj6-jre | java6-runtime,
-	 java-wrappers (>= 0.1.22), ${java:Depends}
+	 java-wrappers (>= 0.1.22), libjmol-java (>= 12.1.42), ${java:Depends}
 Suggests: kalign, t-coffee, clustalw
 Description: multiple alignment editor
  JalView is a Java alignement editor that can work with sequence

Modified: trunk/jalview/debian/copyright
===================================================================
--- trunk/jalview/debian/copyright	2011-10-19 19:33:05 UTC (rev 15219)
+++ trunk/jalview/debian/copyright	2011-10-19 19:52:55 UTC (rev 15220)
@@ -14,7 +14,7 @@
 License: GPL-3+
   This package 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 2 of the License, or
+  the Free Software Foundation; either version 3 of the License, or
   (at your option) any later version.
   .
   This package is distributed in the hope that it will be useful,
@@ -29,7 +29,28 @@
   On Debian systems, the complete text of the GNU General Public
   License version 3 can be found in  `/usr/share/common-licenses/GPL-3'.
 
+Files: src/org/biojava/dasobert/*
+Copyright: 2004-2007 Andreas Prlic
+License: LGPL-2.1
+  This code may be freely distributed and modified under the
+  terms of the GNU Lesser General Public Licence.  This should
+  be distributed with the code.
+  .
+  On Debian systems, the complete text of the GNU Lesser Public
+  License can be found in  `/usr/share/common-licenses/LGPL-2.1'.
 
+Files: src/org/jibble/*
+Copyright: 2001-2004 Paul James Mutton
+License: GPL-2
+  This software is dual-licensed, allowing you to choose between the
+  GNU General Public License (GPL) and the www.jibble.org Commercial
+  License.  Since the GPL may be too restrictive for use in a
+  proprietary application, a commercial license is also provided. Full
+  license information can be found at http://www.jibble.org/licenses/.
+  .
+  On Debian systems, the complete text of the GNU General Public
+  License (version 2) can be found in  `/usr/share/common-licenses/GPL-2'.
+
 Files: debian/*
 Copyright: Copyright (C) 2009-2011 Vincent Fourmond <fourmond at debian.org>
 License: GPL-3+

Modified: trunk/jalview/debian/new-upstream
===================================================================
--- trunk/jalview/debian/new-upstream	2011-10-19 19:33:05 UTC (rev 15219)
+++ trunk/jalview/debian/new-upstream	2011-10-19 19:52:55 UTC (rev 15220)
@@ -31,6 +31,11 @@
 # Removing all binary jars...
 find -name '*.jar' | xargs rm 
 
+# Removing examples/ subdirectory, whose copyright status is unclear
+# to me for the time being
+rm -rf jalview*/examples
+
+
 echo "Creating archive"
 tar cvj -f $origname jalview*
 cd -