This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch jessie-backports in repository josm.
commit f5734babfbdc09f0671dfd7db46c247f12d4eb0a Author: Bas Couwenberg <[email protected]> Date: Thu Aug 18 10:55:37 2016 +0200 Rebuild for jessie-backports. Use OpenJDK 8 for jessie-backports. --- debian/changelog | 7 +++++++ debian/control | 1 + debian/patches/openjdk-8.patch | 15 +++++++++++++++ debian/patches/series | 1 + debian/rules | 3 +++ 5 files changed, 27 insertions(+) diff --git a/debian/changelog b/debian/changelog index 12b6978..6d73144 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +josm (0.0.svn10786+dfsg-2~bpo8+1) jessie-backports; urgency=medium + + * Rebuild for jessie-backports. + * Use OpenJDK 8 for jessie-backports. + + -- Bas Couwenberg <[email protected]> Thu, 18 Aug 2016 10:48:55 +0200 + josm (0.0.svn10786+dfsg-2) unstable; urgency=medium * Add patch to fix two SVG files, causing exception. diff --git a/debian/control b/debian/control index 5c5b4b5..9df7360 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Section: utils Priority: extra Build-Depends: debhelper (>= 9~), default-jdk (>= 1.8) | java8-sdk, + openjdk-8-jdk, ant, ant-contrib, gettext, diff --git a/debian/patches/openjdk-8.patch b/debian/patches/openjdk-8.patch new file mode 100644 index 0000000..38af743 --- /dev/null +++ b/debian/patches/openjdk-8.patch @@ -0,0 +1,15 @@ +Description: Use OpenJDK 8 unless JAVACMD is set. +Author: Bas Couwenberg <[email protected]> +Forwarded: not-needed + +--- a/linux/tested/usr/bin/josm ++++ b/linux/tested/usr/bin/josm +@@ -27,6 +27,8 @@ fi + JAVA_OPTS="-Djosm.restart=true -Djava.net.useSystemProxies=true $JAVA_OPTS" + + if [ -z "${JAVACMD}" ]; then ++ JAVACMD=/usr/lib/jvm/java-8-openjdk-$ARCH/bin/java ++ + for jcmd in $JAVA_CMDS; do + if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then + JAVACMD="$jcmd" diff --git a/debian/patches/series b/debian/patches/series index 1cf01c9..0d4539a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ 07-use_system_fonts.patch 08-use_noto_font.patch svn-r10789-fix-two-svg-files.patch +openjdk-8.patch diff --git a/debian/rules b/debian/rules index 23b86da..78417f1 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,9 @@ export JAVA_HOME=/usr/lib/jvm/default-java export CLASSPATH=/usr/share/java/gettext-commons.jar:/usr/share/java/metadata-extractor.jar:/usr/share/java/signpost-core.jar:/usr/share/java/jmapviewer.jar:/usr/share/java/json.jar +# Use OpenJDK 8 for jessie-backports +export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-$(shell dpkg-architecture -qDEB_BUILD_ARCH) + SVNREPO := https://josm.openstreetmap.de/svn/trunk SVNI18NREPO := https://svn.openstreetmap.org/applications/editors/josm/i18n/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
