[SCM] live-build branch, debian, updated. debian/3.0_a25-1-57-g6167d10

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit b3e6ff2e14f3d2763547fb0c523af8ee23317124
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jul 20 10:33:28 2011 +0200

    Compacting copyright file.

diff --git a/debian/copyright b/debian/copyright
index c8affd8..31e44d4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,25 +1,15 @@
 Files: *
 Copyright: (C) 2006-2011 Daniel Baumann <daniel at debian.org>
 License: GPL-3+
- 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, 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,
- 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.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- The complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-3 file.
 
 Files: contrib/graph-helpers
 Copyright: (C) 2007 Chris Lamb <chris at chris-lamb.co.uk>
 License: GPL-3+
+
+Files: contrib/grub-splash/lenny
+License: other
+
+License: GPL-3+
  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, either version 3 of the License, or
@@ -36,7 +26,6 @@ License: GPL-3+
  The complete text of the GNU General Public License
  can be found in /usr/share/common-licenses/GPL-3 file.
 
-Files: contrib/grub-splash/lenny
 License: other
  The splash for Debian Live was made by Daniel Baumann <daniel at debian.org> based
  on the original work of Mark Riedesel.

-- 
live-build