changeset in /hg/icedtea6: Merge.

[Andrew John Hughes]

changeset 173e3d40d94b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=173e3d40d94b
description:
	Merge.

diffstat:

2 files changed, 13 insertions(+), 8 deletions(-)
ChangeLog   |    5 +++++
Makefile.am |   16 ++++++++--------

diffs (42 lines):

diff -r 839e9e0810ca -r 173e3d40d94b ChangeLog
--- a/ChangeLog	Thu Oct 16 01:44:33 2008 +0100
+++ b/ChangeLog	Thu Oct 16 01:46:18 2008 +0100
@@ -14,6 +14,11 @@ 2008-10-16  Andrew John Hughes  <gnu_and
 	Add --with-netbeans-basic-cluster-src-zip option.
 	* configure.ac:
 	Enable WITH_NETBEANS_BASIC_CLUSTER_SRC_ZIP macro.
+
+2008-10-15  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am (EXTRA_DIST): Always include all patches,
+	irrespective of any configure options.
 
 2008-10-15  Lillian Angel  <langel at redhat.com>
 
diff -r 839e9e0810ca -r 173e3d40d94b Makefile.am
--- a/Makefile.am	Thu Oct 16 01:44:33 2008 +0100
+++ b/Makefile.am	Thu Oct 16 01:46:18 2008 +0100
@@ -89,15 +89,15 @@ install:
 	$(ICEDTEAPLUGIN_CLEAN) hotspot hotspot-helper clean-extra \
 	clean-jtreg clean-jtreg-reports clean-visualvm clean-nbplatform
 
-EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_FSG_PATCHES) \
-	$(ICEDTEA_ECJ_PATCH) gcjwebplugin.cc tools-copy contrib ports \
-	patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \
-	patches/icedtea-arch.patch patches/icedtea-cacao.patch \
+EXTRA_DIST = rt generated \
+	patches/icedtea-*.patch \
+	gcjwebplugin.cc tools-copy contrib ports \
+	extra overlays \
 	javaws.png javaws.desktop visualvm.desktop \
-	overlays extra jconsole.desktop policytool.desktop \
-	test/jtreg patches/icedtea-plugin.patch \
-	patches/icedtea-liveconnect.patch IcedTeaPlugin.cc \
-	HACKING patches/icedtea-visualvm.patch pulseaudio fsg.sh
+	jconsole.desktop policytool.desktop \
+	test/jtreg \
+	IcedTeaPlugin.cc \
+	HACKING pulseaudio fsg.sh
 
 # The Binary plugs directory is called jdk1.7.0 for historical reasons. The
 # name is completely irrelevant; only contains the plugs to build IcedTea.