merge
authorKrista Bennett <krista@pep-project.org>
Mon, 16 Apr 2018 15:27:50 +0200
changeset 260983d11374a328
parent 2608 c04e5c003995
parent 2607 13cc3e743198
child 2610 06915ad82a51
child 2611 5ca43900bc58
merge
     1.1 --- a/doc/build-debian.md	Mon Apr 16 15:26:43 2018 +0200
     1.2 +++ b/doc/build-debian.md	Mon Apr 16 15:27:50 2018 +0200
     1.3 @@ -9,13 +9,13 @@
     1.4  
     1.5  ~~~
     1.6  # general
     1.7 -apt install -y ca-cacert mercurial
     1.8 +apt install -y mercurial
     1.9  # YML2
    1.10  apt install -y python-lxml
    1.11  # libetpan
    1.12  apt install -y git build-essential automake libtool
    1.13  # asn1c
    1.14 -apt install -y git build-essential automake libtool
    1.15 +apt install -y git build-essential automake libtool autoconf
    1.16  # engine
    1.17  apt install -y uuid-dev libgpgme-dev libsqlite3-dev sqlite3
    1.18  ~~~
    1.19 @@ -25,7 +25,7 @@
    1.20  
    1.21  ~~~
    1.22  mkdir -p ~/code/yml2
    1.23 -hg clone https://cacert.pep.foundation/dev/repos/yml2/ ~/code/yml2
    1.24 +hg clone https://pep.foundation/dev/repos/yml2/ ~/code/yml2
    1.25  ~~~
    1.26  
    1.27  ## libetpan
    1.28 @@ -59,7 +59,7 @@
    1.29  
    1.30  ~~~
    1.31  mkdir -p ~/code/pep-engine
    1.32 -hg clone https://cacert.pep.foundation/dev/repos/pEpEngine/ ~/code/pep-engine
    1.33 +hg clone https://pep.foundation/dev/repos/pEpEngine/ ~/code/pep-engine
    1.34  cd ~/code/pep-engine
    1.35  mkdir ~/code/pep-engine/build
    1.36  ~~~
     2.1 --- a/doc/build-macos.md	Mon Apr 16 15:26:43 2018 +0200
     2.2 +++ b/doc/build-macos.md	Mon Apr 16 15:27:50 2018 +0200
     2.3 @@ -66,7 +66,7 @@
     2.4  
     2.5  ~~~
     2.6  mkdir -p ~/code/yml2
     2.7 -hg clone https://cacert.pep.foundation/dev/repos/yml2/ ~/code/yml2
     2.8 +hg clone https://pep.foundation/dev/repos/yml2/ ~/code/yml2
     2.9  ~~~
    2.10  
    2.11  ## libetpan
    2.12 @@ -100,7 +100,7 @@
    2.13  
    2.14  ~~~
    2.15  mkdir -p ~/code/pep-engine
    2.16 -hg clone https://cacert.pep.foundation/dev/repos/pEpEngine/ ~/code/pep-engine
    2.17 +hg clone https://pep.foundation/dev/repos/pEpEngine/ ~/code/pep-engine
    2.18  cd ~/code/pep-engine
    2.19  mkdir ~/code/pep-engine/build
    2.20  ~~~
     3.1 --- a/doc/build-netpgp.md	Mon Apr 16 15:26:43 2018 +0200
     3.2 +++ b/doc/build-netpgp.md	Mon Apr 16 15:27:50 2018 +0200
     3.3 @@ -23,7 +23,7 @@
     3.4  
     3.5  ```
     3.6  cd $SRC
     3.7 -hg clone https://cacert.pep.foundation/dev/repos/netpgp-et/
     3.8 +hg clone https://pep.foundation/dev/repos/netpgp-et/
     3.9  cd netpgp-et
    3.10  autoreconf -i
    3.11  ```
     4.1 --- a/doc/readme.md	Mon Apr 16 15:26:43 2018 +0200
     4.2 +++ b/doc/readme.md	Mon Apr 16 15:27:50 2018 +0200
     4.3 @@ -12,7 +12,7 @@
     4.4    - One of the following OpenPGP implementations:
     4.5      - GnuPG version 2.1.17 or later with GPGME (at least version 1.7.0) [https://gnupg.org/](https://gnupg.org/)
     4.6      - For platforms not supporting pinentry (e.g. Android) - GnuPG version 2.0.30 with GPGME version 1.6.0 (or later) [https://gnupg.org/](https://gnupg.org/)
     4.7 -    - a fork of NetPGP, [https://cacert.pep.foundation/dev/repos/netpgp-et/](https://cacert.pep.foundation/dev/repos/netpgp-et/)
     4.8 +    - a fork of NetPGP, [https://pep.foundation/dev/repos/netpgp-et/](https://pep.foundation/dev/repos/netpgp-et/)
     4.9    - a fork of libetpan, [https://github.com/fdik/libetpan](https://github.com/fdik/libetpan)
    4.10    - zlib, [http://zlib.net/](http://zlib.net/)
    4.11    - libcurl (Only with NetPGP), [https://curl.haxx.se/libcurl/](https://curl.haxx.se/libcurl/)