/hg/icedtea6: Backport S7021314. Replace pr633-no_javaws_man_pag...

[omajid at icedtea.classpath.org]

changeset d778bb012d22 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d778bb012d22
author: Omair Majid <omajid at redhat.com>
date: Tue May 10 16:46:30 2011 -0400

	Backport S7021314. Replace pr633-no_javaws_man_page.patch with
	upstream fix

	2011-05-10 Omair Majid <omajid at redhat.com>

	 Move pr633-no_javaws_man_page.patch to proper location
	       * Makefile.am (ICEDTEA_PATCHES): Update patch location and name.
	       * patches/pr633-no_javaws_man_page.patch: Remove.
	       * patches/openjdk/7021314-no_javaws_man_page.patch: New file. Backport
	from OpenJDK7.


diffstat:

 ChangeLog                                        |   8 ++++++++
 Makefile.am                                      |   2 +-
 patches/openjdk/7021314-no_javaws_man_page.patch |  23 +++++++++++++++++++++++
 patches/pr633-no_javaws_man_page.patch           |  14 --------------
 4 files changed, 32 insertions(+), 15 deletions(-)

diffs (74 lines):

diff -r e080e9d33821 -r d778bb012d22 ChangeLog
--- a/ChangeLog	Tue May 10 13:35:19 2011 -0400
+++ b/ChangeLog	Tue May 10 16:46:30 2011 -0400
@@ -1,3 +1,11 @@
+2011-05-10  Omair Majid  <omajid at redhat.com>
+
+	Move pr633-no_javaws_man_page.patch to proper location
+	* Makefile.am (ICEDTEA_PATCHES): Update patch location and name.
+	* patches/pr633-no_javaws_man_page.patch: Remove.
+	* patches/openjdk/7021314-no_javaws_man_page.patch: New file. Backport
+	from OpenJDK7.
+
 2011-05-10  Omair Majid  <omajid at redhat.com>
 
 	Move fix for S6599601 to proper location.
diff -r e080e9d33821 -r d778bb012d22 Makefile.am
--- a/Makefile.am	Tue May 10 13:35:19 2011 -0400
+++ b/Makefile.am	Tue May 10 16:46:30 2011 -0400
@@ -310,7 +310,7 @@
 	patches/openjdk/6749060-bad-lcd-aa-non-opaque-dest.patch \
 	patches/openjdk/6708580-exa_slow.patch \
 	patches/openjdk/6896068-sg2d.patch \
-	patches/pr633-no_javaws_man_page.patch \
+	patches/openjdk/7021314-no_javaws_man_page.patch \
 	patches/pr586-include_all_srcs.patch \
 	patches/jtreg-LastErrorString.patch \
 	patches/openjdk/6663040-com.sun.awt.patch \
diff -r e080e9d33821 -r d778bb012d22 patches/openjdk/7021314-no_javaws_man_page.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7021314-no_javaws_man_page.patch	Tue May 10 16:46:30 2011 -0400
@@ -0,0 +1,24 @@
+# HG changeset patch
+# User andrew
+# Date 1298481016 0
+# Node ID 5e09deee19671a6d10c7cb24ba789b5bbf6636b8
+# Parent  9b2631288894758318b59caac3b1f079fa36e98a
+7021314: Build should not install javaws man page
+Summary: Only install javaws.1 when not building OpenJDK
+Reviewed-by: alanb, ohair
+
+diff -r 9b2631288894 -r 5e09deee1967 make/common/Release.gmk
+--- openjdk/jdk/make/common/Release.gmk	Wed Feb 16 14:33:48 2011 -0800
++++ openjdk/jdk/make/common/Release.gmk	Wed Feb 23 17:10:16 2011 +0000
+@@ -124,9 +124,11 @@
+ 	tnameserv.1     \
+ 	unpack200.1
+ 
++ifndef OPENJDK
+ ifeq ($(ARCH_DATA_MODEL),32)
+   JRE_MAN_PAGES += javaws.1
+ endif
++endif
+ 
+ JDK_MAN_PAGES =            \
+ 	$(JRE_MAN_PAGES)   \
diff -r e080e9d33821 -r d778bb012d22 patches/pr633-no_javaws_man_page.patch
--- a/patches/pr633-no_javaws_man_page.patch	Tue May 10 13:35:19 2011 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-diff -Nru openjdk.orig/jdk/make/common/Release.gmk openjdk/jdk/make/common/Release.gmk
---- openjdk.orig/jdk/make/common/Release.gmk	2011-02-22 08:36:53.832333120 +0000
-+++ openjdk/jdk/make/common/Release.gmk	2011-02-22 08:37:11.462960201 +0000
-@@ -145,9 +145,11 @@
- 	tnameserv.1     \
- 	unpack200.1
- 
-+ifndef OPENJDK
- ifeq ($(ARCH_DATA_MODEL),32)
-   JRE_MAN_PAGES += javaws.1
- endif
-+endif
- 
- JDK_MAN_PAGES =            \
- 	$(JRE_MAN_PAGES)   \