From a4194b135033f824b8a5be5b6ca02639ce7dc9c7 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Tue, 16 Jun 2009 13:22:43 +0000
Subject: [PATCH] Main.java (getGjdocVersion): Use
 gnu.classpath.Configuration.CLASSPATH_VERSION as version number.

2009-06-16  Matthias Klose  <doko@ubuntu.com>

        * tools/gnu/classpath/tools/gjdoc/Main.java (getGjdocVersion): Use
        gnu.classpath.Configuration.CLASSPATH_VERSION as version number.
        * tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java
        (getDocletVersion): Likewise.
        * tools/classes/gnu/classpath/tools/gjdoc/Main*.class: Regenerate.
        * tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet*.class:
        Regenerate.

From-SVN: r148530
---
 libjava/classpath/ChangeLog.gcj               |  10 ++++++++++
 .../doclets/htmldoclet/HtmlDoclet$1.class     | Bin 1205 -> 1205 bytes
 .../doclets/htmldoclet/HtmlDoclet$2.class     | Bin 1207 -> 1207 bytes
 .../doclets/htmldoclet/HtmlDoclet$3.class     | Bin 1401 -> 1401 bytes
 .../tools/doclets/htmldoclet/HtmlDoclet.class | Bin 80179 -> 79930 bytes
 .../gnu/classpath/tools/gjdoc/Main$1.class    | Bin 825 -> 825 bytes
 .../gnu/classpath/tools/gjdoc/Main$10.class   | Bin 1221 -> 1221 bytes
 .../gnu/classpath/tools/gjdoc/Main$11.class   | Bin 1728 -> 1728 bytes
 .../gnu/classpath/tools/gjdoc/Main$12.class   | Bin 1799 -> 1799 bytes
 .../gnu/classpath/tools/gjdoc/Main$13.class   | Bin 1800 -> 1800 bytes
 .../gnu/classpath/tools/gjdoc/Main$14.class   | Bin 1002 -> 1002 bytes
 .../gnu/classpath/tools/gjdoc/Main$15.class   | Bin 924 -> 924 bytes
 .../gnu/classpath/tools/gjdoc/Main$16.class   | Bin 1715 -> 1715 bytes
 .../gnu/classpath/tools/gjdoc/Main$17.class   | Bin 828 -> 828 bytes
 .../gnu/classpath/tools/gjdoc/Main$18.class   | Bin 809 -> 809 bytes
 .../gnu/classpath/tools/gjdoc/Main$19.class   | Bin 809 -> 809 bytes
 .../gnu/classpath/tools/gjdoc/Main$2.class    | Bin 767 -> 767 bytes
 .../gnu/classpath/tools/gjdoc/Main$20.class   | Bin 1382 -> 1382 bytes
 .../gnu/classpath/tools/gjdoc/Main$21.class   | Bin 1401 -> 1401 bytes
 .../gnu/classpath/tools/gjdoc/Main$22.class   | Bin 809 -> 809 bytes
 .../gnu/classpath/tools/gjdoc/Main$23.class   | Bin 809 -> 809 bytes
 .../gnu/classpath/tools/gjdoc/Main$24.class   | Bin 809 -> 809 bytes
 .../gnu/classpath/tools/gjdoc/Main$25.class   | Bin 809 -> 809 bytes
 .../gnu/classpath/tools/gjdoc/Main$3.class    | Bin 767 -> 767 bytes
 .../gnu/classpath/tools/gjdoc/Main$4.class    | Bin 767 -> 767 bytes
 .../gnu/classpath/tools/gjdoc/Main$5.class    | Bin 767 -> 767 bytes
 .../gnu/classpath/tools/gjdoc/Main$6.class    | Bin 806 -> 806 bytes
 .../gnu/classpath/tools/gjdoc/Main$7.class    | Bin 825 -> 825 bytes
 .../gnu/classpath/tools/gjdoc/Main$8.class    | Bin 825 -> 825 bytes
 .../gnu/classpath/tools/gjdoc/Main$9.class    | Bin 806 -> 806 bytes
 .../gnu/classpath/tools/gjdoc/Main.class      | Bin 29564 -> 29338 bytes
 .../tools/doclets/htmldoclet/HtmlDoclet.java  |  15 +--------------
 .../tools/gnu/classpath/tools/gjdoc/Main.java |  11 +----------
 33 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index e4d7c2fae3c..6398644ad7d 100644
