diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-08-05 19:42:21 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-08-05 19:42:21 +0200 |
| commit | 3cca13223b8f038fb82e34b8979579b34efafee0 (patch) | |
| tree | 2f37513a24e60aebd7bbf9fdf8f8dc7802ba8ada /src | |
| parent | 0ed4f324326f63e5672367bc63609a3ee65faef6 (diff) | |
update license headers for GPL 2.0+
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 13 | ||||
| -rw-r--r-- | src/pavucontrol.cc | 12 |
2 files changed, 12 insertions, 13 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 799505a..0bdc05b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,8 +1,10 @@ # This file is part of pavucontrol. # +# Copyright 2006-2008 Lennart Poettering +# # 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 +# 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 @@ -11,9 +13,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with pavucontrol; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA. +# along with pavucontrol. If not, see <http://www.gnu.org/licenses/>. desktopdir = $(datadir)/applications @@ -25,5 +25,6 @@ dist_desktop_DATA=pavucontrol.desktop pavucontrol_SOURCES=pavucontrol.cc pavucontrol_LDADD=$(AM_LDADD) $(GUILIBS_LIBS) $(PULSE_LIBS) -pavucontrol_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(PULSE_CFLAGS) -pavucontrol_CXXFLAGS+=-DGLADE_FILE=\"$(pkgdatadir)/pavucontrol.glade\" +pavucontrol_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(PULSE_CFLAGS) +#pavucontrol_CXXFLAGS+=-DGLADE_FILE=\"$(pkgdatadir)/pavucontrol.glade\" +pavucontrol_CXXFLAGS+=-DGLADE_FILE=\"pavucontrol.glade\" diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc index 1b57404..08b3877 100644 --- a/src/pavucontrol.cc +++ b/src/pavucontrol.cc @@ -1,13 +1,13 @@ /*** 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> 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. + 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 WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,9 +15,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with pavucontrol; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - USA. + along with pavucontrol. If not, see <http://www.gnu.org/licenses/>. ***/ #ifdef HAVE_CONFIG_H |