2019 log
Generated a new ssh key pair for berry, and set it
in github
Using it did:
icu> git pull upstream master
warning: no common commits
remote: Enumerating objects: 9, done.
remote: Counting objects: 100% (9/9), done.
remote: Compressing objects: 100% (8/8), done.
remote: Total 457883 (delta 2), reused 2 (delta 1), pack-reused 457874
Receiving objects: 100% (457883/457883), 216.76 MiB | 777.00 KiB/s, done.
Resolving deltas: 100% (364311/364311), done.
From github.com:unicode-org/icu
* branch master -> FETCH_HEAD
* [new branch] master -> upstream/master
fatal: refusing to merge unrelated histories
OK, so this was in fact local... So I rename it to localicu,
and clone my fork as icu.
git> git clone [email protected]:mgirod/icu.git
icu> git remote add upstream [email protected]:unicode-org/icu.git
icu> git pull upstream master
icu> git commit -m 'upstream merge'
I installed buster on a new micro SD card,
as the old SD card didn't boot anymore,
and I noticed there was a new release, buster,
with a recommendation to install from scratch instead of to upgrade.
I copied stuff from the old SD card,
mounted via an adapter to the tanya
laptop.
The uids were not preserved, so I have to fix on a case by case.
htdig doesn't build for now:
cc -o db_stat db_stat.o err.o getlong.o libdb.a
make[1]: Leaving directory '/home/marc/git/htdig/db/dist'
make[1]: Entering directory '/home/marc/git/htdig/htlib'
g++ -c -DDEFAULT_CONFIG_FILE=\"/opt/www/htdig/conf/htdig.conf\" -I../htlib -I../htcommon -I../db/dist -I../include -g -O2 Configuration.cc
In file included from Configuration.h:9,
from Configuration.cc:1:
ParsedString.h:5:10: fatal error: unicode/unistr.h: No such file or directory
#include <unicode/unistr.h>
^~~~~~~~~~~~~~~~~~
OK, it looks like I kept my git repos local...
Never pushed them to github...
At least, neither dev nor git/htdig.
dev> sudo apt install libunistring-dev
That's not the issue... I am in the icu branch.
There's another copy of the repo:
htdig> git branch
dbg
dev
* icu
master
...
hddev> git branch
dbg
* dev
master
OK: built (warnings) and installed (disabled htnotify) this version.
2018,
2021,
log,
Development,
berry
Marc Girod
Sun Sep 1 09:34:47 2019