Skip to content
Permalink
Browse files

fix links

  • Loading branch information...
observerdev committed Jul 2, 2019
1 parent 66d81f8 commit 594aa72afcefc5f3b1c7107da986942947036fdb
@@ -21,7 +21,7 @@
# 50 minutes [2]. Thus, if we spent too much time in early build stages, fail
# with an error and save the cache.
#
# [0] https://travis-ci.org/obsr-project/obsr/caches
# [0] https://travis-ci.org/observernet/obsr/caches
# [1] https://docs.travis-ci.com/user/caching/#build-phases
# [2] https://docs.travis-ci.com/user/customizing-the-build#build-timeouts

@@ -84,7 +84,7 @@ Examples:
Trivial: Fix typo in init.cpp

Note that translations should not be submitted as pull requests, please see
[Translation Process](https://github.com/obsr-project/obsr/blob/master/doc/translation_process.md)
[Translation Process](https://github.com/observernet/obsr/blob/master/doc/translation_process.md)
for more information on helping with translations.

If a pull request is not to be considered for merging (yet), please
@@ -29,8 +29,8 @@ Build-Depends: debhelper,
dh-systemd
Standards-Version: 3.9.2
Homepage: http://www.obsr.org
Vcs-Git: git://github.com/OBSR-Project/OBSR.git
Vcs-Browser: http://github.com/OBSR-Project/OBSR
Vcs-Git: git://github.com/observernet/OBSR.git
Vcs-Browser: http://github.com/observernet/OBSR

Package: obsrd
Architecture: any
@@ -2,4 +2,4 @@
version=3
# use qa.debian.org redirector; see man uscan
opts=uversionmangle=s/(\d)(alpha|beta|rc)/$1~$2/,dversionmangle=s/~dfsg\d*// \
http://githubredir.debian.net/github/obsr-project/obsr v(.*).tar.gz
http://githubredir.debian.net/github/observernet/obsr v(.*).tar.gz
@@ -105,7 +105,7 @@ For example:
./github-merge.py 3077

(in any git repository) will help you merge pull request #3077 for the
OBSR-Project/OBSR repository.
observernet/OBSR repository.

What it does:
* Fetch master and the pull request.
@@ -125,7 +125,7 @@ Setup
---------
Configuring the github-merge tool for the OBSR repository is done in the following way:

git config githubmerge.repository OBSR-Project/OBSR
git config githubmerge.repository observernet/OBSR
git config githubmerge.testcmd "make -j4 check" (adapt to whatever you want to use for testing)
git config --global user.signingkey mykeyid

@@ -23,13 +23,13 @@ def setup():
programs += ['apt-cacher-ng', 'lxc', 'debootstrap']
subprocess.check_call(['sudo', 'apt-get', 'install', '-qq'] + programs)
if not os.path.isdir('gitian.sigs'):
subprocess.check_call(['git', 'clone', 'https://github.com/obsr-Project/gitian.sigs.git'])
subprocess.check_call(['git', 'clone', 'https://github.com/observernet/gitian.sigs.git'])
if not os.path.isdir('obsr-detached-sigs'):
subprocess.check_call(['git', 'clone', 'https://github.com/obsr-Project/obsr-detached-sigs.git'])
subprocess.check_call(['git', 'clone', 'https://github.com/observernet/obsr-detached-sigs.git'])
if not os.path.isdir('gitian-builder'):
subprocess.check_call(['git', 'clone', 'https://github.com/devrandom/gitian-builder.git'])
if not os.path.isdir('obsr'):
subprocess.check_call(['git', 'clone', 'https://github.com/obsr-Project/obsr.git'])
subprocess.check_call(['git', 'clone', 'https://github.com/observernet/obsr.git'])
os.chdir('gitian-builder')
make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64']
if args.docker:
@@ -156,7 +156,7 @@ def main():
parser = argparse.ArgumentParser(description='Script for running full Gitian builds.')
parser.add_argument('-c', '--commit', action='store_true', dest='commit', help='Indicate that the version argument is for a commit or branch')
parser.add_argument('-p', '--pull', action='store_true', dest='pull', help='Indicate that the version argument is the number of a github repository pull request')
parser.add_argument('-u', '--url', dest='url', default='https://github.com/obsr-Project/obsr', help='Specify the URL of the repository. Default is %(default)s')
parser.add_argument('-u', '--url', dest='url', default='https://github.com/observernet/obsr', help='Specify the URL of the repository. Default is %(default)s')
parser.add_argument('-v', '--verify', action='store_true', dest='verify', help='Verify the Gitian build')
parser.add_argument('-b', '--build', action='store_true', dest='build', help='Do a Gitian build')
parser.add_argument('-s', '--sign', action='store_true', dest='sign', help='Make signed binaries for Windows and MacOS')
@@ -33,7 +33,7 @@ packages:
- "ca-certificates"
- "python3"
remotes:
- "url": "https://github.com/obsr-project/obsr.git"
- "url": "https://github.com/observernet/obsr.git"
"dir": "obsr"
files: []
script: |
@@ -8,7 +8,7 @@ architectures:
packages:
- "faketime"
remotes:
- "url": "https://github.com/obsr-project/obsr-detached-sigs.git"
- "url": "https://github.com/observernet/obsr-detached-sigs.git"
"dir": "signature"
files:
- "obsr-osx-unsigned.tar.gz"
@@ -29,7 +29,7 @@ packages:
- "python3-setuptools"
- "fonts-tuffy"
remotes:
- "url": "https://github.com/obsr-project/obsr.git"
- "url": "https://github.com/observernet/obsr.git"
"dir": "obsr"
files:
- "MacOSX10.11.sdk.tar.gz"
@@ -10,7 +10,7 @@ packages:
- "libssl1.0-dev"
- "autoconf"
remotes:
- "url": "https://github.com/obsr-project/obsr-detached-sigs.git"
- "url": "https://github.com/observernet/obsr-detached-sigs.git"
"dir": "signature"
files:
- "osslsigncode-1.7.1.tar.gz"
@@ -24,7 +24,7 @@ packages:
- "python3"
- "rename"
remotes:
- "url": "https://github.com/obsr-project/obsr.git"
- "url": "https://github.com/observernet/obsr.git"
"dir": "obsr"
files: []
script: |
@@ -24,18 +24,18 @@ URL: https://obsr.org/
Source0: https://obsr.org/bin/obsr-core-%{version}/obsr-%{version}.tar.gz
Source1: http://download.oracle.com/berkeley-db/db-%{bdbv}.NC.tar.gz

Source10: https://raw.githubusercontent.com/obsr-project/obsr/v%{version}/contrib/debian/examples/obsr.conf
Source10: https://raw.githubusercontent.com/observernet/obsr/v%{version}/contrib/debian/examples/obsr.conf

#man pages
Source20: https://raw.githubusercontent.com/obsr-project/obsr/v%{version}/doc/man/obsrd.1
Source21: https://raw.githubusercontent.com/obsr-project/obsr/v%{version}/doc/man/obsr-cli.1
Source22: https://raw.githubusercontent.com/obsr-project/obsr/v%{version}/doc/man/obsr-qt.1
Source20: https://raw.githubusercontent.com/observernet/obsr/v%{version}/doc/man/obsrd.1
Source21: https://raw.githubusercontent.com/observernet/obsr/v%{version}/doc/man/obsr-cli.1
Source22: https://raw.githubusercontent.com/observernet/obsr/v%{version}/doc/man/obsr-qt.1

#selinux
Source30: https://raw.githubusercontent.com/obsr-project/obsr/v%{version}/contrib/rpm/obsr.te
Source30: https://raw.githubusercontent.com/observernet/obsr/v%{version}/contrib/rpm/obsr.te
# Source31 - what about obsr-tx and bench_obsr ???
Source31: https://raw.githubusercontent.com/obsr-project/obsr/v%{version}/contrib/rpm/obsr.fc
Source32: https://raw.githubusercontent.com/obsr-project/obsr/v%{version}/contrib/rpm/obsr.if
Source31: https://raw.githubusercontent.com/observernet/obsr/v%{version}/contrib/rpm/obsr.fc
Source32: https://raw.githubusercontent.com/observernet/obsr/v%{version}/contrib/rpm/obsr.if

Source100: https://upload.wikimedia.org/wikipedia/commons/4/46/Bitcoin.svg

@@ -26,7 +26,7 @@ Drag OBSR-Qt to your applications folder, and then run OBSR-Qt.

### Need Help?

* See the documentation at the [OBSR Wiki](https://github.com/OBSR-Project/OBSR/wiki)
* See the documentation at the [OBSR Wiki](https://github.com/observernet/OBSR/wiki)
for help and more information.
* Ask for help on [BitcoinTalk](https://bitcointalk.org/index.php?topic=1262920.0) or on the [OBSR Forum](http://forum.obsr.org/).
* Join our Discord server [Discord Server](https://discord.obsr.org)
@@ -43,7 +43,7 @@ Build OBSR Core

1. Clone the OBSR Core source code:

git clone https://github.com/obsr-project/obsr
git clone https://github.com/observernet/obsr
cd obsr

2. Make the Homebrew OpenSSL headers visible to the configure script (do ```brew info openssl``` to find out why this is necessary, or if you use Homebrew with installation folders different from the default).
@@ -73,7 +73,7 @@ If you want to build the windows installer with `make deploy` you need [NSIS](ht

Acquire the source in the usual way:

git clone https://github.com/obsr-project/obsr.git
git clone https://github.com/observernet/obsr.git
cd obsr

## Building for 64-bit Windows
@@ -15,19 +15,19 @@ These are the dependencies currently used by OBSR Core. You can find instruction
| GCC | | [4.8+](https://gcc.gnu.org/) (C++11 support) | | | |
| HarfBuzz-NG | | | | | |
| libevent | [2.1.8-stable](https://github.com/libevent/libevent/releases) | 2.0.22 | No | | |
| libjpeg | | | | | [Yes](https://github.com/obsr-project/obsr/blob/master/depends/packages/qt.mk#L65) |
| libpng | | | | | [Yes](https://github.com/obsr-project/obsr/blob/master/depends/packages/qt.mk#L64) |
| libjpeg | | | | | [Yes](https://github.com/observernet/obsr/blob/master/depends/packages/qt.mk#L65) |
| libpng | | | | | [Yes](https://github.com/observernet/obsr/blob/master/depends/packages/qt.mk#L64) |
| librsvg | | | | | |
| MiniUPnPc | [2.0.20180203](http://miniupnp.free.fr/files) | | No | | |
| OpenSSL | [1.0.1k](https://www.openssl.org/source) | | Yes | | |
| GMP | [6.1.2](https://gmplib.org/) | | No | | |
| PCRE | | | | | [Yes](https://github.com/obsr-project/obsr/blob/master/depends/packages/qt.mk#L66) |
| PCRE | | | | | [Yes](https://github.com/observernet/obsr/blob/master/depends/packages/qt.mk#L66) |
| protobuf | [2.6.1](https://github.com/google/protobuf/releases) | | No | | |
| Python (tests) | | [3.5](https://www.python.org/downloads) | | | |
| qrencode | [3.4.4](https://fukuchi.org/works/qrencode) | | No | | |
| Qt | [5.9.7](https://download.qt.io/official_releases/qt/) | [5.5.1](https://github.com/bitcoin/bitcoin/issues/13478) | No | | |
| XCB | | | | | [Yes](https://github.com/obsr-project/obsr/blob/master/depends/packages/qt.mk#L87) (Linux only) |
| xkbcommon | | | | | [Yes](https://github.com/obsr-project/obsr/blob/master/depends/packages/qt.mk#L86) (Linux only) |
| XCB | | | | | [Yes](https://github.com/observernet/obsr/blob/master/depends/packages/qt.mk#L87) (Linux only) |
| xkbcommon | | | | | [Yes](https://github.com/observernet/obsr/blob/master/depends/packages/qt.mk#L86) (Linux only) |
| ZeroMQ | [4.3.1](https://github.com/zeromq/libzmq/releases) | 4.0.0 | No | | |
| zlib | [1.2.11](https://zlib.net/) | | | | No |

@@ -234,7 +234,7 @@ debug.log file if inconsistencies are detected.
Valgrind is a programming tool for memory debugging, memory leak detection, and
profiling. The repo contains a Valgrind suppressions file
([`valgrind.supp`](https://github.com/obsr-project/obsr/blob/master/contrib/valgrind.supp))
([`valgrind.supp`](https://github.com/observernet/obsr/blob/master/contrib/valgrind.supp))
which includes known Valgrind warnings in our dependencies that cannot be fixed
in-tree. Example use:
@@ -797,7 +797,7 @@ Git and GitHub tips
[remote "upstream-pull"]
fetch = +refs/pull/*:refs/remotes/upstream-pull/*
url = git@github.com:OBSR-Project/OBSR.git
url = git@github.com:observernet/OBSR.git
This will add an `upstream-pull` remote to your git repository, which can be fetched using `git fetch --all`
or `git fetch upstream-pull`. Afterwards, you can use `upstream-pull/NUMBER/head` in arguments to `git show`,
@@ -1,10 +1,10 @@
(note: this is a temporary file, to be added-to by anybody, and moved to release-notes at release time)

OBSR Core version *version* is now available from: <https://github.com/obsr-project/obsr/releases>
OBSR Core version *version* is now available from: <https://github.com/observernet/obsr/releases>

This is a new major version release, including various bug fixes and performance improvements, as well as updated translations.

Please report bugs using the issue tracker at github: <https://github.com/obsr-project/obsr/issues>
Please report bugs using the issue tracker at github: <https://github.com/observernet/obsr/issues>


Mandatory Update
@@ -64,7 +64,7 @@ Notice text has been added to the privacy tab indicating that zOBSR minting is d

The `masternode` and `mnbudget` RPC commands, which were marked as deprecated in OBSR Core v2.3.1 (September 19, 2017), have now been completely removed from OBSR Core.

Several new commands were added in v2.3.1 to replace the two aforementioned commands, reference the [v2.3.1 Release Notes](https://github.com/OBSR-Project/OBSR/blob/master/doc/release-notes/release-notes-2.3.1.md#rpc-changes) for further details.
Several new commands were added in v2.3.1 to replace the two aforementioned commands, reference the [v2.3.1 Release Notes](https://github.com/observernet/OBSR/blob/master/doc/release-notes/release-notes-2.3.1.md#rpc-changes) for further details.

### New `getblockindexstats` Command

@@ -156,4 +156,4 @@ Detailed release notes follow. This overview includes changes that affect behavi
Thanks to everyone who directly contributed to this release:


As well as everyone that helped translating on [Transifex](https://www.transifex.com/projects/p/obsr-project-translations/), the QA team during Testing and the Node hosts supporting our Testnet.
As well as everyone that helped translating on [Transifex](https://www.transifex.com/projects/p/observernet-translations/), the QA team during Testing and the Node hosts supporting our Testnet.
@@ -99,7 +99,7 @@ Thanks to everyone who directly contributed to this release:
- ckti <ckti@3re.io>
- OBSERVER <43307485+observerdev@users.noreply.github.com>
- observerdev <dev@obsr.org>
- obsr-project <42689327+obsr-project@users.noreply.github.com>
- observernet <42689327+observernet@users.noreply.github.com>
- warrows <warrows@gamer666.fr>
- furszy <5377650+furszy@users.noreply.github.com>
- Fuzzbawls <fuzzbawls@gmail.com>
@@ -5,8 +5,8 @@ Release Process

### Before every release candidate

* Update translations (ping Fuzzbawls on Discord) see [translation_process.md](https://github.com/OBSR-Project/OBSR/blob/master/doc/translation_process.md#synchronising-translations).
* Update manpages, see [gen-manpages.sh](https://github.com/obsr-project/obsr/blob/master/contrib/devtools/README.md#gen-manpagessh).
* Update translations (ping Fuzzbawls on Discord) see [translation_process.md](https://github.com/observernet/OBSR/blob/master/doc/translation_process.md#synchronising-translations).
* Update manpages, see [gen-manpages.sh](https://github.com/observernet/obsr/blob/master/contrib/devtools/README.md#gen-manpagessh).

### Before every major and minor release

@@ -48,10 +48,10 @@ If you're using the automated script (found in [contrib/gitian-build.py](/contri
Check out the source code in the following directory hierarchy.

cd /path/to/your/toplevel/build
git clone https://github.com/obsr-project/gitian.sigs.git
git clone https://github.com/obsr-project/obsr-detached-sigs.git
git clone https://github.com/observernet/gitian.sigs.git
git clone https://github.com/observernet/obsr-detached-sigs.git
git clone https://github.com/devrandom/gitian-builder.git
git clone https://github.com/obsr-project/obsr.git
git clone https://github.com/observernet/obsr.git

### OBSR maintainers/release engineers, suggestion for writing release notes

@@ -210,7 +210,7 @@ Codesigner only: Commit the detached codesign payloads:
Non-codesigners: wait for Windows/macOS detached signatures:
- Once the Windows/macOS builds each have 3 matching signatures, they will be signed with their respective release keys.
- Detached signatures will then be committed to the [obsr-detached-sigs](https://github.com/obsr-Project/obsr-detached-sigs) repository, which can be combined with the unsigned apps to create signed binaries.
- Detached signatures will then be committed to the [obsr-detached-sigs](https://github.com/observernet/obsr-detached-sigs) repository, which can be combined with the unsigned apps to create signed binaries.
Create (and optionally verify) the signed macOS binary:
@@ -287,6 +287,6 @@ Note: check that SHA256SUMS itself doesn't end up in SHA256SUMS, which is a spur
- Archive release notes for the new version to `doc/release-notes/` (branch `master` and branch of the release)
- Create a [new GitHub release](https://github.com/OBSR-Project/OBSR/releases/new) with a link to the archived release notes.
- Create a [new GitHub release](https://github.com/observernet/OBSR/releases/new) with a link to the archived release notes.
- Celebrate
@@ -8,7 +8,7 @@ Transifex is setup to monitor the GitHub repo for updates, and when code contain

Multiple language support is critical in assisting OBSR's global adoption, and growth. One of OBSR's greatest strengths is cross-border money transfers, any help making that easier is greatly appreciated.

See the [Transifex OBSR project](https://www.transifex.com/obsr-project/obsr-project-translations/) to assist in translations.
See the [Transifex OBSR project](https://www.transifex.com/observer/obsr/) to assist in translations.

### Writing code with translations
We use automated scripts to help extract translations in both Qt, and non-Qt source files. It is rarely necessary to manually edit the files in `src/qt/locale/`. The translation source files must adhere to the following format:
@@ -43,7 +43,7 @@ git commit
### Creating a Transifex account
Visit the [Transifex Signup](https://www.transifex.com/signup/) page to create an account. Take note of your username and password, as they will be required to configure the command-line tool.

You can find the OBSR translation project at [https://www.transifex.com/obsr-project/obsr-project-translations/](https://www.transifex.com/obsr-project/obsr-project-translations/).
You can find the OBSR translation project at [https://www.transifex.com/observer/obsr/](https://www.transifex.com/observer/obsr/).

### Installing the Transifex client command-line tool
The client is used to fetch updated translations. If you are having problems, or need more details, see [https://docs.transifex.com/client/installing-the-client](https://docs.transifex.com/client/installing-the-client)
@@ -533,7 +533,7 @@
</property>
<property name="text">
<string>Language missing or translation incomplete? Help contributing translations here:
https://www.transifex.com/obsr-project/obsr-project-translations</string>
https://www.transifex.com/observer/obsr</string>
</property>
<property name="wordWrap">
<bool>true</bool>
@@ -1819,9 +1819,9 @@ Please be patient after clicking import.</source>
</message>
<message>
<source>Language missing or translation incomplete? Help contributing translations here:
https://www.transifex.com/obsr-project/obsr-project-translations</source>
https://www.transifex.com/observer/obsr</source>
<translation>Липсващ език или непълен превод? Помогнете с преводите тук:
https://www.transifex.com/obsr-project/obsr-project-translations</translation>
https://www.transifex.com/observer/obsr</translation>
</message>
<message>
<source>Map port using &amp;UPnP</source>
@@ -1837,9 +1837,9 @@ Vær tålmodig efter at du har klikket på import.</translation>
</message>
<message>
<source>Language missing or translation incomplete? Help contributing translations here:
https://www.transifex.com/obsr-project/obsr-project-translations</source>
https://www.transifex.com/observer/obsr</source>
<translation>Det valgte sprog mangler, eller oversættelsen er mangelfuld. Hjælp ved at bidrage med oversættelser her:
https://www.transifex.com/obsr-project/obsr-project-translations</translation>
https://www.transifex.com/observer/obsr</translation>
</message>
<message>
<source>Map port using &amp;UPnP</source>

0 comments on commit 594aa72

Please sign in to comment.
You can’t perform that action at this time.