/hg/release/icedtea-web-1.6: 2 new changesets

[jvanek at icedtea.classpath.org]

changeset f6e5aaaba724 in /hg/release/icedtea-web-1.6
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=f6e5aaaba724
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Feb 02 17:49:18 2016 +0100

	maven artifacts version substituted to contains only major version


changeset d518c093bd44 in /hg/release/icedtea-web-1.6
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=d518c093bd44
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Feb 02 17:57:33 2016 +0100

	Pre-release tuning


diffstat:

 ChangeLog    |  13 +++++++++++++
 Makefile.am  |  15 +++++++++++++--
 NEWS         |   2 +-
 configure.ac |   2 +-
 4 files changed, 28 insertions(+), 4 deletions(-)

diffs (77 lines):

diff -r 5be0492c4e4b -r d518c093bd44 ChangeLog
--- a/ChangeLog	Thu Jan 28 13:40:08 2016 +0100
+++ b/ChangeLog	Tue Feb 02 17:57:33 2016 +0100
@@ -1,3 +1,16 @@
+2016-02-02  Jiri Vanek <jvanek at redhat.com>
+
+	Pre-release tuning
+	* Makefile.am: (netx-html-gen.stamp) set number of changests to 33 (since 1.6.1)
+	* NEWS: date of 1.6.2 set
+	* configure.ac: (AC_INIT) set to use 1.6.2
+
+2016-02-02  Jiri Vanek <jvanek at redhat.com>
+
+	maven artifacts version substituted to contains only major version 
+	* .Makefile: ($(abs_top_builddir)/metadata) version stripped by everything
+	behind second number
+
 2016-01-28  Matthias Klose  <doko at ubuntu.com>
             Jiri Vanek <jvanek at redhat.com>
 
diff -r 5be0492c4e4b -r d518c093bd44 Makefile.am
--- a/Makefile.am	Thu Jan 28 13:40:08 2016 +0100
+++ b/Makefile.am	Tue Feb 02 17:57:33 2016 +0100
@@ -508,11 +508,22 @@
 	sed -i '/RhinoBasedPacEvaluator/ d' $@
 endif
 
+# if 'sed' will be missing on machine, use old IFS hack as on other places
+# the 'sed' cycles is changing some custom version like 1.6.2 fedora23.4 to simple 1.6
+# if changed, keep in mind that also 1.7 should bubble to 1.7
+# also 1.7pre or 1.7preHASH should end up like 1.7
 $(abs_top_builddir)/metadata: $(top_srcdir)/metadata.in
 	mkdir -p $(abs_top_builddir)/metadata-work ; \
 	METAFILES=`ls $(top_srcdir)/metadata.in` ; \
+	SEDDED_VERSION=`echo "$(FULL_VERSION)" | sed 's/[^0-9]\+/ /g'` ; \
+	x=0; for i in $$SEDDED_VERSION ; do  \
+	  let x++; \
+	  if [ $$x -eq 1 ] ; then V1=$$i; fi; \
+	  if [ $$x -eq 2 ] ; then V2=$$i; fi; \
+	done; \
+	XVERSION=$$V1.$$V2; \
 	for F in $$METAFILES ; do \
-	  cat $(top_srcdir)/metadata.in/$$F | sed "s;%{name};$(PACKAGE_NAME);g" |  sed "s;%{version};$(FULL_VERSION);g" > $(abs_top_builddir)/metadata-work/$$F ; \
+	  cat $(top_srcdir)/metadata.in/$$F | sed "s;%{name};$(PACKAGE_NAME);g" |  sed "s;%{version};$$XVERSION;g" > $(abs_top_builddir)/metadata-work/$$F ; \
 	done ; \
 	mv $(abs_top_builddir)/metadata-work $(abs_top_builddir)/metadata ;
 
@@ -580,7 +591,7 @@
 	mkdir -p html-gen; \
 	cp AUTHORS NEWS COPYING ChangeLog html-gen/; \
 	export HTML_GEN_DEBUG=true; \
-	${SHELL} html-gen.sh 40; \
+	${SHELL} html-gen.sh 33; \
 	unset HTML_GEN_DEBUG)
 	${INSTALL_DATA} $(NETX_SRCDIR)/../html-gen/*.html $(NETX_RESOURCE_DIR)
 	rm -r $(NETX_SRCDIR)/../html-gen/
diff -r 5be0492c4e4b -r d518c093bd44 NEWS
--- a/NEWS	Thu Jan 28 13:40:08 2016 +0100
+++ b/NEWS	Tue Feb 02 17:57:33 2016 +0100
@@ -8,7 +8,7 @@
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
-New in release 1.6.2 (YYYY-MM-DD):
+New in release 1.6.2 (2016-02-03):
 * all connection restrictions now consider also port
 * PR2779: html-gen.sh: Don't try to call hg if .hg directory isn't present
 * PR2591 - IcedTea-Web request resources twice for meta informations and causes ClientAbortException on tomcat in conjunction with JnlpDownloadServlet
diff -r 5be0492c4e4b -r d518c093bd44 configure.ac
--- a/configure.ac	Thu Jan 28 13:40:08 2016 +0100
+++ b/configure.ac	Tue Feb 02 17:57:33 2016 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea-web],[1.6.2pre],[distro-pkg-dev at openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web])
+AC_INIT([icedtea-web],[1.6.2],[distro-pkg-dev at openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile netx.manifest])
 AM_MAINTAINER_MODE([enable])