X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=README;h=690dd8020bb1765b57c3bcf40ebd6098ee039df6;hp=dee7cdc04ac6aa202312fc6e4443ec5a2b5e0d74;hb=ed1d9d81f46c6595bea7278aa5dc9c1213c81609;hpb=7a68af04fad429d32794c21149ed0bc38d0a934c

diff --git a/README b/README
index dee7cdc0..690dd802 100644
--- a/README
+++ b/README
@@ -6,65 +6,51 @@ The sigrok project aims at creating a portable, cross-platform,
 Free/Libre/Open-Source signal analysis software suite that supports various
 device types (such as logic analyzers, oscilloscopes, multimeters, and more).
 
-PulseView is a Qt-based GUI for sigrok.
+PulseView is a Qt-based LA/scope/MSO GUI for sigrok.
 
 
 Status
 ------
 
-PulseView is currently work in progress. Some basic functionality
-is there, but it should still be considered alpha/beta stage software.
+PulseView is in a usable state and has had official tarball releases.
 
-There have been no official tarball releases, yet.
+However, it is still work in progress. Some basic functionality
+is available and working, but other things are still on the TODO list.
 
-Distro packagers should NOT package this, yet.
 
+Copyright and license
+---------------------
 
-Requirements
-------------
-
- - git
- - g++
- - make
- - libtool
- - pkg-config >= 0.22
- - cmake >= 2.6
- - libglib >= 2.28.0
- - Qt >= 4.5
- - libboost >= 1.46
- - libsigrok >= 0.2.0
- - libsigrokdecode >= 0.1.0
+PulseView 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 program as a whole is licensed under the terms of the GPLv3+ (e.g. also
+due to the fact that it links against GPLv3+ libraries).
 
-Building and installing
------------------------
+Please see the individual source files for the full list of copyright holders.
 
-In order to get the PulseView source code and build it, run:
 
- $ git clone git://sigrok.org/pulseview
- $ cd pulseview
- $ cmake .
- $ make
+Copyright notices
+-----------------
 
-For installing PulseView:
+A copyright notice indicating a range of years, must be interpreted as having
+had copyrightable material added in each of those years.
 
- $ make install
+Example:
 
-Please see the following wiki pages for more detailed instructions:
+ Copyright (C) 2010-2013 Contributor Name
 
- http://sigrok.org/wiki/Linux
- http://sigrok.org/wiki/Mac_OS_X
- http://sigrok.org/wiki/Windows
- http://sigrok.org/wiki/FreeBSD
+is to be interpreted as
 
+ Copyright (C) 2010,2011,2012,2013 Contributor Name
 
-Mailing lists
--------------
 
-There are two mailing lists for sigrok/PulseView:
+Mailing list
+------------
 
  https://lists.sourceforge.net/lists/listinfo/sigrok-devel
- https://lists.sourceforge.net/lists/listinfo/sigrok-commits
 
 
 IRC