/hg/icedtea6: 2 new changesets

[andrew at icedtea.classpath.org]

changeset bda25ffc4b05 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=bda25ffc4b05
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Apr 12 13:27:45 2010 +0100

	Add NetX source directory to EXTRA_DIST.

	2010-04-12 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Add NETX_SRCDIR to EXTRA_DIST.


changeset 86669f47e779 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=86669f47e779
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Apr 12 13:29:35 2010 +0100

	Move NSS patch to main patch block.

	2010-04-12 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Make NSS patch to main block as it's
	now applied unconditionally.


diffstat:

2 files changed, 14 insertions(+), 3 deletions(-)
ChangeLog   |   11 +++++++++++
Makefile.am |    6 +++---

diffs (48 lines):

diff -r 96b7c3d81af1 -r 86669f47e779 ChangeLog
--- a/ChangeLog	Mon Apr 12 13:40:58 2010 +0200
+++ b/ChangeLog	Mon Apr 12 13:29:35 2010 +0100
@@ -1,3 +1,14 @@ 2010-04-12  Matthias Klose  <doko at ubuntu
+2010-04-12  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Make NSS patch to main block as it's
+	now applied unconditionally.
+
+2010-04-12  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Add NETX_SRCDIR to EXTRA_DIST.
+
 2010-04-12  Matthias Klose  <doko at ubuntu.com>
 
 	* configure.ac: Clarify result message of the NSS check.
diff -r 96b7c3d81af1 -r 86669f47e779 Makefile.am
--- a/Makefile.am	Mon Apr 12 13:40:58 2010 +0200
+++ b/Makefile.am	Mon Apr 12 13:29:35 2010 +0100
@@ -335,7 +335,8 @@ ICEDTEA_PATCHES = \
 	patches/security/20100330/6910590.patch \
 	patches/security/20100330/6914823.patch \
 	patches/security/20100330/6914866.patch \
-	patches/security/20100330/6932480.patch
+	patches/security/20100330/6932480.patch \
+	patches/icedtea-nss-6763530.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
@@ -386,7 +387,6 @@ ICEDTEA_PATCHES += patches/icedtea-syste
 ICEDTEA_PATCHES += patches/icedtea-systemtap.patch
 endif
 
-ICEDTEA_PATCHES += patches/icedtea-nss-6763530.patch
 if ENABLE_NSS
 ICEDTEA_PATCHES += patches/icedtea-nss-config.patch
 else
@@ -552,7 +552,7 @@ ICEDTEA_ENV_ECJ = $(ICEDTEA_ENV) \
 # FIXME (distclean): Add jtreg sources
 # FIXME (distclean): Add pulseaudio sources
 
-EXTRA_DIST = generated \
+EXTRA_DIST = generated $(NETX_SRCDIR) \
 	$(abs_top_srcdir)/patches/* \
 	contrib ports \
 	extra overlays \