355
|
1 Done:
|
|
2
|
0
|
3 This project started with the base version of vxconnectbot:
|
|
4 https://github.com/vx/connectbot
|
|
5 git clone https://github.com/vx/connectbot.git vxconnectbot
|
|
6 commit 5f70cc011cd131acb5cd29783fa6744059841aee
|
|
7 Merge: 429b47c 53e8530
|
|
8 Author: Martin Matuška <martin@matuska.org>
|
|
9 Date: Wed Oct 30 00:21:40 2013 -0700
|
|
10
|
|
11 Changes from connectbot were merged:
|
|
12 https://github.com/connectbot/connectbot
|
|
13 git clone https://github.com/connectbot/connectbot.git connectbot
|
|
14 commit d64786d9197090c74072b648e487e3d34817bb57
|
|
15 Author: Torne Wuff <torne@wolfpuppy.org.uk>
|
|
16 Date: Sun Mar 2 20:25:25 2014 +0000q
|
|
17
|
|
18 Connectbot and VXConnectbot split at 598fb427f96712191cc264df14688d82db3dd664
|
|
19
|
|
20 # take jsocks and ssh2 from current connectbot
|
|
21 rm -rf src/net/sourceforge/jsocks
|
|
22 rm -rf src/com/trilead/ssh2
|
|
23 cp -a ../connectbot/src/net/sourceforge/jsocks src/net/sourceforge
|
|
24 cp -a ../connectbot/src/com/trilead/ssh2 src/com/trilead
|
|
25
|
|
26 # take all the connectbot patches since the split, except jsocks and ssh2
|
|
27 (cd ../connectbot; git diff -w 598fb427f96712191cc264df14688d82db3dd664) | \
|
|
28 sed -e 's;/org/connectbot/;/com/five_ten_sg/connectbot/;g' >patch.2014-04-19
|
|
29 emacs patch.2014-04-19
|
|
30 # remove all patches for trilead and jsocks
|
|
31 patch -p1 -l <patch.2014-04-19 >patch.log.2014-04-19
|
|
32
|
355
|
33 # reinstalled all jsocks and ssh2 patches from vxconnectbot since the split
|
0
|
34 (cd ../vxconnectbot; git diff -w 598fb427f96712191cc264df14688d82db3dd664) | less
|
|
35
|
42
|
36 ==================================
|
|
37
|
355
|
38 merged tn5250j
|
42
|
39 svn checkout svn://svn.code.sf.net/p/tn5250j/code/branches/new-tabs-jse1.6 tn5250j
|
348
|
40 r1221
|
0
|
41
|
|
42 ==================================
|
273
|
43
|
355
|
44 updated com.trilead.ssh2 to ganymed
|
273
|
45 svn checkout http://ganymed-ssh-2.googlecode.com/svn/trunk/ ganymed-ssh-2-read-only
|
|
46 rev 161
|
|
47
|
|
48 ==================================
|
348
|
49
|
355
|
50 merged tn5250j updates
|
348
|
51 svn checkout svn://svn.code.sf.net/p/tn5250j/code/branches/new-tabs-jse1.6 tn5250j
|
|
52 r1227
|
|
53
|
|
54 ==================================
|
|
55
|
355
|
56 updated jsocks to 2011-03-19 version
|
357
|
57 updated jzlib to a21be20213d66eff15904d925e9b721956a01ef7
|
|
58
|
|
59 git clone https://github.com/ymnk/jzlib.git jzlib
|
|
60 commit a21be20213d66eff15904d925e9b721956a01ef7
|
|
61 Merge: 9d0fcb9 3e3dae9
|
|
62 Author: Atsuhiko Yamanaka <atsuhiko.yamanaka@gmail.com>
|
|
63 Date: Tue Nov 19 19:03:18 2013 -0800
|
349
|
64
|
|
65 ==================================
|
|
66
|
388
|
67 git clone https://github.com/irssiconnectbot/irssiconnectbot.git irssiconnectbot
|
|
68 commit 1e0f702be47ad27b85e67722f177e3c129e91196
|
|
69 Merge: d3553dd 6420dd5
|
|
70 Author: Iiro Uusitalo <iiro.uusitalo@solita.fi>
|
|
71 Date: Sun Jan 6 21:07:06 2013 -0800
|
|
72
|
|
73 Nothing critical there, so I will ignore that fork for now.
|
|
74
|
|
75 ==================================
|
|
76
|
0
|
77 TODO:
|
349
|
78 change all System.*.println -> android log.d() calls
|
|
79
|