summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--callbacks.c2
-rw-r--r--callbacks.h2
-rw-r--r--cdumb.c2
-rw-r--r--cdumb.h2
-rw-r--r--cflac.c2
-rw-r--r--cflac.h2
-rw-r--r--cgme.c2
-rw-r--r--cgme.h2
-rw-r--r--cmod.c2
-rw-r--r--cmod.h2
-rw-r--r--cmp3.c2
-rw-r--r--cmp3.h2
-rw-r--r--codec.c2
-rw-r--r--codec.h2
-rw-r--r--common.h2
-rw-r--r--conf.c2
-rw-r--r--conf.h2
-rw-r--r--csid.cpp2
-rw-r--r--csid.h2
-rw-r--r--cvorbis.c2
-rw-r--r--cvorbis.h2
-rw-r--r--cwav.c2
-rw-r--r--cwav.h2
-rw-r--r--gtkplaylist.c2
-rw-r--r--gtkplaylist.h2
-rwxr-xr-xinsertlicense.sh7
-rw-r--r--main.c2
-rw-r--r--messagepump.c2
-rw-r--r--messagepump.h2
-rw-r--r--messages.h2
-rw-r--r--palsa.c2
-rw-r--r--palsa.h2
-rw-r--r--playback.h2
-rw-r--r--playlist.c2
-rw-r--r--playlist.h2
-rw-r--r--progress.c2
-rw-r--r--progress.h2
-rw-r--r--psdl.c2
-rw-r--r--psdl.h2
-rw-r--r--search.c2
-rw-r--r--search.h2
-rw-r--r--streamer.c2
-rw-r--r--streamer.h2
-rw-r--r--threading.c2
-rw-r--r--threading.h2
-rw-r--r--threading_pthread.c2
46 files changed, 51 insertions, 46 deletions
diff --git a/callbacks.c b/callbacks.c
index 4922e335..92158dc1 100644
--- a/callbacks.c
+++ b/callbacks.c
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/callbacks.h b/callbacks.h
index 3a5a2fca..9fb48534 100644
--- a/callbacks.h
+++ b/callbacks.h
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/cdumb.c b/cdumb.c
index 5494480c..ab759fb9 100644
--- a/cdumb.c
+++ b/cdumb.c
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/cdumb.h b/cdumb.h
index 588c64ca..c3cc04b8 100644
--- a/cdumb.h
+++ b/cdumb.h
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/cflac.c b/cflac.c
index f8483486..a83e4a38 100644
--- a/cflac.c
+++ b/cflac.c
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/cflac.h b/cflac.h
index b0dcd979..9c0dae9c 100644
--- a/cflac.h
+++ b/cflac.h
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/cgme.c b/cgme.c
index b6dd227b..5f053165 100644
--- a/cgme.c
+++ b/cgme.c
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/cgme.h b/cgme.h
index 6ccecc1a..2d29186e 100644
--- a/cgme.h
+++ b/cgme.h
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/cmod.c b/cmod.c
index 90d4ec33..29e29829 100644
--- a/cmod.c
+++ b/cmod.c
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/cmod.h b/cmod.h
index e2e41a15..f8b2cd82 100644
--- a/cmod.h
+++ b/cmod.h
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/cmp3.c b/cmp3.c
index 6b0a8533..d6e67dbc 100644
--- a/cmp3.c
+++ b/cmp3.c
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/cmp3.h b/cmp3.h
index a3c02b2e..5cdf1795 100644
--- a/cmp3.h
+++ b/cmp3.h
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/codec.c b/codec.c
index bda7d372..444af05d 100644
--- a/codec.c
+++ b/codec.c
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/codec.h b/codec.h
index e8bce310..82d95491 100644
--- a/codec.h
+++ b/codec.h
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/common.h b/common.h
index 46ed43b1..8ac08d46 100644
--- a/common.h
+++ b/common.h
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/conf.c b/conf.c
index e94e40b0..c2d036b0 100644
--- a/conf.c
+++ b/conf.c
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/conf.h b/conf.h
index 876fcb29..e9a21f5b 100644
--- a/conf.h
+++ b/conf.h
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/csid.cpp b/csid.cpp
index d50dbbd9..5540b935 100644
--- a/csid.cpp
+++ b/csid.cpp
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/csid.h b/csid.h
index 6702666f..ab64533c 100644
--- a/csid.h
+++ b/csid.h
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/cvorbis.c b/cvorbis.c
index 94e42610..4c225267 100644
--- a/cvorbis.c
+++ b/cvorbis.c
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/cvorbis.h b/cvorbis.h
index 4034c9a3..f70bd18a 100644
--- a/cvorbis.h
+++ b/cvorbis.h
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/cwav.c b/cwav.c
index 15064c8d..59f3788d 100644
--- a/cwav.c
+++ b/cwav.c
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/cwav.h b/cwav.h
index 41a3f305..fdcc03ef 100644
--- a/cwav.h
+++ b/cwav.h
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/gtkplaylist.c b/gtkplaylist.c
index e485180e..2524c495 100644
--- a/gtkplaylist.c
+++ b/gtkplaylist.c
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/gtkplaylist.h b/gtkplaylist.h
index 6aced5a8..28b07038 100644
--- a/gtkplaylist.h
+++ b/gtkplaylist.h
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/insertlicense.sh b/insertlicense.sh
index 6c5cdc32..53400b91 100755
--- a/insertlicense.sh
+++ b/insertlicense.sh
@@ -3,7 +3,12 @@ echo "IMPORTANT: Hit C-c if you forgot to backup/commit stuff!!!"
read
ls *.c *.h *.cpp | while read i; do
if grep --silent "DO NOT EDIT" "$i" || grep --silent "DeaDBeeF - ultimate music player for GNU/Linux systems with X11" "$i" ; then
- echo "skipping file $i"
+ if grep --silent "version 3 of the License" "$i" ; then
+ echo "changing $i to gpl2"
+ sed -i 's/version 3 of the License/version 2 of the License/' "$i"
+ else
+ echo "skipping file $i"
+ fi
else
echo "adding license text to $i"
cat shortlicense >/tmp/deadbeef.lic.tmp
diff --git a/main.c b/main.c
index 8e276430..c759b77a 100644
--- a/main.c
+++ b/main.c
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/messagepump.c b/messagepump.c
index a8578d5c..c3411871 100644
--- a/messagepump.c
+++ b/messagepump.c
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/messagepump.h b/messagepump.h
index ec60fe49..a6adcf61 100644
--- a/messagepump.h
+++ b/messagepump.h
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/messages.h b/messages.h
index 673d9c69..2746bc98 100644
--- a/messages.h
+++ b/messages.h
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/palsa.c b/palsa.c
index 0457bbb7..1ebc81fd 100644
--- a/palsa.c
+++ b/palsa.c
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/palsa.h b/palsa.h
index a226979e..61a9af2d 100644
--- a/palsa.h
+++ b/palsa.h
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/playback.h b/playback.h
index dbeba5cf..c14c6de0 100644
--- a/playback.h
+++ b/playback.h
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/playlist.c b/playlist.c
index 90738ea9..21dc0c71 100644
--- a/playlist.c
+++ b/playlist.c
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/playlist.h b/playlist.h
index 121e187e..b207aa91 100644
--- a/playlist.h
+++ b/playlist.h
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/progress.c b/progress.c
index d7c34bb3..6a6bd4bb 100644
--- a/progress.c
+++ b/progress.c
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/progress.h b/progress.h
index 9a3f85b4..e4de0e8e 100644
--- a/progress.h
+++ b/progress.h
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/psdl.c b/psdl.c
index 2ccef9d1..ada43647 100644
--- a/psdl.c
+++ b/psdl.c
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/psdl.h b/psdl.h
index aa21be07..ab4a10b6 100644
--- a/psdl.h
+++ b/psdl.h
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/search.c b/search.c
index 848bd91c..1e866d5b 100644
--- a/search.c
+++ b/search.c
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/search.h b/search.h
index c1148560..32d45e07 100644
--- a/search.h
+++ b/search.h
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/streamer.c b/streamer.c
index 65a9f006..7a996ffe 100644
--- a/streamer.c
+++ b/streamer.c
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/streamer.h b/streamer.h
index 34e5fb02..7c0a987a 100644
--- a/streamer.h
+++ b/streamer.h
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/threading.c b/threading.c
index ef30792f..f6942fea 100644
--- a/threading.c
+++ b/threading.c
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/threading.h b/threading.h
index 32f74c3b..824432c1 100644
--- a/threading.h
+++ b/threading.h
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,
diff --git a/threading_pthread.c b/threading_pthread.c
index 5a2a343d..ae8bf258 100644
--- a/threading_pthread.c
+++ b/threading_pthread.c
@@ -4,7 +4,7 @@
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 3 of the License, or
+ 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,