From bd557dca37a779973953967cf4fe63827fef121b Mon Sep 17 00:00:00 2001
From: KITAGAWA Masahiro <arctica0316@gmail.com>
Date: Sat, 9 Jan 2016 18:24:45 +0900
Subject: [PATCH] Set version 4.1.5; Show java version on Linux

---
 debian/changelog                                  | 6 ++++++
 debian/lightzone.dsc                              | 4 ++--
 freebsd-ports/graphics/lightzone/Makefile         | 2 +-
 freebsd-ports/graphics/lightzone/pkg-plist        | 2 ++
 lightcrafts/version.txt                           | 2 +-
 linux/PKGBUILD                                    | 2 +-
 linux/lightzone.changes                           | 4 ++++
 linux/products/lightzone                          | 3 ++-
 macosx/resources/Info.plist                       | 4 +++-
 windows/helpers/JavaAppLauncher/lightzone.jvmargs | 2 +-
 10 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3fc062435..1958e8d8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lightzone (4.1.5-0obs1) unstable; urgency=medium
+
+  * Upstream sync
+
+ -- Masahiro Kitagawa <arctica0316@gmail.com>  Sat, 09 Jan 2016 18:17:11 +0900
+
 lightzone (4.1.4-0obs1) unstable; urgency=medium
 
   * Upstream sync
diff --git a/debian/lightzone.dsc b/debian/lightzone.dsc
index 4a2f5b7a9..3a746a212 100644
--- a/debian/lightzone.dsc
+++ b/debian/lightzone.dsc
@@ -2,11 +2,11 @@ Format: 1.0
 Source: lightzone
 Binary: lightzone
 Architecture: i386 amd64
-Version: 4.1.4
+Version: 4.1.5
 Maintainer: Masahiro Kitagawa <arctica0316@gmail.com>
 Homepage: http://lightzoneproject.org/
 Standards-Version: 3.9.4.0
 Build-Depends: debhelper, devscripts, ant, autoconf, git-core, javahelp2, default-jdk (>= 1.6), default-jre-headless (>= 1.6), liblcms2-dev, libjpeg62-dev (<= 6b1-1) | libjpeg62-turbo-dev | libjpeg-turbo8-dev | libjpeg8-dev, libtiff5-dev | libtiff4-dev (<< 3.9.6), libx11-dev, pkg-config, rsync
 Package-List: 
  lightzone deb graphics optional
-DEBTRANSFORM-TAR: lightzone-4.1.4.tar.bz2
+DEBTRANSFORM-TAR: lightzone-4.1.5.tar.bz2
diff --git a/freebsd-ports/graphics/lightzone/Makefile b/freebsd-ports/graphics/lightzone/Makefile
index 38e161d01..816579409 100644
--- a/freebsd-ports/graphics/lightzone/Makefile
+++ b/freebsd-ports/graphics/lightzone/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lightzone
-DISTVERSION=	4.1.4
+DISTVERSION=	4.1.5
 PORTREVISION=	0
 CATEGORIES=	graphics java
 DIST_SUBDIR=	${PORTNAME}
diff --git a/freebsd-ports/graphics/lightzone/pkg-plist b/freebsd-ports/graphics/lightzone/pkg-plist
index 378053fe8..01a439862 100644
--- a/freebsd-ports/graphics/lightzone/pkg-plist
+++ b/freebsd-ports/graphics/lightzone/pkg-plist
@@ -14,6 +14,8 @@ bin/lightzone
 %%LIBDIR%%/libLinux.so
 %%LIBDIR%%/libSegment.so
 %%LIBDIR%%/libfbf.so
+%%JAVASHAREDIR%%/lightzone/asm-all-2.2.2.jar
+%%JAVASHAREDIR%%/lightzone/laf-widget.jar
 %%JAVASHAREDIR%%/lightzone/lcjai.jar
 %%JAVASHAREDIR%%/lightzone/lightcrafts-linux.jar
 %%JAVASHAREDIR%%/lightzone/lightcrafts.jar
diff --git a/lightcrafts/version.txt b/lightcrafts/version.txt
index a95f28844..b1cbc1fcd 100644
--- a/lightcrafts/version.txt
+++ b/lightcrafts/version.txt
@@ -1 +1 @@
-4.1.4
+4.1.5
diff --git a/linux/PKGBUILD b/linux/PKGBUILD
index 51010387d..40ab6207f 100644
--- a/linux/PKGBUILD
+++ b/linux/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: KITAGAWA Masahiro <arctica0316@gmail.com>
 pkgname="lightzone"
-pkgver=4.1.4
+pkgver=4.1.5
 pkgrel=0
 pkgdesc="Open-source professional-level digital darkroom software"
 url="http://lightzoneproject.org/"
diff --git a/linux/lightzone.changes b/linux/lightzone.changes
index 6549a0e91..36f7916e4 100644
--- a/linux/lightzone.changes
+++ b/linux/lightzone.changes
@@ -1,3 +1,7 @@
+Sat Jan 09 2016 - KITAGAWA Masahiro <arctica0316@gmail.com>
+
+- Upstream sync to 4.1.5
+
 -------------------------------------------------------------------
 Sun Nov 22 2015 - KITAGAWA Masahiro <arctica0316@gmail.com>
 
diff --git a/linux/products/lightzone b/linux/products/lightzone
index 9883fbaa4..6730a2f68 100755
--- a/linux/products/lightzone
+++ b/linux/products/lightzone
@@ -2,8 +2,9 @@
 #
 # LightZone startscript
 #
-echo Starting LightZone version 4.1.4 ...
+echo Starting LightZone version 4.1.5 ...
 echo with options : ${@}
+java -version
 
 arch=`getconf LONG_BIT`
 PLATFORM=`uname`
diff --git a/macosx/resources/Info.plist b/macosx/resources/Info.plist
index af92b5192..66fb57dc2 100755
--- a/macosx/resources/Info.plist
+++ b/macosx/resources/Info.plist
@@ -96,10 +96,12 @@
         <key>ClassPath</key>
         <array>
             <string>.</string>
+            <string>asm-all-2.2.2.jar</string>
+            <string>laf-widget.jar</string>
+            <string>lcjai.jar</string>
             <string>lightcrafts-apple.jar</string>
             <string>lightcrafts.jar</string>
             <string>quaqua.jar</string>
-            <string>lcjai.jar</string>
             <string>substance-lite.jar</string>
             <string>/System/Library/Java</string>
         </array>
diff --git a/windows/helpers/JavaAppLauncher/lightzone.jvmargs b/windows/helpers/JavaAppLauncher/lightzone.jvmargs
index 3f160084c..393f31fb3 100755
--- a/windows/helpers/JavaAppLauncher/lightzone.jvmargs
+++ b/windows/helpers/JavaAppLauncher/lightzone.jvmargs
@@ -9,7 +9,7 @@
 # JVM options.
 -Xrs
 -XX:+UseParallelGC
--Djava.class.path=.;lightcrafts-windows.jar;lightcrafts.jar;lcjai.jar;mlibwrapper_jai.jar;substance-lite.jar
+-Djava.class.path=.;lightcrafts-windows.jar;lightcrafts.jar;lcjai.jar;mlibwrapper_jai.jar;substance-lite.jar;asm-all-2.2.2.jar;laf-widget.jar
 -Dfile.encoding=UTF8
 
 # Main class.