demo: Rearrange driver and device options.

[libsigrok.git] / README

diff --git a/README b/README
index 4caeb65b86318e7e9c53df509e57e76abd9603da..d0d8f1a8b52b0cb434a0c8b80778820b98963776 100644 (file)
--- a/README
+++ b/README
@@ -34,12 +34,12 @@ Requirements
  - automake >= 1.11
  - libtool
  - pkg-config >= 0.22
- - libglib >= 2.28.0
- - libzip >= 0.8
- - libusb-1.0 >= 1.0.9 (optional, used by most drivers)
- - libftdi >= 0.16 (optional, used by some drivers)
- - libudev >= 151 (optional, used by some drivers)
- - libasound / alsa-lib >= 1.0 (optional, only used by the alsa driver)
+ - libglib >= 2.34.0
+ - libzip >= 0.10
+ - libserialport >= 0.1.0 (optional, used by some drivers)
+ - librevisa >= 0.0.20130812 (optional, used by some drivers)
+ - libusb-1.0 >= 1.0.16 (optional, used by some drivers)
+ - libftdi >= 0.16 or libftdi1 >= 1.0 (optional, used by some drivers)
  - check >= 0.9.4 (optional, only needed to run unit tests)
 
 
@@ -58,12 +58,9 @@ For installing libsigrok:
 
  $ 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
 
 
 Device-specific issues
@@ -80,13 +77,23 @@ Some devices supported by libsigrok need a firmware to be uploaded before the
 device can be used. See README.devices for details.
 
 
-Mailing lists
--------------
+Copyright and license
+---------------------
 
-There are two mailing lists for sigrok/libsigrok:
+libsigrok is licensed under the terms of the GNU General Public License
+(GPL), version 3 or later.
+
+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 list
+------------
 
  https://lists.sourceforge.net/lists/listinfo/sigrok-devel
- https://lists.sourceforge.net/lists/listinfo/sigrok-commits
 
 
 IRC