--- a/libjava/classpath/ChangeLog.gcj
+++ b/libjava/classpath/ChangeLog.gcj
@@ -1,3 +1,13 @@
+2009-06-16  Matthias Klose  <doko@ubuntu.com>
+
+	* tools/gnu/classpath/tools/gjdoc/Main.java (getGjdocVersion): Use
+	gnu.classpath.Configuration.CLASSPATH_VERSION as version number.
+	* tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java
+	(getDocletVersion): Likewise.
+	* tools/classes/gnu/classpath/tools/gjdoc/Main*.class: Regenerate.
+	* tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet*.class:
+ 	Regenerate.
+
 2009-03-16  Matthias Klose  <doko@ubuntu.com>
 
 	* configure.ac: Detect xulrunner-1.9.
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$1.class
index 5bcba7c4e0aff896856baa986e9d073c1b92e6ae..4db03df8d4136a69c3fc50465d7202aaa86c92b9 100644
GIT binary patch
delta 14
VcmdnWxs`LnWM)Q%%~O~a8386u1W*6~

delta 14
VcmdnWxs`LnWM)Q#%~O~a8387(1YiIF

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$2.class
index cfecc2eeb96f803583429fdd0fe39f7d99e8378e..b2ef23465e097ad2d8dce401e08f81535321bfa4 100644
GIT binary patch
delta 14
Vcmdnaxt(*vWM)Q%%~P0_8387R1Xch5

delta 14
Vcmdnaxt(*vWM)Q#%~P0_8388c1ZDsL

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet$3.class
index 620bb15c3b69e27e182d005d564a965ca9f803a9..83886a0a3c62f4edd6e069e3548fe2bd339e115b 100644
GIT binary patch
delta 13
Ucmey#^^<Eu6APol<Yty{04Np(ZU6uP

