[med-svn] r12657 - trunk/packages/libcolt-java/trunk/debian

[Andreas Tille]

Author: tille
Date: 2012-12-17 14:55:20 +0000 (Mon, 17 Dec 2012)
New Revision: 12657

Modified:
   trunk/packages/libcolt-java/trunk/debian/changelog
   trunk/packages/libcolt-java/trunk/debian/control
   trunk/packages/libcolt-java/trunk/debian/rules
Log:
use default java implementation; describe how to use new uscan for obtaining source tarball


Modified: trunk/packages/libcolt-java/trunk/debian/changelog
===================================================================
--- trunk/packages/libcolt-java/trunk/debian/changelog	2012-12-17 14:30:10 UTC (rev 12656)
+++ trunk/packages/libcolt-java/trunk/debian/changelog	2012-12-17 14:55:20 UTC (rev 12657)
@@ -3,8 +3,11 @@
   * debian/copyright:
      - DEP5
      - Add Files-Excluded to document what was removed from original source
+  * debian/{control,rules}: use default java implementation
+    thanks for the patch to James Page <james.page at ubuntu.com>
+    Closes: #683528
 
- -- Andreas Tille <tille at debian.org>  Fri, 24 Aug 2012 22:15:08 +0200
+ -- Andreas Tille <tille at debian.org>  Mon, 17 Dec 2012 15:52:07 +0100
 
 colt (1.2.0~nojar-2) unstable; urgency=low
 

Modified: trunk/packages/libcolt-java/trunk/debian/control
===================================================================
--- trunk/packages/libcolt-java/trunk/debian/control	2012-12-17 14:30:10 UTC (rev 12656)
+++ trunk/packages/libcolt-java/trunk/debian/control	2012-12-17 14:55:20 UTC (rev 12657)
@@ -4,7 +4,7 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 9), javahelper (>=0.25), openjdk-6-jdk, ant, libconcurrent-java
+Build-Depends: debhelper (>= 9), javahelper (>=0.25), default-jdk, ant, libconcurrent-java
 Standards-Version: 3.9.3
 Homepage: http://acs.lbl.gov/software/colt/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/libcolt-java/trunk

Modified: trunk/packages/libcolt-java/trunk/debian/rules
===================================================================
--- trunk/packages/libcolt-java/trunk/debian/rules	2012-12-17 14:30:10 UTC (rev 12656)
+++ trunk/packages/libcolt-java/trunk/debian/rules	2012-12-17 14:55:20 UTC (rev 12657)
@@ -6,7 +6,7 @@
 	dh $@ --with javahelper
 
 override_dh_auto_build:
-	ant build
+	ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 build
 
 override_dh_installdocs:
 	dh_installdocs
@@ -18,4 +18,11 @@
 	rm -rf lib/*.jar
 
 get-orig-source:
-	uscan --verbose --force-download
+	mkdir -p ../tarballs
+#	uscan --verbose --force-download --destdir ../tarballs
+# Remark: The following uscan command requires devscripts > 2.12.4 which is not
+#         yet released at the time of this package release.  The code can be obtained
+#         via
+#   git clone git://tille@git.debian.org/git/users/tille/devscripts.git
+#         and then use scripts/uscan.pl
+	uscan --verbose --force-download --repack-compression xz --destdir ../tarballs