[med-svn] r4554 - trunk/packages/biojava/trunk/debian

[Steffen Möller]

Author: moeller
Date: 2010-01-20 09:43:13 +0000 (Wed, 20 Jan 2010)
New Revision: 4554

Modified:
   trunk/packages/biojava/trunk/debian/changelog
   trunk/packages/biojava/trunk/debian/control
   trunk/packages/biojava/trunk/debian/rules
   trunk/packages/biojava/trunk/debian/watch
Log:
Update for 1.7.1


Modified: trunk/packages/biojava/trunk/debian/changelog
===================================================================
--- trunk/packages/biojava/trunk/debian/changelog	2010-01-19 20:36:53 UTC (rev 4553)
+++ trunk/packages/biojava/trunk/debian/changelog	2010-01-20 09:43:13 UTC (rev 4554)
@@ -1,3 +1,9 @@
+biojava-live (1.7.1-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Steffen Moeller <moeller at debian.org>  Wed, 20 Jan 2010 02:08:17 +0100
+
 biojava-live (1.7.svn.20090419-3) unstable; urgency=low
 
   * debian/control:

Modified: trunk/packages/biojava/trunk/debian/control
===================================================================
--- trunk/packages/biojava/trunk/debian/control	2010-01-19 20:36:53 UTC (rev 4553)
+++ trunk/packages/biojava/trunk/debian/control	2010-01-20 09:43:13 UTC (rev 4554)
@@ -5,20 +5,20 @@
 DM-Upload-Allowed: yes
 Uploaders: Steffen Moeller <moeller at debian.org>,
  Andreas Tille <tille at debian.org>
-Build-Depends-Indep: libcommons-cli-java, libcommons-dbcp-java (>= 1.1), libhsqldb-java,
+Build-Depends-Indep: libcommons-dbcp-java (>= 1.1), libhsqldb-java,
  libcommons-collections-java (>= 2.1), libcommons-pool-java (>= 1.1),
  libbytecode-java (>= 0.92.cvs.20070925),
- openjdk-6-jdk|sun-java6-jdk|sun-java5-jdk|sun-j2sdk1.4|java2-compiler, junit4,
+ default-jdk-builddep|openjdk-6-jdk|sun-java6-jdk|sun-java5-jdk|sun-j2sdk1.4|java2-compiler, junit4,
  ant-optional
 Build-Depends: debhelper, quilt, cdbs, ant
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/biojava/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/biojava/trunk/
 Homepage: http://www.biojava.org
 
 Package: libbiojava1.7-java
 Architecture: all
-Depends: ${shlibs:Depends},${misc:Depends}, libcommons-pool-java (>= 1.1), libcommons-collections-java (>= 2.1), libcommons-dbcp-java (>= 1.1), libhsqldb-java, libbytecode-java, openjdk-6-jre|sun-java6-jre|sun-java5-jre|java2-runtime
+Depends: ${shlibs:Depends},${misc:Depends}, libcommons-pool-java (>= 1.1), libcommons-collections-java (>= 2.1), libcommons-dbcp-java (>= 1.1), libhsqldb-java, libbytecode-java, default-jre-headless|openjdk-6-jre|sun-java6-jre|sun-java5-jre|java2-runtime
 Suggests: java-virtual-machine, libjgrapht-java, libbiojava-java, libbiojava-java-doc
 Conflicts: libbiojava1.6-java
 Replaces: libbiojava1.6-java

Modified: trunk/packages/biojava/trunk/debian/rules
===================================================================
--- trunk/packages/biojava/trunk/debian/rules	2010-01-19 20:36:53 UTC (rev 4553)
+++ trunk/packages/biojava/trunk/debian/rules	2010-01-20 09:43:13 UTC (rev 4554)
@@ -13,9 +13,8 @@
 
 export JAVA_HOME := $(shell /usr/sbin/update-java-alternatives -l | head -1 | cut -d' ' -f 3)
 
-# take the first two version numbers to prepare a symbolic link
-# to the real jar
-SOVERSION=$(shell dpkg-parsechangelog | grep ^Version | cut -f2 -d\  |  dpkg-parsechangelog | grep ^Version | cut -f2 -d\   | cut -f1 -d- | cut -f1,2 -d. )
+# version are the first two decimals
+SOVERSION=$(shell echo $(DEB_UPSTREAM_VERSION) | cut -f1,2 -d. )
 
 build: patch build-stamp
 
@@ -74,7 +73,12 @@
 	dh_installexamples -plibbiojava-java-demos demos/*
 	#dh_installman
 	dh_link -p libbiojava-java /usr/share/java/biojava$(DEB_UPSTREAM_VERSION).jar /usr/share/java/biojava.jar
-	dh_link -p libbiojava$(SOVERSION)-java /usr/share/java/biojava$(DEB_UPSTREAM_VERSION).jar /usr/share/java/biojava$(SOVERSION).jar
+	# thinking about svn snapshots
+	if [ "$(SOVERSION)" != "$(DEB_UPSTREAM_VERSION)" ]; then \
+		dh_link -p libbiojava$(SOVERSION)-java \
+			   /usr/share/java/biojava$(DEB_UPSTREAM_VERSION).jar \
+			   /usr/share/java/biojava$(SOVERSION).jar; \
+	fi
 	dh_link # use <pkg>.link files for version independant linking
 	dh_compress
 	dh_fixperms

Modified: trunk/packages/biojava/trunk/debian/watch
===================================================================
--- trunk/packages/biojava/trunk/debian/watch	2010-01-19 20:36:53 UTC (rev 4553)
+++ trunk/packages/biojava/trunk/debian/watch	2010-01-20 09:43:13 UTC (rev 4554)
@@ -1,5 +1,5 @@
 version=3
 # Well, this only finds updates to version 1.5
-http://www.biojava.org/download/bj15/src/BioJava(.*)-src.tar.gz
+#http://www.biojava.org/download/bj15/src/BioJava(.*)-src.tar.gz
 # offers no source
-#http://www.biojava.org/download/bj16/src/biojava-1.6.1-all.jar
+http://www.biojava.org/download/bj171/src/biojava-(.*)-src.jar