Permalink
Browse files

clarifying licensing

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@904 7f574dfc-610e-0410-a909-a81674777703
  • Loading branch information...
1 parent 772619e commit 27b4c8550cfae4fd0f2169962e33f4907a8e7d71 Brenden Matthews committed Aug 10, 2007
Showing with 1,209 additions and 83 deletions.
  1. +6 −3 AUTHORS
  2. +7 −24 COPYING
  3. +3 −0 ChangeLog
  4. +27 −0 LICENSE.BSD
  5. +674 −0 LICENSE.GPL
  6. +23 −3 src/bmpx.c
  7. +21 −1 src/common.c
  8. +21 −1 src/conky.c
  9. +21 −1 src/conky.h
  10. +23 −3 src/freebsd.c
  11. +21 −1 src/fs.c
  12. +28 −0 src/hddtemp.c
  13. +24 −3 src/linux.c
  14. +21 −1 src/mail.c
  15. +23 −13 src/mboxscan.c
  16. +25 −1 src/mboxscan.h
  17. +21 −1 src/mixer.c
  18. +23 −2 src/mpd.c
  19. +27 −1 src/netbsd.c
  20. +24 −2 src/openbsd.c
  21. +2 −0 src/prss.c
  22. +2 −0 src/prss.h
  23. +24 −4 src/rss.c
  24. +27 −0 src/solaris.c
  25. +22 −1 src/top.c
  26. +23 −11 src/top.h
  27. +21 −2 src/x11.c
  28. +25 −4 src/xmms2.c
View
@@ -90,9 +90,6 @@ Gwenhael LE MOINE <cycojesus at yahoo dot fr>
Hannu Saransaari <hipo at users dot sourceforge dot net>
Main code
-hifi <anon>
- OpenBSD support
-
Jason Mitchell <jason.mitchell03 at saintleo dot edu>
developer
UTF8 fix
@@ -198,6 +195,9 @@ Roman Bogorodskiy <novel at clublife dot ru>
Ryan Twitchell <tryan2 at rochester dot rr dot com>
head/tail rewrite patch
+Mikko Sysikaski <sisu at users dot sourceforge dot net>
+ prss.c and prss.h
+
Stepan Zastupov <redchrom at gmail dot com>
WiFi signal level detection support on FreeBSD
@@ -210,6 +210,9 @@ Thomas Cort
Toni <bleach at users dot sourceforge dot net>
exec*/tail/head output evalution
+Toni Spets hifi <at users dot sourceforge dot net>
+ OpenBSD support
+
tyir <tyir at users dot sourceforge dot net>
MPD features patch 1319461
View
@@ -1,26 +1,9 @@
-Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+Any original torsmo code is licensed under the BSD license (see LICENSE.BSD
+for a copy)
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the <ORGANIZATION> nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
+All code written since the fork of torsmo is licensed under the GPL (see
+LICENSE.GPL for a copy)
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
+Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
+All rights reserved.
View
@@ -1,5 +1,8 @@
# $Id$
+2007-08-10
+ * Clarifying licensing
+
2007-08-08
* RSS support
* Wireless support for Linux
View
@@ -0,0 +1,27 @@
+Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
+Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the <ORGANIZATION> nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
Oops, something went wrong.

0 comments on commit 27b4c85

Please sign in to comment.