delta 13
Ucmey#^^<Eu6APok<Yty{04Qb!egFUf

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.class b/libjava/classpath/tools/classes/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.class
index 6e9981b5ee758144745da2d0cbdf869a0be34359..e76e4ad0885f2f866e7fa532a65eed5e49d8af34 100644
GIT binary patch
delta 1242
zcmYjQZBSHY6n@_QyuA1BS(cSx7X|EtWZ4B47J={&hBiz>O^qo{HnXh^#UN|D$e*Us
znsJ<IO4x2QcgDt=shp;=4-_u}6a7daMHJDL%*+54KT4xdF|l`92l{h9o_X(c&U4PW
z`=?DkH%!TgXM6ep_~k`b7#RF&EXUtbxpt>yD$Fl0llWoP-{y23VMvM8N5fkpq55dS
zmS}w>KNO8h{HVI2Etic5yTld>H-#hq1U{;EwD~P#3jdy;QK#BUlg~1ka++EyWPZ-<
zvGSkPg7&4-IsUW4$N7Z1zWqVR1qNewPPW7^F)**hFRShC>z}!y@Zb0}gC+EQFjCnf
zSe8}iJ}mJ+7;FuV8^fXe*7`{Fg>bXP|6))QP$;}<bFhW;fB1}*-(+w!23vy#O~K}d
zf|cQLQ+=>mVJ?14^~YQWep_7=D>U;viVXFYSccQ6@OzoeF(#W8tdK1XYgK=sSRIL_
zt243Gq@*~?85-tMeW`o@%WppV?&?)AfQex`J)OLN5ZvSBg9mtjJo`ex22=`5FbcB^
zR(cymyRlMWO5!sN<0zo*C}MeA51GEg`8uPM4?Wp!yx)j*AL5Z-RMmB1b&c1_hr7*5
z2CNg&u|(wQ#Mioo4ZtR_p#+xa<j1{6!PCu87?7aJTj-=n)CIi<iQY#FeSpQZ2id~s
z(nl!w)5oZwPq2#i;xYOZb@VwlQO8`n*>MR7C)$OC27Yo*f*&jRcUogHTbXle@4R3)
zETW7K8+E}>-EdJ4?xS8jKz-V1F)K(u%~0zbz$stfJ2>v-KWL5sOLzRppfjh=(rSFE
zrlM|sUVA9Oo?w&O8v(YAUDWgd%Y1I??i25Vs#-Wjxq~oKKV%xfBKj8TbO@O=gmOB9
zDjG&L9mBIUf{iqam*@nx(@E?S`5ror&u9$ai1)*E2IF*ATVBHQvaax}LURW8@oR=w
zm{5hS;&6X~89`L>U$t!|%+IcC`%2jMl5tUb0t!uvp<aNSF5+>zgr{i=8|X3`=n7t>
zt7xHXqVyzo&~>~{(^}JV7Jlk?k8VDoCw0d6`lm-v%Kei69Z!1=+v@VV46oICeNO(b
z&S!mkQftTjgfn3kl5dJd&Iq};#B^`NOS1^j9hBLj`Ab<EV_J17t6?ThD`gdH4B}n}
zb@rA=H@w;<n-<15w=KI2vt5D3ZUeUy9CkZW1r|Tm#O_^pcMrH^tCm^DO3VMx=<AZD
z1<JYh>}i5BT~N9NrCU&D2+GB{$DXF`EMsX|R-<k1CvY1{T$Djna?7%ajLDL$$Tsa@
j87o{uamlh>P8Plh7Rv;TvIB}`v+yaJqnu?Kosj+m6J|F|

delta 1539
zcmZuwX-rgC6#nikZ)Wa&b007u!+?ki2(v&3P&8s9l-3YMNgK4&q)n#d6tOsiGe{Hr
zgQkfwX&R6`lb4uQ)21y+TdTOd5vlZtRa&=Jt<<&dwc5pfYh8MA4EUpYKhAQ`{mysK
z`QG+xrp-4@DSIAm9{}KIV=XWc_|@)0e{XeT=PXBQdpH(vjz&saW6{=dtgSg5x6(ZX
zdGT1NG!~9Wm&HQi`2SQ<+j_cBwiVI+1Wt9soG~56^R4tp0(;Zqh0##SQ{3S)kCh%G
zuq=zb6^XtbAxM3C*6>WrBLuuL9*+6qt>IAfo6X^cR{9G;+9-u(;<O|b7xa!1<d5c`
zv|H4+L_OV^PEM$MI>*{W(Uxe;pDaG5=63m|^D@0aFRG1Qm5xgUroxuC>5N`ByDjtz
zL5_NMW_sHEV5~X#MoU=a>7O$Fi~g<d>Y9{#jlh^!m}jLo2#D88Z>bNvUa9+6rVr>t
z0x7g87^`j*kVSRH&s*tZ0y+8qP;^Oau#Gapj20$lp1L^L9xQDMMw&`%qS2OcFd~yI
zW>R}sWf_>H?pyVonOS9KQ%QHWLzd|T!YGb1E~APm1dXb{qFin0cB;#}Gi+(YSqDMW
zNLC;3+WfG4_PUM%7{v!PxVO+<gP7HCTOUZ+Hq3GBlH{O+x+K?o2f_O#W57XwNZ6wF
z9<NUKx;+khK&L-#rMr4yT9CX<-41$CWQL=S5G%wqR2i1TfNIg91PtJ7VBsG^;UB@p
z*CKZ&Ux#A;F-rI+sN$bu2LBwjya%)S7pM`J@{;7R9|uIFz()_;t_WxsCfH6%<6+P`
z{lwGpvuOv;1dI+k^m3mu--rc0;w7jJB=BOr*Flf=nQaCv5Z>{m=iY*Eb&2eTUF3$6
zIq{;CUZcS2qrV!Egz;<?U6b_7APf2%VC5T;#(R;&Hz7~hVy+|8&l8x=x8Viehk1NE
z0{j~+;RD*dGLp$oi<{ynLKQuuEiEH8g=fDSL3KeAs5@cj--)5@Miw8$ME*Sr_+IT;
z87ZB1j$p2DH->xzYjMy)f2%i6G4<ffej)|D+lZVXDZUI-Ss(qKKqn5JWY#C+KeXy{
z@)EhKtu7};<hr(_oaB<5+R1X_tUCx3KLo}PBb^_ClMf-6AH_6&OpN|G>i9{#&QD<>
zKaF?z8LZ%Eu|~w7@eBBxU&KyPzn@>iIeuB2Q9(T8ZqqwrOWD{&?;6@+LM=MP?{E)h
z1W`-xYbz^=pZufsRge{vuZq^!AoJ^DhBt%+ZlZzT!mIo?UgLMr#P4D$zlSz{U$nlC
zmHYud;E%QVWD<=WaO>u+x^2tw8XviJTk$rA;jrKEZorc;yg%3Lb1<{cEI!@V-a9hk
zTp>d!60C{^>53H-6$-DyP@%|}s@R{X%q>_$h&8D);W4T;Od<6oRa-lSOs`-<FM~Q+
z?bZ$NC769w6i?QtIAK<@ASo_TB^#+q4l)#{X0IffBt<KzB$XY{0{9Xvbrc~<FJB-O
z2!uj`Fi9X334~&dQSzUm=Nh5sVkt(ukQCrDa#)2xg~!r`XH2oO3^qobO%}NVVTY^C
l+KEb%H#Sqa2Igd0!j?gj&cn!Dkfl~(vo+^bGR~L->wl^%ibVhb

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$1.class
index 93de99ad907c394a3bdf3fec298c1d44a9439e8d..22adcc22814564cee44d7fbdd09fbf0d0410dab8 100644
GIT binary patch
delta 13
UcmdnVwv%l`I1{77<OrsR03W^tcK`qY

delta 13
UcmdnVwv%l`I1{76<OrsR03Z$ohX4Qo

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$10.class
index 691c53ce0c20e9d7633c9f22c0c82b806775e7bf..2cba5c1eb78598e8bc9c52885a9acc3331b4ae6e 100644
GIT binary patch
delta 14
VcmX@gd6aX*9A-v^&2yPG7y&471c?9u

delta 14
VcmX@gd6aX*9A-v?&2yPG7y&5I1epK;

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$11.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$11.class
index e8bb15f993e07fbceffed2ba99ea412256b7f4bb..71d6e115251be311e65aca506c2632fd6ff8f2d4 100644
GIT binary patch
delta 14
VcmX@Wdw_R?0xP4!W<}Qdi~u7B1PTBE

delta 14
VcmX@Wdw_R?0xP4zW<}Qdi~u8M1R4MU

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$12.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$12.class
index 1479d587a83d7977f0a1254fa46ac953a1bff750..070cc7c54b2326f511530271a54873934a6a1164 100644
GIT binary patch
delta 14
VcmZqYYv<cg!^)_zxt6ty5db091U&!%

delta 14
VcmZqYYv<cg!^&u|xt6ty5db1K1Wf<{

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$13.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$13.class
index c47a836074b69b121064093a3bca3bccdcaa3a28..6d12c7db17d353cca1a01d7048eb02a8f79b66ce 100644
GIT binary patch
delta 14
VcmeC+>)_i^%gU&*xsJ7q5db0m1VI1*

delta 14
VcmeC+>)_i^%gSi5xsJ7q5db1x1W^D0

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$14.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$14.class
index 5bb6c725956f948beae904e4be0eaa5125126013..211ef8606c8ff015f9ba24a5d715a5d97aa1f58a 100644
GIT binary patch
delta 13
VcmaFG{)&CWKPE<n$^V&N0{|<d1~UKv

delta 13
VcmaFG{)&CWKPE<l$^V&N0{|=Y215V<

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$15.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$15.class
index 13f7e77a530576d5f936fb0afc00c965568bf380..f758b36833d2e86d9022150767f49a1350bdfe5b 100644
GIT binary patch
delta 13
VcmbQkK8Jn7P9{c$$-9^y0RSOW1q1*9

delta 13
VcmbQkK8Jn7P9{c!$-9^y0RSPR1rz`P

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$16.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$16.class
index bee8820c2f8714b497885f90219e7f596d919765..b9e96b63fca953ad37d749bbb12494243ac2b3bd 100644
GIT binary patch
delta 13
UcmdnYyP0>xCKg78#hY1}03##>WB>pF

delta 13
UcmdnYyP0>xCKg76#hY1}03&n+bN~PV

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$17.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$17.class
index da2e873908d6ec2e6fd0194b5e7da425fe45aabe..ae88b4f6695fbafa61be3155040426a7f799a4c0 100644
GIT binary patch
delta 13
UcmdnPwufy)6ceMu<Y=ac03as>g8%>k

delta 13
UcmdnPwufy)6ceMt<Y=ac03de+lK=n!

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$18.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$18.class
index 9402410a7d6df3778d95d1219f47594c5eea4407..4b417faab6d1311e5fb49a2211a61675e7c661c6 100644
GIT binary patch
delta 13
UcmZ3<wvugwCljN>WG|-s03D(PIRF3v

delta 13
UcmZ3<wvugwCljN=WG|-s03GrKNdN!<

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$19.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$19.class
index c2bfa2d442a709be5f740848fb2420aa6878a00b..aa349663be818128dd149cdd14dad014785aad44 100644
GIT binary patch
delta 13
UcmZ3<wvugwCljN>WG|-s03D(PIRF3v

delta 13
UcmZ3<wvugwCljN=WG|-s03GrKNdN!<

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$2.class
index d294d3c25c5b5d7f6a304da88baa8875fd0aad3a..607d9b7a2a5c6e1d263d921f5e55b7d296ac5332 100644
GIT binary patch
delta 13
Ucmey*`k!@!JQJhBWCf=C03*%>j{pDw

delta 13
Ucmey*`k!@!JQJhAWCf=C03;p+p8x;=

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$20.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$20.class
index 390bd1b7929851546d119b0ddbe936e93ce31fab..f0201ad301117b60554228f5d254bc2b7d4e8ec6 100644
GIT binary patch
delta 14
VcmaFH^^9wS6APolW@i><MgS*K1Qq}Q

delta 14
VcmaFH^^9wS6APokW@i><MgS+V1SS9g

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$21.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$21.class
index 5977dc8d8e9a6d2f9b9c8d1ac3dc3673801300d5..83dfc4b56eb59f90e498f6c52bf20a0bd25e9e5e 100644
GIT binary patch
delta 14
Vcmey#^^<EuG7F=^<`foDMgS_%1aJTV

delta 14
Vcmey#^^<EuG7F=@<`foDMgS`?1b_el

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$22.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$22.class
index 46f194b653e65b2be7169bd7f61447732abfb8dc..997fde10d05a2622f3fdcf688326e2b15b21415b 100644
GIT binary patch
delta 13
UcmZ3<wvugwCljN>WG|-s03D(PIRF3v

delta 13
UcmZ3<wvugwCljN=WG|-s03GrKNdN!<

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$23.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$23.class
index 1b14a4118b571a16716bd2c1bc132d2d6e4b5958..4c3d30a1c7ad553aceb60a4d46ed522f5f7185bc 100644
GIT binary patch
delta 13
UcmZ3<wvugwCljN>WG|-s03D(PIRF3v

delta 13
UcmZ3<wvugwCljN=WG|-s03GrKNdN!<

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$24.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$24.class
index d38eff9a626b230b822d5e135752a5ac5786f9cb..b6531dae73e4548c0e76eb6946f40f340ba106eb 100644
GIT binary patch
delta 13
UcmZ3<wvugwCljN>WG|-s03D(PIRF3v

delta 13
UcmZ3<wvugwCljN=WG|-s03GrKNdN!<

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$25.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$25.class
index a812e147cd57417bf33c6bad0373879297e9cb76..782a3a38764158a86daebdf3f592568149cd5e37 100644
GIT binary patch
delta 13
UcmZ3<wvugwCljN>WG|-s03D(PIRF3v

delta 13
UcmZ3<wvugwCljN=WG|-s03GrKNdN!<

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$3.class
index 00817dab00b0a231ed108971d6dcea801e3b39e6..ccb4c5cdea755d64324e38a3f01a2acc98c0b447 100644
GIT binary patch
delta 13
Ucmey*`k!@!JQJhBWCf=C03*%>j{pDw

delta 13
Ucmey*`k!@!JQJhAWCf=C03;p+p8x;=

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$4.class
index a789799d2313b3683d300c255c111a3e81181b06..7bd4d416eac779cb017679ac58c6b4fe8004629b 100644
GIT binary patch
delta 13
Ucmey*`k!@!JQJhBWCf=C03*%>j{pDw

delta 13
Ucmey*`k!@!JQJhAWCf=C03;p+p8x;=

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$5.class
index 09dfcbb61cb4d70feb475ac14bab6c0b9d159685..8a1b9a090714b4a63d510984d1de8b5051e678c8 100644
GIT binary patch
delta 13
Ucmey*`k!@!JQJhBWCf=C03*%>j{pDw

delta 13
Ucmey*`k!@!JQJhAWCf=C03;p+p8x;=

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$6.class
index 634155f58af10e24e16bbc01750b57478c4a0bf4..f6f9ff87bbcd4c4eabaddc78c16fb31cae1fd5bd 100644
GIT binary patch
delta 13
UcmZ3+wv26q8xy0#WOt_f03A65EdT%j

delta 13
UcmZ3+wv26q8xy0!WOt_f03C@0Jpcdz

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$7.class
index 91e10b27c7a04dcf4b3b6b2ae510b7c08da207af..8ff1acc7f37fcf094f4a155d809f9aead29037b2 100644
GIT binary patch
delta 13
UcmdnVwv%l`I1{77<OrsR03W^tcK`qY

delta 13
UcmdnVwv%l`I1{76<OrsR03Z$ohX4Qo

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$8.class
index f1118b613f71554ffdb68a1c3b0eabd2e5e800b8..d1a4f5f1ced48f91206c5d17d635359baf1b4b23 100644
GIT binary patch
delta 13
UcmdnVwv%l`I1{77<OrsR03W^tcK`qY

delta 13
UcmdnVwv%l`I1{76<OrsR03Z$ohX4Qo

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$9.class
index 2c84fff5925e2c0d60c3df436afaf09e5dc7ad09..8d14fc4c97686d8e977e9eeff2fd3e182a8f4750 100644
GIT binary patch
delta 13
UcmZ3+wv26q8xy0#WOt_f03A65EdT%j

delta 13
UcmZ3+wv26q8xy0!WOt_f03C@0Jpcdz

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main.class
index 1ce24d1d49ce9b642f443d5b7279fb9b40a3c3ab..e53a62553b3c81df0d4cf6c13952a9c9a4712a3c 100644
GIT binary patch
delta 528
zcmZvYOD_Xa6vxk<b9Gv(%1o1@x*;W%FeT!#5uqeVB))-18$xE<vXWTv5uBY^TOkAs
z7PdknAwB~O@qWKKGek&i?*INze*bgMy|2e&_DJ}5-#51aASMGUC<4NC5DBkTUA9)c
z@l1d;su~*vXv1T@iR5TvV0_pz<7Qv~XkyR<0x!ML1TFz}72S4@UfO~R-cTT(RPco+
z;~OGtwZ6TlyfY382p*$F*YIQ;vZETFuH%XAmbt7z7oR>r0JRiUwG4b}1iHEA{ffaD
z6tNR{PAwyW=*7ZM$Yld+<u5qv3--Hl7O$w!)Wg>+e{q<0a0P&&TOzYY;vL@8j%i4I
z;84ucDc=f7d~}Rah);OWgPOTdgtz4+xT3}D_)HU4vBcN!%%Yun!*|-VswI9%m`NEZ
zBv37@!kSDOLHxIsl(duzp-ZZ?$FN&^oGtWp31&Ob(5NFF#vERAC>=vD>l|w?>prW`
lQJsRB63pX!LnapV|2qgTXetx(<lA2&3#3N#nM2g2@(Dhpef9tV

delta 790
zcmZutOHUJF6usZvOTVEODHLjfwkk%z4xz2D7>vP0SlI++p)qk&VK9X<(+A*^#6<tV
zw;*BTl7%j8loBy<VN6Vn8{^7_OC=$I_<q&uofeZuS)KEpd(Sy@XW@+~y%pYP<&{SO
z5T{NFnt-r+(G@QAZJn8uxFMirA~~Ck&P=D$(Q`RFW9Ft)X5NkKFr?#_faX~<mrvPN
zU#515A3XR`YZE|eJ2|G~X8{dYC&uj2zU_4m&>rjfO@N%SCN2A#C7@}0_P6G=nHS(s
z?9_i!fG?FFF~`&9=rp$vS;;GDbF3Z&{_;RSxC9*QNjQh7$-#g|pl%F~Yox1<!3U!G
z-r~@3_uM=nXnglT<UX!Fh2sx#{n9dSCX7f?d*#D-MeTJF-$x7|ek$UZC0ttsx>((H
zM|}8|73Xyq_y*_!Lp#NBXF0GFbO3n(q&x_XvI|188w_~}dZhtJWH0o~C?p^R;IH;W
z9@^Q~2toXgKR8a{PgR&`y<ED(ay8S%GRULs1MoN;>Z&%cjtf|3Wq`FV-gZuMMT{l<
zU0_z@hU*nK&%HVcRhT+Vq!FsssTdJqS#?-U>X-~$u@mGX{4cd*iR8bjw`)@C*}Uwe
zxM`O<Z~Ii)3KDs!q4J2^A>3WzF>Kt{=Iv0xyK_^MdTs~NM=jMPHn);rg)?#7!!;v}
z0si`%jBSi7jO~n@j2(=f**FFnFJ$9^(2fOIQn#|f`mpntXfN$kPqHs@KWTpegZQ}h

diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java
index 837333ddf0f..e49e1c57341 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java
@@ -3736,20 +3736,7 @@ public class HtmlDoclet
    protected String getDocletVersion()
    {
       if (null == docletVersion) {
-         try {
-            Properties versionProperties = new Properties();
-            InputStream in = getClass().getResourceAsStream("/version.properties");
-            if (in == null) {
-            	in = new FileInputStream("src/resources/version.properties");
-            }
-            versionProperties.load(in);
-            docletVersion = versionProperties.getProperty("gjdoc.version");
-         }
-         catch (IOException ignore) {
-         }
-         if (null == docletVersion) {
-            docletVersion = "unknown";
-         }
+         docletVersion = gnu.classpath.Configuration.CLASSPATH_VERSION;
       }
       return docletVersion;
    }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java
index d1316b34183..cbbc8f4f7dd 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java
@@ -1825,16 +1825,7 @@ public final class Main
   public String getGjdocVersion()
   {
     if (null == gjdocVersion) {
-      try {
-        Properties versionProperties = new Properties();
-        versionProperties.load(getClass().getResourceAsStream("version.properties"));
-        gjdocVersion = versionProperties.getProperty("gjdoc.version");
-      }
-      catch (IOException ignore) {
-      }
-      if (null == gjdocVersion) {
-        gjdocVersion = "unknown";
-      }
+      gjdocVersion = gnu.classpath.Configuration.CLASSPATH_VERSION;
     }
     return gjdocVersion;
   }