X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=README;h=5e807aba3c1d2f96da8a68fc99a2a2e795e71714;hp=820fccc5077a5c208f65723e110714ef6305f025;hb=c1f86f02a149f46609273e1bd5b42696d544727a;hpb=d3b034e68fe544f823d66ead4c1561a33c9f135d

diff --git a/README b/README
index 820fccc..5e807ab 100644
--- a/README
+++ b/README
@@ -34,7 +34,7 @@ Requirements
  - automake >= 1.11
  - libtool
  - pkg-config >= 0.22
- - libglib >= 2.28.0
+ - libglib >= 2.24.0
  - Python >= 3.0
 
 
@@ -43,8 +43,8 @@ Building and installing
 
 In order to get the libsigrokdecode source code and build it, run:
 
- $ git clone git://sigrok.git.sourceforge.net/gitroot/sigrok/sigrok
- $ cd sigrok/libsigrokdecode
+ $ git clone git://sigrok.org/libsigrokdecode
+ $ cd libsigrokdecode
  $ ./autogen.sh
  $ ./configure
  $ make
@@ -53,12 +53,30 @@ For installing libsigrokdecode:
 
  $ make install
 
-Please see the following wiki pages for more detailed instructions:
+See INSTALL or the following wiki page for more (OS-specific) instructions:
 
- http://sigrok.org/wiki/Linux
- http://sigrok.org/wiki/Mac_OS_X
- http://sigrok.org/wiki/Windows
- http://sigrok.org/wiki/FreeBSD
+ http://sigrok.org/wiki/Building
+
+
+Copyright and license
+---------------------
+
+libsigrokdecode is licensed under the terms of the GNU General Public License
+(GPL), version 3 or later.
+
+The protocol decoders (PDs) included in libsigrokdecode are an integral part
+of the shared library (they are not merely external "plugins", they are not
+external programs that libsigrokdecode calls via fork/exec, they cannot
+function standalone without libsigrokdecode at all, the PDs and the rest of
+the libsigrokdecode codebase share data structures and make function calls
+to each other). Thus, since the PDs are part of the library, they are also
+licensed under the terms of the GPLv3+.
+
+While some individual source code files are licensed under the GPLv2+, and
+some files are licensed under the GPLv3+, this doesn't change the fact that
+the library as a whole is licensed under the terms of the GPLv3+.
+
+Please see the individual source files for the full list of copyright holders.
 
 
 Mailing lists