copyright statements and about box; removed gpl2 template

FauxFaux · Jan 4, 2016 · ceaec07 · ceaec07
1 parent 3fab2c8
commit ceaec07
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 25 deletions.
diff --git a/about.txt b/about.txt
@@ -1,15 +1,21 @@
 DeaDBeeF - The Ultimate Music Player
-Copyright © 2009-2014 Alexey Yakovenko <[email protected]>
+Copyright © 2009-2016 Alexey Yakovenko and contributors
 http://deadbeef.sf.net
 
-Contributors:
+The contributors:
 
     Alexey A. Smirnov <[email protected]>
         Debian packaging, patches
 
     Anton Novikov <[email protected]>
         PulseAudio plugin
 
+    Christian Boxdörfer <[email protected]>
+        Lots of work on improving the GTK UI
+
+    Ian Nartowicz
+        Improved artwork, GTK UI, Converter, CDDA, various codecs, and more
+
     Sofias <[email protected]>
         Icon
 
@@ -25,10 +31,8 @@ Contributors:
     These people have also contributed significantly to the project by sending patches, testing, etc:
 
         Alex Dedul <[email protected]>
-        Christian Boxdörfer <[email protected]>
         David Bryant <[email protected]>
         Derreck <[email protected]>
-        Ian Nartowicz
         Igor Murzov <[email protected]>
         Igor Rudchenko <[email protected]>
         Jan D. Behrens <[email protected]>

diff --git a/main.c b/main.c
@@ -4,7 +4,7 @@
 
   application launcher, compatible with GNU/Linux and most other POSIX systems
 
-  Copyright (C) 2009-2013 Alexey Yakovenko
+  Copyright (C) 2009-2016 Alexey Yakovenko
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -970,7 +970,7 @@ main (int argc, char *argv[]) {
             return 0;
         }
         else if (!strcmp (argv[i], "--version")) {
-            fprintf (stderr, "DeaDBeeF " VERSION " Copyright © 2009-2013 Alexey Yakovenko\n");
+            fprintf (stderr, "DeaDBeeF " VERSION " Copyright © 2009-2016 Alexey Yakovenko\n");
             return 0;
         }
         else if (!strcmp (argv[i], "--gui")) {

diff --git a/shortlicense.gpl2 b/shortlicense.gpl2
diff --git a/shortlicense.zlib b/shortlicense.zlib
@@ -1,6 +1,6 @@
 /*
     DeaDBeeF -- the music player
-    Copyright (C) 2009-2015 Alexey Yakovenko and other contributors
+    Copyright (C) 2009-2016 Alexey Yakovenko and other contributors
 
     This software is provided 'as-is', without any express or implied
     warranty.  In no event will the authors be held liable for any damages