summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--COPYING12
-rw-r--r--PKGBUILD24
-rw-r--r--README9
-rw-r--r--about.txt20
-rw-r--r--shortlicense.zlib2
-rw-r--r--strdupa.h27
6 files changed, 41 insertions, 53 deletions
diff --git a/COPYING b/COPYING
index 59a07f83..6d7afeca 100644
--- a/COPYING
+++ b/COPYING
@@ -1 +1,11 @@
-see COPYING.GPLv2 and COPYING.LGPLv2.1 files
+Copyright (C) 2009-2014 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 arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
diff --git a/PKGBUILD b/PKGBUILD
deleted file mode 100644
index d8ec9022..00000000
--- a/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Alexey Yakovenko <waker@users.sourceforge.net>
-
-pkgname=deadbeef
-pkgver=0.4.4
-pkgrel=1
-pkgdesc="mp3/ogg/flac/ape/sid/mod/nsf/m4a/mpc/shn music player based on GTK2"
-arch=(i686 x86_64)
-url="http://deadbeef.sourceforge.net"
-license=('GPL2')
-makedepends=('gtk2' 'libsamplerate' 'libvorbis' 'libmad' 'flac' 'curl' 'alsa-lib' 'wavpack' 'libsndfile' 'libcdio' 'libcddb' 'ffmpeg' 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig')
-depends=('gtk2' 'libsamplerate' 'alsa-lib')
-optdepends=('libvorbis: ogg vorbis playback', 'libmad: mp1/2/3 playback', 'flac: flac playback', 'curl: lastfm scrobbler, shoutcast, icecast, podcast support', 'wavpack: wv playback', 'libsndfile: wav playback', "libcdio: audio cd plugin", "libcddb: audio cd plugin", "ffmpeg: for wma, aa3, oma, ac3, etc", "libmms: required for MMS protocol support", "faad2: required for AAC/MP4 support", "dbus: required for OSD notifications support", "pulseaudio: required for PulseAudio output plugin", "libx11: required for global hotkeys plugin", )
-install=deadbeef.install
-source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('546e63d456d6a5625461019b15501e38')
-
-options=('!libtool')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr
- make || return 1
- make prefix=$pkgdir/usr install
-}
diff --git a/README b/README
index 165ef852..fee939a7 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
TABLE OF CONTENTS
1. compiling, dependencies, etc
-2. information for distributors
+2. licensing
==========================================================
@@ -51,10 +51,7 @@ most of them are optional, which means deadbeef will build and run without them,
actual package names for your Linux distribution may vary.
-==========================================================
-
-2. information for distributors
-The Deadbeef player code is licensed under GPLv2, but this is not a requirement for plugins.
-Plugins don't link directly to deadbeef code, but are using special API header file which uses ZLib license.
+2. licensing
+DeaDBeeF core uses ZLIB license. See COPYING in each subdirectory for details.
diff --git a/about.txt b/about.txt
index 8cb24913..4cfdbcf7 100644
--- a/about.txt
+++ b/about.txt
@@ -1,25 +1,7 @@
DeaDBeeF - ultimate music player for GNU/Linux systems with X11
-Copyright © 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>
+Copyright © 2009-2014 Alexey Yakovenko <waker@users.sourceforge.net>
http://deadbeef.sf.net
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-Note that other included libraries and plugins may have separate licensing terms.
-
-
Contributors:
Alexey A. Smirnov <alexey.smirnov@gmx.com>
diff --git a/shortlicense.zlib b/shortlicense.zlib
index 3ff2c8c8..62e5a16a 100644
--- a/shortlicense.zlib
+++ b/shortlicense.zlib
@@ -1,6 +1,6 @@
/*
DeaDBeeF -- the music player
- Copyright (C) 2009-2013 Alexey Yakovenko and other contributors
+ Copyright (C) 2009-2014 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
diff --git a/strdupa.h b/strdupa.h
index b158f4d1..d2c4a93b 100644
--- a/strdupa.h
+++ b/strdupa.h
@@ -1,5 +1,28 @@
-#ifndef __DDB_PLATFORM_H
-#define __DDB_PLATFORM_H
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2014 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef __DDB_STRDUPA_H
+#define __DDB_STRDUPA_H
#include <string.h>