The following commit has been merged in the master branch:
commit 57e6252cba4c6654ccbed4b744d6b98cfb5017f7
Author: David Paleino da...@debian.org
Date: Tue Oct 4 19:08:12 2011 +0200
Purge debian/copyright from non-(anymore)-existing files
diff --git a/debian/changelog b/debian/changelog
index e77944d..abe37f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ mapnik (2.0.0+ds1-1) UNRELEASED; urgency=low
* New input plugins compiled: geos, rasterlite
* Package switch from pysupport to dh_python2
* Package renamed from libmapnik0.7 to libmapnik2-2.0
+ * Purge debian/copyright from non-(anymore)-existing files
- -- David Paleino da...@debian.org Tue, 27 Sep 2011 12:25:30 +0200
+ -- David Paleino da...@debian.org Tue, 04 Oct 2011 19:07:56 +0200
mapnik (0.7.1-6) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index fcbd5de..56ea579 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
+Format: http://dep.debian.net/deps/dep5/
Files: debian/*
Copyright: © 2006-2009, Dominic Hargreaves d...@earth.li
- © 2010, David Paleino da...@debian.org
+ © 2010-2011, David Paleino da...@debian.org
License: GPL-2+
Files: agg/*
@@ -13,15 +13,6 @@ License: other
This software is provided as is without express or implied
warranty, and with no claim as to its suitability for any purpose.
-Files: scons/*
-Copyright: © 2001-2008, The SCons Foundation
-License: MIT
-
-Files: fonts/dejavu-ttf-2.30/*
-Copyright: © 2003, Bitstream, Inc.
- © 2006, Tavmjong Bah tavmj...@free.fr
-License: Bitstream, Arev
-
Files: fonts/unifont-5.1.20080907.ttf
Copyright: ©
License: GPL-2 with exception
@@ -32,10 +23,6 @@ License: GPL-2 with exception
document to the terms of the GPL.
X-Comment: see fonts/unifont_license.txt
-Files: tinyxml/*
-Copyright: © 2000-2006, Lee Thomason http://www.grinninglizard.com
-License: TinyXML
-
Files: *
Copyright: © 2006-2009, Artem Pavlenko
© 2006-2009, Jean-Francois Doyon
@@ -74,133 +61,3 @@ License: GPL-2+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
X-Comment: on Debian systems, the complete text of the GNU General Public
License v2 can be found in `/usr/share/common-licenses/GPL-2'.
-
-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- Software), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- .
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY
- KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
- WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-License: Bitstream
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of the fonts accompanying this license (Fonts) and associated
- documentation files (the Font Software), to reproduce and distribute the
- Font Software, including without limitation the rights to use, copy, merge,
- publish, distribute, and/or sell copies of the Font Software, and to permit
- persons to whom the Font Software is furnished to do so, subject to the
- following conditions:
- .
- The above copyright and trademark notices and this permission notice shall
- be included in all copies of one or more of the Font Software typefaces.
- .
- The Font Software may be modified, altered, or added to, and in particular
- the designs of glyphs or characters in the Fonts may be modified and
- additional glyphs or characters may be added to the Fonts, only if the fonts
- are renamed to names not containing either the words Bitstream or the word
- Vera.
- .
- This License becomes null and void to the extent applicable to Fonts or Font
- Software that has been modified and is distributed under the Bitstream
- Vera names.
- .
- The Font Software may be sold as part of a larger software package but no
- copy of one or more of the Font Software typefaces may be sold by itself.
- .
- THE FONT SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
- TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
- FOUNDATION BE LIABLE FOR ANY
