----- Original Message ----- > On 03/16/2012 03:12 PM, Dr Andrew John Hughes wrote: > > Ok for trunk? > > There's a lot of generated stuff in that patch, which makes the > patch very hard to review. Please include only source files. > > So, no generated headers, no configure files, no ltmain, etc, > Well this is a merge, so I would have thought the main thing to check was the build changes that resulted, rather than the source file changes which have already been reviewed and committed to GNU Classpath. Plus, the original patch matches what will be checked in. But anyway, attached are the source file changes, which are all already in GNU Classpath. The following changes are absent from the new patch: - Makefile.in | 16 - classpath | 50 - classpath/ChangeLog | 1071 ++++ - classpath/INSTALL | 9 - classpath/config.guess | 433 - - classpath/config.sub | 210 - classpath/configure | 102 - classpath/depcomp | 74 - classpath/doc/texinfo.tex | 1872 +++++-- - classpath/include/Makefile.in | 3 - classpath/include/config.h.in | 3 - classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h | 13 - classpath/include/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.h | 13 - classpath/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h | 11 - classpath/include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h | 7 - classpath/include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h | 17 - classpath/include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h | 17 - classpath/include/gnu_java_awt_peer_gtk_GtkFramePeer.h | 17 - classpath/include/gnu_java_awt_peer_gtk_GtkImage.h | 11 - classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h | 17 - classpath/include/gnu_java_awt_peer_qt_MainQtThread.h | 7 - classpath/include/gnu_java_awt_peer_qt_QtButtonPeer.h | 3 - classpath/include/gnu_java_awt_peer_qt_QtCanvasPeer.h | 3 - classpath/include/gnu_java_awt_peer_qt_QtCheckboxPeer.h | 3 - classpath/include/gnu_java_awt_peer_qt_QtChoicePeer.h | 3 - classpath/include/gnu_java_awt_peer_qt_QtDialogPeer.h | 3 - classpath/include/gnu_java_awt_peer_qt_QtEmbeddedWindowPeer.h | 3 - classpath/include/gnu_java_awt_peer_qt_QtFileDialogPeer.h | 3 - classpath/include/gnu_java_awt_peer_qt_QtFontMetrics.h | 3 - classpath/include/gnu_java_awt_peer_qt_QtFramePeer.h | 3 - classpath/include/gnu_java_awt_peer_qt_QtImage.h | 11 - classpath/include/gnu_java_awt_peer_qt_QtLabelPeer.h | 3 - classpath/include/gnu_java_awt_peer_qt_QtListPeer.h | 3 - classpath/include/gnu_java_awt_peer_qt_QtPanelPeer.h | 3 - classpath/include/gnu_java_awt_peer_qt_QtScreenDevice.h | 7 - classpath/include/gnu_java_awt_peer_qt_QtScrollPanePeer.h | 3 - classpath/include/gnu_java_awt_peer_qt_QtScrollbarPeer.h | 3 - classpath/include/gnu_java_awt_peer_qt_QtTextAreaPeer.h | 3 - classpath/include/gnu_java_awt_peer_qt_QtTextFieldPeer.h | 3 - classpath/include/gnu_java_awt_peer_qt_QtVolatileImage.h | 17 - classpath/include/gnu_java_awt_peer_qt_QtWindowPeer.h | 3 - classpath/include/gnu_java_nio_charset_iconv_IconvDecoder.h | 9 - classpath/include/gnu_java_nio_charset_iconv_IconvEncoder.h | 9 - classpath/include/java_lang_VMSystem.h | 1 - classpath/install-sh | 23 - classpath/lib/Makefile.in | 2 - classpath/lib/java/io/Console.class | 1 - classpath/lib/java/io/IOError.class | 1 - classpath/lib/java/io/ObjectOutputStream$2.class | 1 - classpath/lib/java/io/VMConsole.class | 1 - classpath/lib/java/nio/channels/spi/SelectorProvider$1.class | 1 - classpath/lib/java/security/KeyStore$1.class | 1 - classpath/ltmain.sh | 1395 ++--- - classpath/ltoptions.m4 | 11 - classpath/ltversion.m4 | 10 - classpath/lt~obsolete.m4 | 10 - classpath/missing | 53 - classpath/native/jni/java-io/Makefile.in | 6 - classpath/resource/gnu/java/locale/LocaleInformation.properties | 26 - classpath/resource/gnu/java/locale/LocaleInformation_aa.properties | 44 - classpath/resource/gnu/java/locale/LocaleInformation_aa_DJ.properties | 4 - classpath/resource/gnu/java/locale/LocaleInformation_aa_ER.properties | 2 - classpath/resource/gnu/java/locale/LocaleInformation_aa_ER_SAAHO.properties | 4 - classpath/resource/gnu/java/locale/LocaleInformation_af.properties | 710 +- - classpath/resource/gnu/java/locale/LocaleInformation_ak.properties | 8 - classpath/resource/gnu/java/locale/LocaleInformation_am.properties | 830 +-- - classpath/resource/gnu/java/locale/LocaleInformation_ar.properties | 1974 ++++---- - classpath/resource/gnu/java/locale/LocaleInformation_ar_JO.properties | 6 - classpath/resource/gnu/java/locale/LocaleInformation_ar_LB.properties | 6 - classpath/resource/gnu/java/locale/LocaleInformation_ar_QA.properties | 2 - classpath/resource/gnu/java/locale/LocaleInformation_ar_SA.properties | 2 - classpath/resource/gnu/java/locale/LocaleInformation_ar_SY.properties | 6 - classpath/resource/gnu/java/locale/LocaleInformation_ar_TN.properties | 2 - classpath/resource/gnu/java/locale/LocaleInformation_ar_YE.properties | 2 - classpath/resource/gnu/java/locale/LocaleInformation_as.properties | 32 - classpath/resource/gnu/java/locale/LocaleInformation_az.properties | 1978 ++++---- - classpath/resource/gnu/java/locale/LocaleInformation_az_Cyrl.properties | 28 - classpath/resource/gnu/java/locale/LocaleInformation_be.properties | 882 +-- - classpath/resource/gnu/java/locale/LocaleInformation_bg.properties | 1762 +++---- - classpath/resource/gnu/java/locale/LocaleInformation_bn.properties | 1994 ++++---- - classpath/resource/gnu/java/locale/LocaleInformation_bn_IN.properties | 174 - classpath/resource/gnu/java/locale/LocaleInformation_bs.properties | 214 - classpath/resource/gnu/java/locale/LocaleInformation_byn.properties | 538 +- - classpath/resource/gnu/java/locale/LocaleInformation_ca.properties | 1414 ++--- - classpath/resource/gnu/java/locale/LocaleInformation_cch.properties | 8 - classpath/resource/gnu/java/locale/LocaleInformation_cop.properties | 8 - classpath/resource/gnu/java/locale/LocaleInformation_cs.properties | 1500 +++--- - classpath/resource/gnu/java/locale/LocaleInformation_cy.properties | 740 +-- - classpath/resource/gnu/java/locale/LocaleInformation_da.properties | 2160 ++++---- - classpath/resource/gnu/java/locale/LocaleInformation_de.properties | 2274 ++++----- - classpath/resource/gnu/java/locale/LocaleInformation_de_AT.properties | 4 - classpath/resource/gnu/java/locale/LocaleInformation_de_BE.properties | 4 - classpath/resource/gnu/java/locale/LocaleInformation_de_CH.properties | 12 - classpath/resource/gnu/java/locale/LocaleInformation_dv.properties | 8 - classpath/resource/gnu/java/locale/LocaleInformation_dz.properties | 216 - classpath/resource/gnu/java/locale/LocaleInformation_ee.properties | 10 - classpath/resource/gnu/java/locale/LocaleInformation_el.properties | 1462 +++--- - classpath/resource/gnu/java/locale/LocaleInformation_en.properties | 2318 ++++----- - classpath/resource/gnu/java/locale/LocaleInformation_en_Dsrt.properties | 776 +-- - classpath/resource/gnu/java/locale/LocaleInformation_en_IE.properties | 2 - classpath/resource/gnu/java/locale/LocaleInformation_en_Shaw.properties | 10 - classpath/resource/gnu/java/locale/LocaleInformation_eo.properties | 728 +- - classpath/resource/gnu/java/locale/LocaleInformation_es.properties | 2204 ++++----- - classpath/resource/gnu/java/locale/LocaleInformation_es_AR.properties | 4 - classpath/resource/gnu/java/locale/LocaleInformation_es_CL.properties | 10 - classpath/resource/gnu/java/locale/LocaleInformation_et.properties | 1850 +++---- - classpath/resource/gnu/java/locale/LocaleInformation_eu.properties | 642 +- - classpath/resource/gnu/java/locale/LocaleInformation_fa.properties | 1740 +++---- - classpath/resource/gnu/java/locale/LocaleInformation_fa_AF.properties | 232 - classpath/resource/gnu/java/locale/LocaleInformation_fi.properties | 2086 ++++---- - classpath/resource/gnu/java/locale/LocaleInformation_fil.properties | 800 +-- - classpath/resource/gnu/java/locale/LocaleInformation_fo.properties | 672 +- - classpath/resource/gnu/java/locale/LocaleInformation_fr.properties | 2430 +++++----- - classpath/resource/gnu/java/locale/LocaleInformation_fur.properties | 930 +-- - classpath/resource/gnu/java/locale/LocaleInformation_ga.properties | 1400 ++--- - classpath/resource/gnu/java/locale/LocaleInformation_gaa.properties | 10 - classpath/resource/gnu/java/locale/LocaleInformation_gez.properties | 536 +- - classpath/resource/gnu/java/locale/LocaleInformation_gez_ET.properties | 2 - classpath/resource/gnu/java/locale/LocaleInformation_gl.properties | 976 ++-- - classpath/resource/gnu/java/locale/LocaleInformation_gu.properties | 210 - classpath/resource/gnu/java/locale/LocaleInformation_gv.properties | 8 - classpath/resource/gnu/java/locale/LocaleInformation_ha.properties | 204 - classpath/resource/gnu/java/locale/LocaleInformation_ha_Arab.properties | 8 - classpath/resource/gnu/java/locale/LocaleInformation_haw.properties | 36 - classpath/resource/gnu/java/locale/LocaleInformation_he.properties | 1558 +++--- - classpath/resource/gnu/java/locale/LocaleInformation_hi.properties | 1126 ++-- - classpath/resource/gnu/java/locale/LocaleInformation_hr.properties | 1372 ++--- - classpath/resource/gnu/java/locale/LocaleInformation_hu.properties | 2248 ++++----- - classpath/resource/gnu/java/locale/LocaleInformation_hy.properties | 594 +- - classpath/resource/gnu/java/locale/LocaleInformation_hy_AM_REVISED.properties | 4 - classpath/resource/gnu/java/locale/LocaleInformation_ia.properties | 574 +- - classpath/resource/gnu/java/locale/LocaleInformation_id.properties | 1546 +++--- - classpath/resource/gnu/java/locale/LocaleInformation_ig.properties | 8 - classpath/resource/gnu/java/locale/LocaleInformation_ii.properties | 36 - classpath/resource/gnu/java/locale/LocaleInformation_is.properties | 1960 ++++---- - classpath/resource/gnu/java/locale/LocaleInformation_it.properties | 2190 ++++----- - classpath/resource/gnu/java/locale/LocaleInformation_iu.properties | 8 - classpath/resource/gnu/java/locale/LocaleInformation_ja.properties | 2222 ++++----- - classpath/resource/gnu/java/locale/LocaleInformation_ka.properties | 1150 ++-- - classpath/resource/gnu/java/locale/LocaleInformation_kaj.properties | 8 - classpath/resource/gnu/java/locale/LocaleInformation_kam.properties | 8 - classpath/resource/gnu/java/locale/LocaleInformation_kcg.properties | 8 - classpath/resource/gnu/java/locale/LocaleInformation_kfo.properties | 8 - classpath/resource/gnu/java/locale/LocaleInformation_kk.properties | 202 - classpath/resource/gnu/java/locale/LocaleInformation_kl.properties | 8 - classpath/resource/gnu/java/locale/LocaleInformation_km.properties | 590 +- - classpath/resource/gnu/java/locale/LocaleInformation_kn.properties | 268 - - classpath/resource/gnu/java/locale/LocaleInformation_ko.properties | 2064 ++++---- - classpath/resource/gnu/java/locale/LocaleInformation_kok.properties | 276 - - classpath/resource/gnu/java/locale/LocaleInformation_kpe.properties | 8 - classpath/resource/gnu/java/locale/LocaleInformation_ku.properties | 194 - classpath/resource/gnu/java/locale/LocaleInformation_ku_Latn.properties | 10 - classpath/resource/gnu/java/locale/LocaleInformation_kw.properties | 8 - classpath/resource/gnu/java/locale/LocaleInformation_ky.properties | 156 - classpath/resource/gnu/java/locale/LocaleInformation_ln.properties | 442 - - classpath/resource/gnu/java/locale/LocaleInformation_lo.properties | 674 +- - classpath/resource/gnu/java/locale/LocaleInformation_lt.properties | 1318 ++--- - classpath/resource/gnu/java/locale/LocaleInformation_lv.properties | 1616 +++--- - classpath/resource/gnu/java/locale/LocaleInformation_mk.properties | 1122 ++-- - classpath/resource/gnu/java/locale/LocaleInformation_ml.properties | 2188 ++++----- - classpath/resource/gnu/java/locale/LocaleInformation_mn.properties | 218 - classpath/resource/gnu/java/locale/LocaleInformation_mr.properties | 288 - - classpath/resource/gnu/java/locale/LocaleInformation_ms.properties | 674 +- - classpath/resource/gnu/java/locale/LocaleInformation_mt.properties | 1460 +++--- - classpath/resource/gnu/java/locale/LocaleInformation_my.properties | 840 +-- - classpath/resource/gnu/java/locale/LocaleInformation_nb.properties | 2048 ++++---- - classpath/resource/gnu/java/locale/LocaleInformation_ne.properties | 760 +-- - classpath/resource/gnu/java/locale/LocaleInformation_nl.properties | 2226 ++++----- - classpath/resource/gnu/java/locale/LocaleInformation_nl_BE.properties | 10 - classpath/resource/gnu/java/locale/LocaleInformation_nn.properties | 1634 +++--- - classpath/resource/gnu/java/locale/LocaleInformation_nr.properties | 8 - classpath/resource/gnu/java/locale/LocaleInformation_nso.properties | 8 - classpath/resource/gnu/java/locale/LocaleInformation_ny.properties | 8 - classpath/resource/gnu/java/locale/LocaleInformation_om.properties | 190 - classpath/resource/gnu/java/locale/LocaleInformation_or.properties | 8 - classpath/resource/gnu/java/locale/LocaleInformation_pa.properties | 70 - classpath/resource/gnu/java/locale/LocaleInformation_pa_Arab.properties | 10 - classpath/resource/gnu/java/locale/LocaleInformation_pl.properties | 2192 ++++----- - classpath/resource/gnu/java/locale/LocaleInformation_ps.properties | 324 - - classpath/resource/gnu/java/locale/LocaleInformation_pt.properties | 2244 ++++----- - classpath/resource/gnu/java/locale/LocaleInformation_pt_PT.properties | 458 - - classpath/resource/gnu/java/locale/LocaleInformation_ro.properties | 1346 ++--- - classpath/resource/gnu/java/locale/LocaleInformation_ru.properties | 2232 ++++----- - classpath/resource/gnu/java/locale/LocaleInformation_ru_UA.properties | 4 - classpath/resource/gnu/java/locale/LocaleInformation_rw.properties | 204 - classpath/resource/gnu/java/locale/LocaleInformation_sa.properties | 44 - classpath/resource/gnu/java/locale/LocaleInformation_se.properties | 652 +- - classpath/resource/gnu/java/locale/LocaleInformation_se_FI.properties | 214 - classpath/resource/gnu/java/locale/LocaleInformation_si.properties | 12 - classpath/resource/gnu/java/locale/LocaleInformation_sid.properties | 40 - classpath/resource/gnu/java/locale/LocaleInformation_sk.properties | 1444 ++--- - classpath/resource/gnu/java/locale/LocaleInformation_sl.properties | 878 +-- - classpath/resource/gnu/java/locale/LocaleInformation_so.properties | 434 - - classpath/resource/gnu/java/locale/LocaleInformation_sq.properties | 524 +- - classpath/resource/gnu/java/locale/LocaleInformation_sr.properties | 1012 ++-- - classpath/resource/gnu/java/locale/LocaleInformation_sr_BA_Cyrl.properties | 6 - classpath/resource/gnu/java/locale/LocaleInformation_sr_Latn.properties | 886 +-- - classpath/resource/gnu/java/locale/LocaleInformation_ss.properties | 8 - classpath/resource/gnu/java/locale/LocaleInformation_st.properties | 180 - classpath/resource/gnu/java/locale/LocaleInformation_sv.properties | 2286 ++++----- - classpath/resource/gnu/java/locale/LocaleInformation_sv_FI.properties | 6 - classpath/resource/gnu/java/locale/LocaleInformation_sw.properties | 356 - - classpath/resource/gnu/java/locale/LocaleInformation_syr.properties | 8 - classpath/resource/gnu/java/locale/LocaleInformation_ta.properties | 648 +- - classpath/resource/gnu/java/locale/LocaleInformation_te.properties | 108 - classpath/resource/gnu/java/locale/LocaleInformation_tg.properties | 108 - classpath/resource/gnu/java/locale/LocaleInformation_th.properties | 2074 ++++---- - classpath/resource/gnu/java/locale/LocaleInformation_ti.properties | 194 - classpath/resource/gnu/java/locale/LocaleInformation_ti_ER.properties | 10 - classpath/resource/gnu/java/locale/LocaleInformation_tig.properties | 536 +- - classpath/resource/gnu/java/locale/LocaleInformation_tn.properties | 156 - classpath/resource/gnu/java/locale/LocaleInformation_to.properties | 332 - - classpath/resource/gnu/java/locale/LocaleInformation_tr.properties | 2244 ++++----- - classpath/resource/gnu/java/locale/LocaleInformation_trv.properties | 84 - classpath/resource/gnu/java/locale/LocaleInformation_ts.properties | 46 - classpath/resource/gnu/java/locale/LocaleInformation_tt.properties | 8 - classpath/resource/gnu/java/locale/LocaleInformation_ug.properties | 8 - classpath/resource/gnu/java/locale/LocaleInformation_uk.properties | 2250 ++++----- - classpath/resource/gnu/java/locale/LocaleInformation_ur.properties | 684 +- - classpath/resource/gnu/java/locale/LocaleInformation_uz.properties | 46 - classpath/resource/gnu/java/locale/LocaleInformation_uz_Arab.properties | 10 - classpath/resource/gnu/java/locale/LocaleInformation_uz_Latn.properties | 46 - classpath/resource/gnu/java/locale/LocaleInformation_ve.properties | 8 - classpath/resource/gnu/java/locale/LocaleInformation_vi.properties | 866 +-- - classpath/resource/gnu/java/locale/LocaleInformation_wal.properties | 282 - - classpath/resource/gnu/java/locale/LocaleInformation_wo.properties | 24 - classpath/resource/gnu/java/locale/LocaleInformation_xh.properties | 204 - classpath/resource/gnu/java/locale/LocaleInformation_yo.properties | 204 - classpath/resource/gnu/java/locale/LocaleInformation_zh.properties | 2040 ++++---- - classpath/resource/gnu/java/locale/LocaleInformation_zh_HK_Hant.properties | 22 - classpath/resource/gnu/java/locale/LocaleInformation_zh_Hant.properties | 1902 +++---- - classpath/resource/gnu/java/locale/LocaleInformation_zu.properties | 204 - classpath/tools/Makefile.in | 10 - gcj/Makefile.in | 2 - gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.h | 7 - gnu/javax/net/ssl/provider/CipherSuite.h | 6 - gnu/javax/net/ssl/provider/OutputSecurityParameters.h | 3 - include/Makefile.in | 2 - java/io/Console.h | 36 - java/io/IOError.h | 22 - java/io/ObjectOutputStream$2.h | 25 - java/io/ObjectOutputStream.h | 1 - java/io/VMConsole.h | 22 - java/nio/channels/spi/SelectorProvider$1.h | 38 - java/security/KeyStore$1.h | 32 - java/security/ProtectionDomain.h | 1 - java/text/DateFormatSymbols.h | 3 - java/util/HashMap.h | 2 - java/util/regex/Matcher.h | 1 - java/util/regex/Pattern.h | 1 - javax/xml/stream/util/ReaderDelegate.h | 95 - testsuite/Makefile.in | 2 - 396 files changed, 62085 insertions(+), 59329 deletions(-) + 146 files changed, 2381 insertions(+), 801 deletions(-) > Thanks, > Andrew, > > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07