[jsurf-alggeo] 01/01: Imported Debian patch 0.1.4+ds-2

[Jerome Benoit]

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

calculus-guest pushed a commit to branch master
in repository jsurf-alggeo.

commit 7c4fd446b879ed094ff66df809bd6903dc51822b
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Sun Nov 1 04:02:40 2015 +0100

    Imported Debian patch 0.1.4+ds-2
---
 debian/adhoc/Makefile                                    |  4 ++--
 debian/adhoc/script/jsurf-alggeo                         |  7 +++++++
 debian/changelog                                         | 11 +++++++++++
 debian/control                                           | 10 ++++++++--
 debian/jsurf-alggeo.install                              |  1 +
 debian/{jsurf-alggeo.links => jsurf-alggeo.links.frozen} |  0
 6 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/debian/adhoc/Makefile b/debian/adhoc/Makefile
index 8e80b07..8e0d509 100644
--- a/debian/adhoc/Makefile
+++ b/debian/adhoc/Makefile
@@ -14,8 +14,8 @@ default:
 
 manpages: jsurf-alggeo.1
 
-jsurf-alggeo.1: debian/jsurf-alggeo/usr/bin/jsurf-alggeo
-	$(HELP2MAN) \
+jsurf-alggeo.1: debian/jsurf-alggeo/usr/bin/jsurf-alggeo debian/jsurf-alggeo/usr/share/java/jsurf-alggeo.jar
+	JSURF_ALGGEO_JAR=$(CURDIR)/debian/jsurf-alggeo/usr/share/java/jsurf-alggeo.jar $(HELP2MAN) \
 			-s 1 \
 			$(H2MFLAGS) \
 			-I debian/man/$(basename $@).h2m \
diff --git a/debian/adhoc/script/jsurf-alggeo b/debian/adhoc/script/jsurf-alggeo
new file mode 100755
index 0000000..fc3147c
--- /dev/null
+++ b/debian/adhoc/script/jsurf-alggeo
@@ -0,0 +1,7 @@
+#!/bin/sh
+JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/default-java}
+JSURF_ALGGEO_JAR=${JSURF_ALGGEO_JAR:-/usr/share/java/jsurf-alggeo.jar}
+[ -e ${JSURF_ALGGEO_JAR} ] || exit 127
+exec ${JAVA_HOME}/bin/java -jar ${JSURF_ALGGEO_JAR} $@
+exit 126
+# eos
diff --git a/debian/changelog b/debian/changelog
index 56f6029..4f20f18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+jsurf-alggeo (0.1.4+ds-2) unstable; urgency=medium
+
+  * RC bug fix release (Closes: #803261), provide a shell wrapper to work around
+    jarwrapper issues observed on some virtual machines.
+  * Debianization:
+    - debian/control:
+      - Vcs-Browser field, correct;
+    - jarwrapper machinery, freeze (see RC bug fix above).
+
+ -- Jerome Benoit <calculus at rezozer.net>  Sun, 01 Nov 2015 03:01:18 +0000
+
 jsurf-alggeo (0.1.4+ds-1) unstable; urgency=medium
 
   * Initial release. (Closes: #798379)
diff --git a/debian/control b/debian/control
index bd143fe..df151f3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,15 @@ Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Jerome Benoit <calculus at rezozer.net>
 Build-Depends: debhelper (>= 9), javahelper, maven-repo-helper, help2man
-Build-Depends-Indep: default-jdk, jarwrapper, antlr3, libcommons-cli-java, libvecmath-java, rdfind, symlinks
+Build-Depends-Indep:
+ default-jdk,
+# jarwrapper,
+ antlr3, libcommons-cli-java, libvecmath-java,
+ rdfind, symlinks
 Standards-Version: 3.9.6
 Homepage: http://imaginary.org/program/jsurf
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/jsurf-alggeo.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/jsurf-alggeo.git
+Vcs-Browser: http://anonscm.debian.org/cgit/debian-science/packages/jsurf-alggeo.git
 
 Package: jsurf-alggeo
 Architecture: all
@@ -22,3 +26,5 @@ Description: Java based visualization library for real algebraic geometry
  tool for drawing real algebraic geometric surfaces, as well as some
  script samples. (This simple tool is similar to, but not comptible with,
  the tool surf-alggeo distributed within the package surf-alggeo.)
+ .
+ jsurf is free software distributed under the Apache 2.0 License.
diff --git a/debian/jsurf-alggeo.install b/debian/jsurf-alggeo.install
new file mode 100644
index 0000000..87b8916
--- /dev/null
+++ b/debian/jsurf-alggeo.install
@@ -0,0 +1 @@
+debian/adhoc/script/jsurf-alggeo usr/bin
diff --git a/debian/jsurf-alggeo.links b/debian/jsurf-alggeo.links.frozen
similarity index 100%
rename from debian/jsurf-alggeo.links
rename to debian/jsurf-alggeo.links.frozen

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