# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1182681039 18000
# Node ID e45d3f63bd9fc14484de23135aa2f86101d12ec8
# Parent  417472bb3d580960e5cdb50b6a8f9675285e7546
Backed out changeset 417472bb3d580960e5cdb50b6a8f9675285e7546

diff -r 417472bb3d58 -r e45d3f63bd9f src/audacious/mpris_player.xml
--- a/src/audacious/mpris_player.xml	Sat Jun 23 23:08:35 2007 -0500
+++ b/src/audacious/mpris_player.xml	Sun Jun 24 05:30:39 2007 -0500
@@ -1,36 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!--
- - audacious: Cross-platform multimedia player.
- - mpris_player.xml: MPRIS /Player specification.
- -
+ - Audacious: A cross-platform multimedia player
  - Copyright (c) 2007 William Pitcock
  -
- - Redistribution and use in source and binary forms, with or without
- - modification, are permitted provided that the following conditions are
- - met:
- -
- - 1. Redistributions of source code must retain the above copyright notice,
- -    this list of conditions and the following disclaimer.
- -
- - 2. Redistributions in binary form must reproduce the above copyright
- -    notice, this list of conditions and the following disclaimer in the
- -    documentation and/or other materials provided with the distribution.
+ - 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; under version 2 of the License.
  -
- - 3. The name of the author may not be used to endorse or promote products
- -    derived from this software without specific prior written permission.
+ - 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 General Public License for more details.
  -
- - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- - DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- - SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- - STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- - IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- - POSSIBILITY OF SUCH DAMAGE.
+ - 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ - 02110-1301, USA.
  -->
 
 <node name="/Player">
diff -r 417472bb3d58 -r e45d3f63bd9f src/audacious/mpris_root.xml
--- a/src/audacious/mpris_root.xml	Sat Jun 23 23:08:35 2007 -0500
+++ b/src/audacious/mpris_root.xml	Sun Jun 24 05:30:39 2007 -0500
@@ -1,36 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!--
- - audacious: Cross-platform multimedia player.
- - mpris_root.xml: MPRIS / specification.
- -
+ - Audacious: A cross-platform multimedia player
  - Copyright (c) 2007 William Pitcock
  -
- - Redistribution and use in source and binary forms, with or without
- - modification, are permitted provided that the following conditions are
- - met:
- -
- - 1. Redistributions of source code must retain the above copyright notice,
- -    this list of conditions and the following disclaimer.
- -
- - 2. Redistributions in binary form must reproduce the above copyright
- -    notice, this list of conditions and the following disclaimer in the
- -    documentation and/or other materials provided with the distribution.
+ - 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; under version 2 of the License.
  -
- - 3. The name of the author may not be used to endorse or promote products
- -    derived from this software without specific prior written permission.
+ - 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 General Public License for more details.
  -
- - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- - DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- - SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- - STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- - IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- - POSSIBILITY OF SUCH DAMAGE.
+ - 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ - 02110-1301, USA.
  -->
 
 <node name="/">
diff -r 417472bb3d58 -r e45d3f63bd9f src/audacious/mpris_tracklist.xml
--- a/src/audacious/mpris_tracklist.xml	Sat Jun 23 23:08:35 2007 -0500
+++ b/src/audacious/mpris_tracklist.xml	Sun Jun 24 05:30:39 2007 -0500
@@ -1,36 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!--
- - audacious: Cross-platform multimedia player.
- - mpris_tracklist.xml: MPRIS /TrackList specification.
- -
+ - Audacious: A cross-platform multimedia player
  - Copyright (c) 2007 William Pitcock
  -
- - Redistribution and use in source and binary forms, with or without
- - modification, are permitted provided that the following conditions are
- - met:
- -
- - 1. Redistributions of source code must retain the above copyright notice,
- -    this list of conditions and the following disclaimer.
- -
- - 2. Redistributions in binary form must reproduce the above copyright
- -    notice, this list of conditions and the following disclaimer in the
- -    documentation and/or other materials provided with the distribution.
+ - 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; under version 2 of the License.
  -
- - 3. The name of the author may not be used to endorse or promote products
- -    derived from this software without specific prior written permission.
+ - 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 General Public License for more details.
  -
- - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- - DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- - SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- - STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- - IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- - POSSIBILITY OF SUCH DAMAGE.
+ - 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ - 02110-1301, USA.
  -->
 
 <node name="/TrackList">