[med-svn] [libcolt-free-java] 01/01: Confirmed that this DFSG version is fine for Acacia denoiser, which depends on it via libdsol1-java. Some small changes. Please see accompanying comments in the rules file.

[Timothy Booth]

This is an automated email from the git hooks/post-receive script.

tbooth-guest pushed a commit to branch master
in repository libcolt-free-java.

commit 520862cd28437dcbdb0d46baaef4500b87582840
Author: Tim Booth <tbooth at ceh.ac.uk>
Date:   Thu Apr 9 16:21:59 2015 +0100

    Confirmed that this DFSG version is fine for Acacia denoiser,
    which depends on it via libdsol1-java.
    Some small changes.  Please see accompanying comments in the rules file.
---
 debian/changelog |  8 ++++++++
 debian/rules     | 10 ++++++++++
 2 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fef9cef..b7b5f24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libcolt-free-java (1.2.0+dfsg-3biolinux1) trusty; urgency=medium
+
+  * Rebuild for Trusty
+  * Re-version .jar to make it obvious that methods have been removed
+    vs. the vanilla non-free version.
+
+ -- Tim Booth <tbooth at ceh.ac.uk>  Thu, 09 Apr 2015 15:59:58 +0100
+
 libcolt-free-java (1.2.0+dfsg-3) unstable; urgency=medium
 
   * Drop non-free files from source and upload to main
diff --git a/debian/rules b/debian/rules
index 9d08b54..ecbebe8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,9 @@ override_dh_auto_configure:
 	dh_auto_configure
 
 override_dh_auto_build:
+	#Make this directory on build because GIT won't let you commit an empty
+	#directory
+	mkdir -p lib
 	ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 build
 
 override_dh_installdocs:
@@ -22,8 +25,15 @@ override_dh_clean:
 	dh_clean
 	rm -rf build
 	rm -rf lib/*.jar
+	#This will deliberately fail if lib contains anything but jars
+	! [ -d lib ] || rmdir lib
 	rm -rf src/hep/aida
 
+override_jh_installlibs:
+	#In this case leave on the +dfsg version suffix as it affects the methods
+	#available vs. the vanilla upstream lib.
+	jh_installlibs -v --version-strip=X
+
 get-orig-source:
 	mkdir -p ../tarballs
 	uscan --verbose --force-download --repack --compression xz --destdir ../tarballs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libcolt-free-java.git