Mercurial > 510Connectbot
annotate TODO @ 350:72de889ecfe7
update jsocks to 2011-03-19
author | Carl Byington <carl@five-ten-sg.com> |
---|---|
date | Fri, 01 Aug 2014 11:26:27 -0700 |
parents | 205ee2873330 |
children | adab27dd4598 |
rev | line source |
---|---|
0 | 1 This project started with the base version of vxconnectbot: |
2 https://github.com/vx/connectbot | |
3 git clone https://github.com/vx/connectbot.git vxconnectbot | |
4 commit 5f70cc011cd131acb5cd29783fa6744059841aee | |
5 Merge: 429b47c 53e8530 | |
6 Author: Martin Matuška <martin@matuska.org> | |
7 Date: Wed Oct 30 00:21:40 2013 -0700 | |
8 | |
9 Changes from connectbot were merged: | |
10 https://github.com/connectbot/connectbot | |
11 git clone https://github.com/connectbot/connectbot.git connectbot | |
12 commit d64786d9197090c74072b648e487e3d34817bb57 | |
13 Author: Torne Wuff <torne@wolfpuppy.org.uk> | |
14 Date: Sun Mar 2 20:25:25 2014 +0000q | |
15 | |
16 Connectbot and VXConnectbot split at 598fb427f96712191cc264df14688d82db3dd664 | |
17 | |
18 # take jsocks and ssh2 from current connectbot | |
19 rm -rf src/net/sourceforge/jsocks | |
20 rm -rf src/com/trilead/ssh2 | |
21 cp -a ../connectbot/src/net/sourceforge/jsocks src/net/sourceforge | |
22 cp -a ../connectbot/src/com/trilead/ssh2 src/com/trilead | |
23 | |
24 # take all the connectbot patches since the split, except jsocks and ssh2 | |
25 (cd ../connectbot; git diff -w 598fb427f96712191cc264df14688d82db3dd664) | \ | |
26 sed -e 's;/org/connectbot/;/com/five_ten_sg/connectbot/;g' >patch.2014-04-19 | |
27 emacs patch.2014-04-19 | |
28 # remove all patches for trilead and jsocks | |
29 patch -p1 -l <patch.2014-04-19 >patch.log.2014-04-19 | |
30 | |
31 # reinstall all jsocks and ssh2 patches from vxconnectbot since the split | |
32 (cd ../vxconnectbot; git diff -w 598fb427f96712191cc264df14688d82db3dd664) | less | |
33 | |
42
7ac846a07ed4
start tn5250 integration
Carl Byington <carl@five-ten-sg.com>
parents:
3
diff
changeset
|
34 ================================== |
7ac846a07ed4
start tn5250 integration
Carl Byington <carl@five-ten-sg.com>
parents:
3
diff
changeset
|
35 |
7ac846a07ed4
start tn5250 integration
Carl Byington <carl@five-ten-sg.com>
parents:
3
diff
changeset
|
36 merge tn5250j |
7ac846a07ed4
start tn5250 integration
Carl Byington <carl@five-ten-sg.com>
parents:
3
diff
changeset
|
37 svn checkout svn://svn.code.sf.net/p/tn5250j/code/branches/new-tabs-jse1.6 tn5250j |
348
29076621bab0
merge tn5250j r1227; fix spelling
Carl Byington <carl@five-ten-sg.com>
parents:
273
diff
changeset
|
38 r1221 |
0 | 39 |
40 ================================== | |
273
91a31873c42a
start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
42
diff
changeset
|
41 |
91a31873c42a
start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
42
diff
changeset
|
42 update com.trilead.ssh2 to ganymed |
91a31873c42a
start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
42
diff
changeset
|
43 svn checkout http://ganymed-ssh-2.googlecode.com/svn/trunk/ ganymed-ssh-2-read-only |
91a31873c42a
start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
42
diff
changeset
|
44 rev 161 |
91a31873c42a
start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
42
diff
changeset
|
45 |
91a31873c42a
start conversion from trilead to ganymed
Carl Byington <carl@five-ten-sg.com>
parents:
42
diff
changeset
|
46 ================================== |
348
29076621bab0
merge tn5250j r1227; fix spelling
Carl Byington <carl@five-ten-sg.com>
parents:
273
diff
changeset
|
47 |
29076621bab0
merge tn5250j r1227; fix spelling
Carl Byington <carl@five-ten-sg.com>
parents:
273
diff
changeset
|
48 merge tn5250j updates |
29076621bab0
merge tn5250j r1227; fix spelling
Carl Byington <carl@five-ten-sg.com>
parents:
273
diff
changeset
|
49 svn checkout svn://svn.code.sf.net/p/tn5250j/code/branches/new-tabs-jse1.6 tn5250j |
29076621bab0
merge tn5250j r1227; fix spelling
Carl Byington <carl@five-ten-sg.com>
parents:
273
diff
changeset
|
50 r1227 |
29076621bab0
merge tn5250j r1227; fix spelling
Carl Byington <carl@five-ten-sg.com>
parents:
273
diff
changeset
|
51 |
29076621bab0
merge tn5250j r1227; fix spelling
Carl Byington <carl@five-ten-sg.com>
parents:
273
diff
changeset
|
52 ================================== |
29076621bab0
merge tn5250j r1227; fix spelling
Carl Byington <carl@five-ten-sg.com>
parents:
273
diff
changeset
|
53 |
349
205ee2873330
update jsocks to 2011-03-19
Carl Byington <carl@five-ten-sg.com>
parents:
348
diff
changeset
|
54 update jsocks to 2011-03-19 version |
205ee2873330
update jsocks to 2011-03-19
Carl Byington <carl@five-ten-sg.com>
parents:
348
diff
changeset
|
55 |
205ee2873330
update jsocks to 2011-03-19
Carl Byington <carl@five-ten-sg.com>
parents:
348
diff
changeset
|
56 ================================== |
205ee2873330
update jsocks to 2011-03-19
Carl Byington <carl@five-ten-sg.com>
parents:
348
diff
changeset
|
57 |
0 | 58 TODO: |
59 | |
349
205ee2873330
update jsocks to 2011-03-19
Carl Byington <carl@five-ten-sg.com>
parents:
348
diff
changeset
|
60 change all System.*.println -> android log.d() calls |
205ee2873330
update jsocks to 2011-03-19
Carl Byington <carl@five-ten-sg.com>
parents:
348
diff
changeset
|
61 |
42
7ac846a07ed4
start tn5250 integration
Carl Byington <carl@five-ten-sg.com>
parents:
3
diff
changeset
|
62 possible merge of irssi? |
7ac846a07ed4
start tn5250 integration
Carl Byington <carl@five-ten-sg.com>
parents:
3
diff
changeset
|
63 |
0 | 64 https://github.com/irssiconnectbot/irssiconnectbot |
65 1.7.1-395 - a year ago | |
66 | |
67 | |
68 | |
69 |