X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=README;h=8608b3bf7314024ff15b5c0f0e13eca510bde5b9;hp=dee7cdc04ac6aa202312fc6e4443ec5a2b5e0d74;hb=f4ab4b5c657e5613caba82feaa81a8a400e4f331;hpb=7a68af04fad429d32794c21149ed0bc38d0a934c

diff --git a/README b/README
index dee7cdc..8608b3b 100644
--- a/README
+++ b/README
@@ -6,65 +6,70 @@ 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.
 
-Distro packagers should NOT package this, yet.
+Copyright and license
+---------------------
 
+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).
+
+Please see the individual source files for the full list of copyright holders.
 
-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
+Copyright notices
+-----------------
 
+A copyright notice indicating a range of years, must be interpreted as having
+had copyrightable material added in each of those years.
 
-Building and installing
------------------------
+Example:
 
-In order to get the PulseView source code and build it, run:
+ Copyright (C) 2010-2013 Contributor Name
 
- $ git clone git://sigrok.org/pulseview
- $ cd pulseview
- $ cmake .
- $ make
+is to be interpreted as
 
-For installing PulseView:
+ Copyright (C) 2010,2011,2012,2013 Contributor Name
 
- $ make install
 
-Please see the following wiki pages for more detailed instructions:
+Resource authors and licenses
+-----------------------------
 
- http://sigrok.org/wiki/Linux
- http://sigrok.org/wiki/Mac_OS_X
- http://sigrok.org/wiki/Windows
- http://sigrok.org/wiki/FreeBSD
+icons/information.svg: Bobarino
+  https://en.wikipedia.org/wiki/File:Information.svg
+  License:
+    GFDL 1.2 or later / CC-BY-SA 3.0
+    https://en.wikipedia.org/wiki/File:Information.svg#Licensing
 
+QDarkStyleSheet: Colin Duquesnoy
+  https://github.com/ColinDuquesnoy/QDarkStyleSheet
+  License:
+    CC-BY 4.0
+    https://github.com/ColinDuquesnoy/QDarkStyleSheet/blob/master/LICENSE.md
 
-Mailing lists
--------------
+DarkStyle: Juergen Skrotzky
+  https://github.com/Jorgen-VikingGod/Qt-Frameless-Window-DarkStyle
+  License:
+    MIT license
+    https://github.com/Jorgen-VikingGod/Qt-Frameless-Window-DarkStyle#licence
 
-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