[opticalraytracer] 04/06: * Update debian/ info

[D Haley]

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

mycae-guest pushed a commit to branch master
in repository opticalraytracer.

commit 64b07658641efe750f1f3b68a09c6eda629c143b
Author: D Haley <mycae at gmx.com>
Date:   Fri May 15 00:28:21 2015 +0200

    * Update debian/ info
---
 debian/control   |  4 ++--
 debian/copyright | 10 +++++-----
 debian/rules     | 38 ++++++++++++++++++--------------------
 3 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/debian/control b/debian/control
index 53b385c..3053329 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
 Uploaders: D Haley <mycae at gmx.com>
 Vcs-Git: git://git.debian.org/git/debian-science/packages/opticalraytracer.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/opticalraytracer.git
-Build-Depends: cdbs, debhelper (>= 7), ant (>=1.7.1), junit, javahelper, default-jdk, imagemagick
-Standards-Version: 3.9.4
+Build-Depends: debhelper (>= 7), junit, javahelper, default-jdk, imagemagick
+Standards-Version: 3.9.6
 Homepage: http://www.arachnoid.com/OpticalRayTracer/
 
 Package: opticalraytracer
diff --git a/debian/copyright b/debian/copyright
index 70d18cf..402f1c3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
-This package was debianized by D Haley <mycae at yahoo.com> on
-Sun, 03 Jan 2010 12:26:35 +1100.
+This package was debianized by D Haley <mycae at gmx.com> on
+Sun, 14 May 2015 23:40:35 +1100.
 
-It was downloaded from http://www.arachnoid.com/OpticalRayTracer/OpticalRayTracer.jar
+It was downloaded from  http://arachnoid.com/OpticalRayTracer/resources/OpticalRayTracer_source.tar.bz2
 
 Upstream Author:
 
@@ -9,7 +9,7 @@ Upstream Author:
 
 Copyright:
 
-    Copyright (C) 2008, Paul Lutus 
+    Copyright (C) 2015, Paul Lutus 
 
 License:
 
@@ -19,7 +19,7 @@ see `/usr/share/common-licenses/GPL-2'.
 
 The Debian packaging is:
 
-    Copyright (C) 2010 D Haley <mycae at yahoo.com>
+    Copyright (C) 2015 D Haley <mycae at gmx.com>
 
 and is licensed under the GPL version 3, 
 see `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/rules b/debian/rules
index cfbb142..e597c75 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,39 +9,23 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/cdbs/1/class/ant.mk
 
 PACKAGE_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: \(.*\)-[^-]*$$/\1/p')
 
 JAVA_HOME=/usr/lib/jvm/default-java
 DEB_JARS := zlib junit
 
-DEB_ANT_BUILDFILE=build.xml
-DEB_ANT_CLEAN_TARGET=clean
 DEB_BUILD_OPTIONS=nocheck
 
 clean::
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
-
+	rm -f build-stamp configure-stamp opticalraytracer.jar
+	
+	jh_clean
 	dh_clean
 
 
-install/opticalraytracer::
-	install -D -p -m644 ./dist/OpticalRayTracer.jar $(CURDIR)/debian/opticalraytracer/usr/share/java/opticalraytracer-$(PACKAGE_VERSION).jar
-	sh -c "cd $(CURDIR)/debian/opticalraytracer/usr/share/java && ln -s opticalraytracer-$(PACKAGE_VERSION).jar opticalraytracer.jar"
-
-	#install launcher wrapper script
-	mkdir  -p $(CURDIR)/debian/opticalraytracer/usr/share/pixmaps/
-	mkdir  -p $(CURDIR)/debian/opticalraytracer/usr/share/applications/
-	install -D -p OpticalRayTracer $(CURDIR)/debian/opticalraytracer/usr/bin/opticalraytracer
-
-	#install desktop icon
-	#1) Debian bug 591812, and lintian, says that we still should use xpm (!!) 
-	#	icons, so the conversion using the in-package icon.
-	convert ./src/opticalraytracer/icons/OpticalRayTracer.png $(CURDIR)/debian/opticalraytracer/usr/share/pixmaps/OpticalRayTracer.xpm
-
 configure: configure-stamp
 
 configure-stamp:
@@ -53,7 +37,20 @@ build: build-stamp
 build-stamp: configure-stamp  $(QUILT_STAMPFN)
 		dh_testdir
 		touch $@
+		jh_build --javacopts="-source 1.7 -target 1.7" opticalraytracer.jar --javadoc-opts="-source 1.7" src/ 
+
+
 install: build
+		#install launcher wrapper script
+		mkdir  -p $(CURDIR)/debian/opticalraytracer/usr/share/pixmaps/
+		mkdir  -p $(CURDIR)/debian/opticalraytracer/usr/share/applications/
+		install -D -p OpticalRayTracer $(CURDIR)/debian/opticalraytracer/usr/bin/opticalraytracer
+
+		#install desktop icon
+		#1) Debian bug 591812, and lintian, says that we still should use xpm (!!) 
+		#	icons, so the conversion using the in-package icon.
+		convert ./src/opticalraytracer/icons/OpticalRayTracer.png $(CURDIR)/debian/opticalraytracer/usr/share/pixmaps/OpticalRayTracer.xpm
+
 		dh_testdir
 		dh_testroot
 		dh_prep  
@@ -66,7 +63,7 @@ binary-indep: install
 	       dh_testdir
 	       dh_testroot
 	       dh_installchangelogs 
-	       dh_installdocs
+#	       dh_installdocs
 	       dh_lintian
 	       dh_installman
 	       dh_link
@@ -79,5 +76,6 @@ binary-indep: install
 	       dh_builddeb
 
 binary: binary-indep install 
+
 .PHONY: build clean binary-indep install configure
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opticalraytracer.git