Merge configuration fixes

[disorder] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 78f57333138e2cf2ac3fde5e77788944fe2a82d0..47a18e50ddf75a6940d949b2b5297aa265a6d09c 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,9 +14,9 @@ Portions extracted from MPG321, http://mpg321.sourceforge.net/
 Binaries may derive extra copyright owners through linkage
 (binary distributors are expected to do their own legwork)
 
 Binaries may derive extra copyright owners through linkage
 (binary distributors are expected to do their own legwork)
 

-This program is free software; you can redistribute it and/or modify
+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
 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 3 of the License, or

 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,


@@ -25,8 +25,7 @@ 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
 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+along with this program.  If not, see <http://www.gnu.org/licenses/>.

 
 On Debian systems, look in /usr/share/common-licenses/GPL for a copy
 of the GPL.
 
 On Debian systems, look in /usr/share/common-licenses/GPL for a copy
 of the GPL.