From 558827c5e1689435c6392b0b17dc6beac2cdebd0 Mon Sep 17 00:00:00 2001
From: twogee <g.grigelionis@gmail.com>
Date: Wed, 9 Nov 2016 14:13:55 +0100
Subject: [PATCH] New release based on Grand 1.9.3

---
 ChangeLog-Ui.txt                              |  6 +++++
 build.properties                              |  4 +--
 build.xml                                     | 25 +++++++++++++------
 .../net/ggtools/grand/ui/buildnum.properties  | 10 ++++----
 4 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/ChangeLog-Ui.txt b/ChangeLog-Ui.txt
index cd7fbb8..7b737d3 100644
--- a/ChangeLog-Ui.txt
+++ b/ChangeLog-Ui.txt
@@ -1,4 +1,10 @@
 $Id$
+Release 0.8.2 (build number 302):
+
+* Upgraded to Grand core 1.9.3,
+* Fixed execute bits in distribution archives.
+
+
 Release 0.8.1 (build number 300):
 
 * Upgraded to Eclipse 4.6.1,
diff --git a/build.properties b/build.properties
index 083f8e7..f6504af 100644
--- a/build.properties
+++ b/build.properties
@@ -1,5 +1,5 @@
-product.version=0.8.1
-grand-core.version=1.9.2
+product.version=0.8.2
+grand-core.version=1.9.3
 
 eclipse.version=4.6.1
 eclipse.timestamp=201609071200
diff --git a/build.xml b/build.xml
index 2cace78..7e87bfb 100644
--- a/build.xml
+++ b/build.xml
@@ -212,23 +212,34 @@
 		<copy tofile="tmp/${bundle.name}/Contents/Java/grand-ui.jar" file="${libdir}/${product.fullname}.jar"/>
 
 		<tar destfile="${distdir}/${product.fullname}.tar.gz" compression="gzip">
-			<tarfileset dir="tmp/${product.fullname}" prefix="${product.fullname}" mode="755">
+			<tarfileset dir="tmp/${product.fullname}" prefix="${product.fullname}" filemode="755">
 				<include name="grand-ui"/>
-				<include name="grand-ui.jar"/>
 			</tarfileset>
 			<tarfileset dir="tmp/${product.fullname}" prefix="${product.fullname}">
 				<exclude name="grand-ui"/>
-				<exclude name="grand-ui.jar"/>
 			</tarfileset>
-			<tarfileset dir="tmp/${bundle.name}" prefix="${bundle.name}" mode="755">
-				<include name="${bundle.launcher.name}"/>
+			<tarfileset dir="tmp/${bundle.name}" prefix="${bundle.name}" filemode="755">
+				<include name="**/${bundle.launcher.name}"/>
 			</tarfileset>
 			<tarfileset dir="tmp/${bundle.name}" prefix="${bundle.name}">
-				<exclude name="${bundle.launcher.name}"/>
+				<exclude name="**/${bundle.launcher.name}"/>
 			</tarfileset>
 		</tar>
 
-		<zip destfile="${distdir}/${product.fullname}.zip" basedir="tmp" includes="${product.fullname}/**, ${bundle.name}/**"/>
+		<zip destfile="${distdir}/${product.fullname}.zip">
+			<zipfileset dir="tmp/${product.fullname}" prefix="${product.fullname}" filemode="755">
+				<include name="grand-ui"/>
+			</zipfileset>
+			<zipfileset dir="tmp/${product.fullname}" prefix="${product.fullname}">
+				<exclude name="grand-ui"/>
+			</zipfileset>
+			<zipfileset dir="tmp/${bundle.name}" prefix="${bundle.name}" filemode="755">
+				<include name="**/${bundle.launcher.name}"/>
+			</zipfileset>
+			<zipfileset dir="tmp/${bundle.name}" prefix="${bundle.name}">
+				<exclude name="**/${bundle.launcher.name}"/>
+			</zipfileset>
+		</zip>
 	</target>
 
 	<target name="jars" depends="compile.java,incbuildnum" description="Create the application jar(s)">
diff --git a/src/main/resources/net/ggtools/grand/ui/buildnum.properties b/src/main/resources/net/ggtools/grand/ui/buildnum.properties
index 6b370c8..f8878d6 100644
--- a/src/main/resources/net/ggtools/grand/ui/buildnum.properties
+++ b/src/main/resources/net/ggtools/grand/ui/buildnum.properties
@@ -1,6 +1,6 @@
-#Wed, 19 Oct 2016 20:26:20 +0200
+#Wed, 09 Nov 2016 11:57:55 +0100
 #Tue Jul 04 20:50:51 CEST 2006
-build.time=20\:26\:20
-build.number=300
-build.version.string=0.8.1
-build.date=2016-10-19
+build.time=11\:57\:55
+build.number=302
+build.version.string=0.8.2
+build.date=2016-11-09