summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-08-05 19:47:27 +0200
committerLennart Poettering <lennart@poettering.net>2008-08-05 19:47:27 +0200
commit6a1dcb24d89b6cf7b74f5604bb474af54abfb8c5 (patch)
tree8c52a6637ee0fb55a1af8f5347de38ef4042e4e3
parent126a5550a8fa2a5e6ffa363ba7d90e868d0aede5 (diff)
revert accidental license change from GPL to LGPL
-rw-r--r--Makefile.am13
-rwxr-xr-xbootstrap.sh13
-rw-r--r--configure.ac13
-rw-r--r--doc/Makefile.am13
-rw-r--r--doc/README.html.in6
-rw-r--r--doc/style.css17
-rw-r--r--src/Makefile.am13
-rw-r--r--src/paprefs.cc15
8 files changed, 48 insertions, 55 deletions
diff --git a/Makefile.am b/Makefile.am
index 952d025..9e17dcb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,18 +3,17 @@
# Copyright 2006-2008 Lennart Poettering
#
# paprefs is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 2.1 of the
-# License, or (at your option) any later version.
+# 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.
#
# paprefs 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
-# Lesser General Public License for more details.
+# General Public License for more details.
#
-# You should have received a copy of the GNU Lesser General Public
-# License along with paprefs. If not, see
-# <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU General Public License
+# along with paprefs. If not, see <http://www.gnu.org/licenses/>.
EXTRA_DIST= config.rpath m4/ChangeLog \
bootstrap.sh \
diff --git a/bootstrap.sh b/bootstrap.sh
index 4db492d..9dbf868 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -5,18 +5,17 @@
# Copyright 2006-2008 Lennart Poettering
#
# paprefs is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 2.1 of the
-# License, or (at your option) any later version.
+# 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.
#
# paprefs 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
-# Lesser General Public License for more details.
+# General Public License for more details.
#
-# You should have received a copy of the GNU Lesser General Public
-# License along with paprefs. If not, see
-# <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU General Public License
+# along with paprefs. If not, see <http://www.gnu.org/licenses/>.
VERSION=1.9
diff --git a/configure.ac b/configure.ac
index 44eab7d..106ab33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,18 +6,17 @@
# Copyright 2006-2008 Lennart Poettering
#
# paprefs is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 2.1 of the
-# License, or (at your option) any later version.
+# 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.
#
# paprefs 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
-# Lesser General Public License for more details.
+# General Public License for more details.
#
-# You should have received a copy of the GNU Lesser General Public
-# License along with paprefs. If not, see
-# <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU General Public License
+# along with paprefs. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.57)
AC_INIT([paprefs],[0.9.6],[mzcncersf (at) 0pointer (dot) de])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index be94429..e38d737 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,18 +3,17 @@
# Copyright 2006-2008 Lennart Poettering
#
# paprefs is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 2.1 of the
-# License, or (at your option) any later version.
+# 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.
#
# paprefs 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
-# Lesser General Public License for more details.
+# General Public License for more details.
#
-# You should have received a copy of the GNU Lesser General Public
-# License along with paprefs. If not, see
-# <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU General Public License
+# along with paprefs. If not, see <http://www.gnu.org/licenses/>.
noinst_DATA = README.html README
EXTRA_DIST = $(noinst_DATA) style.css README.html.in
diff --git a/doc/README.html.in b/doc/README.html.in
index d6fec2a..50815c1 100644
--- a/doc/README.html.in
+++ b/doc/README.html.in
@@ -27,14 +27,14 @@
<h2><a name="license">License</a></h2>
<p>This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public License as
-published by the Free Software Foundation, either version 2.1 of the
+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.</p>
<p>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
-Lesser General Public License for more details.</p>
+General Public License for more details.</p>
<h2><a name="news">News</a></h2>
diff --git a/doc/style.css b/doc/style.css
index 51386c6..91c2be0 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -3,20 +3,19 @@
Copyright 2006-2008 Lennart Poettering
- paprefs is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation, either version 2.1 of the
- License, or (at your option) any later version.
+ paprefs 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.
paprefs 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
- Lesser General Public License for more details.
+ General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with paprefs. If not, see
- <http://www.gnu.org/licenses/>.
-***/
+ You should have received a copy of the GNU General Public License
+ along with paprefs. If not, see <http://www.gnu.org/licenses/>.
+ ***/
body { color: black; background-color: white; }
a:link, a:visited { color: #900000; }
diff --git a/src/Makefile.am b/src/Makefile.am
index 598d830..aefae87 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,18 +3,17 @@
# Copyright 2006-2008 Lennart Poettering
#
# paprefs is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 2.1 of the
-# License, or (at your option) any later version.
+# 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.
#
# paprefs 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
-# Lesser General Public License for more details.
+# General Public License for more details.
#
-# You should have received a copy of the GNU Lesser General Public
-# License along with paprefs. If not, see
-# <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU General Public License
+# along with paprefs. If not, see <http://www.gnu.org/licenses/>.
# Needs fixing on some borked OS
SHREXT=.so
diff --git a/src/paprefs.cc b/src/paprefs.cc
index 70c644e..18e6696 100644
--- a/src/paprefs.cc
+++ b/src/paprefs.cc
@@ -3,19 +3,18 @@
Copyright 2006-2008 Lennart Poettering
- paprefs is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation, either version 2.1 of the
- License, or (at your option) any later version.
+ paprefs 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.
paprefs 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
- Lesser General Public License for more details.
+ General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with paprefs. If not, see
- <http://www.gnu.org/licenses/>.
+ You should have received a copy of the GNU General Public License
+ along with paprefs. If not, see <http://www.gnu.org/licenses/>.
***/
#ifdef HAVE_CONFIG_H