[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-45-g5ce3aed

[Jérémy Lal]

The following commit has been merged in the master branch:
commit 72cfe87e66f1e10c646a6c3fe288e56035118b38
Author: Jérémy Lal <kapouer at melix.org>
Date:   Sun Aug 11 13:02:27 2013 +0200

    Repackaging: remove useless and with incomplete license unifont-5.1 file.

diff --git a/debian/copyright b/debian/copyright
index 50ee82f..09eea0c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,6 +4,7 @@ Source: https://github.com/mapnik/mapnik/
  - SCons 1.2.0
  - SCons 2.1.0.alpha.20101125
  - DejaVu fonts 2.33
+ - unifont-5.1
  - TinyXML
 
 Files: debian/*
@@ -19,14 +20,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: fonts/unifont-5.1.20080907.ttf
-Copyright: ©
-License: GPL-2 with exception
- My software and is released under the terms of the GNU General Public License
- (GNU GPL) version 2.0, or (at your option) a later version. The precompiled
- fonts are released under the terms of the GNU GPL version 2, with the
- exception that embedding the font in a document does not in itself bind that
- document to the terms of the GPL.
 
 Files: *
 Copyright: © 2006-2009, Artem Pavlenko
diff --git a/debian/rules b/debian/rules
index ba79735..1a0c38d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -92,6 +92,7 @@ get-orig-source:
 	tar xvf ../tarballs/mapnik_$(UPVER).orig.tar.gz
 	@echo Removing third-party sources from orig.tar.gz
 	@rm -r mapnik-$(UPVER)/fonts/dejavu*
+	@rm mapnik-$(UPVER)/fonts/unifont*
 	@rm -r mapnik-$(UPVER)/scons/
 	tar cf $(TARNAME) mapnik-$(UPVER)/
 	gzip -9 $(TARNAME)

-- 
C++/Python toolkit for developing GIS applications