update license headers for GPL 2.0+

This commit is contained in:
Lennart Poettering 2008-08-05 19:42:21 +02:00
parent 0ed4f32432
commit 3cca13223b
8 changed files with 60 additions and 61 deletions

View File

@ -1,8 +1,10 @@
# This file is part of pavucontrol. # This file is part of pavucontrol.
# #
# Copyright 2006-2008 Lennart Poettering
#
# pavucontrol is free software; you can redistribute it and/or modify # pavucontrol is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or # the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version. # (at your option) any later version.
# #
# pavucontrol is distributed in the hope that it will be useful, but # pavucontrol is distributed in the hope that it will be useful, but
@ -11,9 +13,7 @@
# General Public License for more details. # General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with pavucontrol; if not, write to the Free Software # along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.
EXTRA_DIST = bootstrap.sh README LICENSE EXTRA_DIST = bootstrap.sh README LICENSE
SUBDIRS=src doc SUBDIRS=src doc

View File

@ -2,9 +2,11 @@
# This file is part of pavucontrol. # This file is part of pavucontrol.
# #
# pavucontrol is free software; you can redistribute it and/or modify it # Copyright 2006-2008 Lennart Poettering
# under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or # pavucontrol 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. # (at your option) any later version.
# #
# pavucontrol is distributed in the hope that it will be useful, but # pavucontrol is distributed in the hope that it will be useful, but
@ -13,8 +15,7 @@
# General Public License for more details. # General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with pavucontrol; if not, write to the Free Software Foundation, # along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
VERSION=1.9 VERSION=1.9

View File

@ -3,9 +3,11 @@
# This file is part of pavucontrol. # This file is part of pavucontrol.
# #
# pavucontrol is free software; you can redistribute it and/or modify it # Copyright 2006-2008 Lennart Poettering
# under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or # pavucontrol 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. # (at your option) any later version.
# #
# pavucontrol is distributed in the hope that it will be useful, but # pavucontrol is distributed in the hope that it will be useful, but
@ -14,8 +16,7 @@
# General Public License for more details. # General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with pavucontrol; if not, write to the Free Software Foundation, # along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
AC_PREREQ(2.57) AC_PREREQ(2.57)
AC_INIT([pavucontrol],[0.9.7],[mzcnihpbageby (at) 0pointer (dot) de]) AC_INIT([pavucontrol],[0.9.7],[mzcnihpbageby (at) 0pointer (dot) de])

View File

@ -1,18 +1,20 @@
# This file is part of pavucontrol. # This file is part of pavucontrol.
# #
# pavucontrol is free software; you can redistribute it and/or modify it # Copyright 2006-2008 Lennart Poettering
# under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or # pavucontrol is free software; you can redistribute it and/or modify
# (at your option) any later version. # 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.
# #
# pavucontrol is distributed in the hope that it will be useful, but # pavucontrol is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of # WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details. # General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public
# along with pavucontrol; if not, write to the Free Software Foundation, # License along with pavucontrol. If not, see
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. # <http://www.gnu.org/licenses/>.
noinst_DATA = README.html README noinst_DATA = README.html README
EXTRA_DIST = $(noinst_DATA) style.css README.html.in EXTRA_DIST = $(noinst_DATA) style.css README.html.in
@ -31,4 +33,3 @@ tidy: README.html
tidy -e < README.html tidy -e < README.html
.PHONY: tidy .PHONY: tidy

View File

@ -27,19 +27,15 @@
<h2><a name="license">License</a></h2> <h2><a name="license">License</a></h2>
<p>This program is free software; you can redistribute it and/or <p>This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as modify it under the terms of the GNU Public License as published by
published by the Free Software Foundation; either version 2 of the the Free Software Foundation, either version 2 of the License, or (at
License, or (at your option) any later version.</p> your option) any later version.</p>
<p>This program is distributed in the hope that it will be useful, but <p>This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.</p> General Public License for more details.</p>
<p>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., 675 Mass Ave, Cambridge, MA 02139, USA.</p>
<h2><a name="news">News</a></h2> <h2><a name="news">News</a></h2>
<div class="news-date">Fri Mar 28 <div class="news-date">Fri Mar 28

View File

@ -1,20 +1,21 @@
/*** /***
* This file is part of pavucontrol. This file is part of pavucontrol.
*
* pavucontrol is free software; you can redistribute it and/or modify it Copyright 2006-2008 Lennart Poettering
* under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or pavucontrol is free software; you can redistribute it and/or modify
* (at your option) any later version. it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* pavucontrol is distributed in the hope that it will be useful, but (at your option) any later version.
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU pavucontrol is distributed in the hope that it will be useful, but
* General Public License for more details. WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* You should have received a copy of the GNU General Public License General Public License for more details.
* along with pavucontrol; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. You should have received a copy of the GNU General Public License
***/ along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
***/
body { color: black; background-color: white; } body { color: black; background-color: white; }
a:link, a:visited { color: #900000; } a:link, a:visited { color: #900000; }

View File

@ -1,8 +1,10 @@
# This file is part of pavucontrol. # This file is part of pavucontrol.
# #
# Copyright 2006-2008 Lennart Poettering
#
# pavucontrol is free software; you can redistribute it and/or modify # pavucontrol is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or # the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version. # (at your option) any later version.
# #
# pavucontrol is distributed in the hope that it will be useful, but # pavucontrol is distributed in the hope that it will be useful, but
@ -11,9 +13,7 @@
# General Public License for more details. # General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with pavucontrol; if not, write to the Free Software # along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.
desktopdir = $(datadir)/applications desktopdir = $(datadir)/applications
@ -26,4 +26,5 @@ pavucontrol_SOURCES=pavucontrol.cc
pavucontrol_LDADD=$(AM_LDADD) $(GUILIBS_LIBS) $(PULSE_LIBS) pavucontrol_LDADD=$(AM_LDADD) $(GUILIBS_LIBS) $(PULSE_LIBS)
pavucontrol_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(PULSE_CFLAGS) pavucontrol_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(PULSE_CFLAGS)
pavucontrol_CXXFLAGS+=-DGLADE_FILE=\"$(pkgdatadir)/pavucontrol.glade\" #pavucontrol_CXXFLAGS+=-DGLADE_FILE=\"$(pkgdatadir)/pavucontrol.glade\"
pavucontrol_CXXFLAGS+=-DGLADE_FILE=\"pavucontrol.glade\"

View File

@ -1,13 +1,13 @@
/*** /***
This file is part of pavucontrol. This file is part of pavucontrol.
Copyright 2006-2008 Lennart Poettering <mzcnihpbageby (at) 0pointer (dot) de> Copyright 2006-2008 Lennart Poettering
Copyright 2008 Sjoerd Simons <sjoerd@luon.net> Copyright 2008 Sjoerd Simons <sjoerd@luon.net>
pavucontrol is free software; you can redistribute it and/or modify pavucontrol is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published it under the terms of the GNU General Public License as published by
by the Free Software Foundation; either version 2 of the License, the Free Software Foundation, either version 2 of the License, or
or (at your option) any later version. (at your option) any later version.
pavucontrol is distributed in the hope that it will be useful, but pavucontrol is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of WITHOUT ANY WARRANTY; without even the implied warranty of
@ -15,9 +15,7 @@
General Public License for more details. General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with pavucontrol; if not, write to the Free Software along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
***/ ***/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H