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

[Vincent Fourmond]

Author: fourmond
Date: 2011-10-17 22:03:17 +0000 (Mon, 17 Oct 2011)
New Revision: 15209

Modified:
   trunk/jalview/debian/changelog
   trunk/jalview/debian/control
   trunk/jalview/debian/copyright
   trunk/jalview/debian/jalview.install
   trunk/jalview/debian/new-upstream
   trunk/jalview/debian/rules
Log:
[jalview] it seems like we are getting close to a final release...

Modified: trunk/jalview/debian/changelog
===================================================================
--- trunk/jalview/debian/changelog	2011-10-17 21:49:05 UTC (rev 15208)
+++ trunk/jalview/debian/changelog	2011-10-17 22:03:17 UTC (rev 15209)
@@ -1,10 +1,9 @@
-jalview (2.7.dfsg~almost-1) unstable; urgency=low
+jalview (2.7.dfsg-1) experimental; urgency=low
 
   * Initial release (Closes: #507436)
   * Adding a debian/new-upstream script to repackage the original tarball,
     getting rid of the bundled precompiled JAR files (I love JAR files)
-    (well, almost, which is why this goes in non-free for now)
   * Using dh 7 and javahelper
   * Using jh_build for building
 
- -- Vincent Fourmond <fourmond at debian.org>  Sun, 16 Oct 2011 00:23:10 +0200
+ -- Vincent Fourmond <fourmond at debian.org>  Mon, 17 Oct 2011 23:53:38 +0200

Modified: trunk/jalview/debian/control
===================================================================
--- trunk/jalview/debian/control	2011-10-17 21:49:05 UTC (rev 15208)
+++ trunk/jalview/debian/control	2011-10-17 22:03:17 UTC (rev 15209)
@@ -1,5 +1,5 @@
 Source: jalview
-Section: non-free/science
+Section: science
 Priority: optional
 Maintainer: Vincent Fourmond <fourmond at debian.org>
 Build-Depends: cdbs, debhelper (>= 7), default-jdk,
@@ -13,7 +13,8 @@
 	       javahelper, javahelp2, libjswingreader-java,
                libmiglayout-java, icedtea-netx-common,
                libhttpmime-java, libhttpcore-java,
-               libapache-mime4j-java, libhttpclient-java
+               libapache-mime4j-java, libhttpclient-java,
+               libvamsas-client-java
 Standards-Version: 3.9.2
 Homepage: http://www.jalview.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jalview
@@ -29,5 +30,5 @@
  alignement produced by programs implementing alignment algorithms
  such as clustalw, kalign and t-coffee.
  .
- It has lots of features, and will compare advantageously to BioEdit,
- while being free as in free speech !
+ It has lots of features, is actively developed, and will compare
+ advantageously to BioEdit, while being free as in free speech !

Modified: trunk/jalview/debian/copyright
===================================================================
--- trunk/jalview/debian/copyright	2011-10-17 21:49:05 UTC (rev 15208)
+++ trunk/jalview/debian/copyright	2011-10-17 22:03:17 UTC (rev 15209)
@@ -3,16 +3,11 @@
 Upstream-Contact: jalview-discuss at jalview.org
 Source:
   The original tarball was made downloading the jalview-*.tar.gz
-  tarball on http://www.jalview.org/versions.html, and stripping most
-  of the binary-only jars excepted lib/vamsas-client.jar.
+  tarball on http://www.jalview.org/versions.html, and stripping all
+  binary jars.
   . 
-  For more details, see the debian/new-upstream script that does precisely
-  this.
-Disclaimer:
-  The tarball contains a sourceless binary jar, 
-  lib/vamsas-client.jar. Though the distribution and use of this file
-  is allowed by its copyright holders, the absence of source prevents
-  it from being integrated into Debian main.
+  For more details, see the debian/new-upstream script that takes care of 
+  the repackaging.
 
 Files: *
 Copyright: Copyright 2007-2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
@@ -40,10 +35,6 @@
 License: GPL-3+
   (see above)
 
-Files: lib/vamsas-client.jar
-Copyright: 
-License: ...
-
 Files: src/com/stevesoft/pat/*
 Copyright: Copyright 2001, Steven R. Brandt
 License: LGPL3+

Modified: trunk/jalview/debian/jalview.install
===================================================================
--- trunk/jalview/debian/jalview.install	2011-10-17 21:49:05 UTC (rev 15208)
+++ trunk/jalview/debian/jalview.install	2011-10-17 22:03:17 UTC (rev 15209)
@@ -1,2 +1 @@
-lib/vamsas-client.jar usr/share/jalview
 debian/wrappers/jalview usr/bin
\ No newline at end of file

Modified: trunk/jalview/debian/new-upstream
===================================================================
--- trunk/jalview/debian/new-upstream	2011-10-17 21:49:05 UTC (rev 15208)
+++ trunk/jalview/debian/new-upstream	2011-10-17 22:03:17 UTC (rev 15209)
@@ -29,7 +29,7 @@
 rm -rf jalview*/utils
 
 # Removing all binary jars...
-find -name '*.jar' | grep -vi vamsas | xargs rm 
+find -name '*.jar' | xargs rm 
 
 echo "Creating archive"
 tar cvj -f $origname jalview*

Modified: trunk/jalview/debian/rules
===================================================================
--- trunk/jalview/debian/rules	2011-10-17 21:49:05 UTC (rev 15208)
+++ trunk/jalview/debian/rules	2011-10-17 22:03:17 UTC (rev 15209)
@@ -19,7 +19,7 @@
 DEB_ANT_BUILD_TARGET := makedist
 DEB_JARS             := castor-xml commons-logging log4j-1.2 \
 	castor-core Jmol min-jaba-client axis-jaxrpc commons-discovery \
-	axis jh lib/vamsas-client.jar /usr/share/jmol-applet/JmolApplet.jar \
+	axis jh vamsas-client /usr/share/jmol-applet/JmolApplet.jar \
 	jswingreader miglayout /usr/share/icedtea-web/plugin.jar \
 	httpmime httpcore apache-mime4j httpclient
 
@@ -27,9 +27,5 @@
 ANT_OPTS             := -Dbuild.sysclasspath=last \
 	-DJALVIEW_VERSION=$(VERSION)
 
-FINAL_CLASSPATH = $(subst lib/vamsas-client.jar, /usr/share/jalview/vamsas-client.jar, $(DEB_CLASSPATH))
 
-JH_CLASSPATH_ARGS := -c"$(shell echo $(FINAL_CLASSPATH) | sed 's/:/ /g')" debian/jalview/usr/share/java/jalview.jar 
-
-cp:
-	@echo $(DEB_CLASSPATH)
\ No newline at end of file
+JH_CLASSPATH_ARGS := -c"$(shell echo $(DEB_CLASSPATH) | sed 's/:/ /g')" debian/jalview/usr/share/java/jalview.jar