[DRE-commits] r5766 - trunk/libprawn-ruby/debian

[Gunnar Wolf]

Author: gwolf
Date: 2010-08-13 21:56:06 +0000 (Fri, 13 Aug 2010)
New Revision: 5766

Modified:
   trunk/libprawn-ruby/debian/README.source
   trunk/libprawn-ruby/debian/changelog
   trunk/libprawn-ruby/debian/control
   trunk/libprawn-ruby/debian/rules
Log:
Fix: Was shipping non-free fonts

Modified: trunk/libprawn-ruby/debian/README.source
===================================================================
--- trunk/libprawn-ruby/debian/README.source	2010-08-10 07:45:47 UTC (rev 5765)
+++ trunk/libprawn-ruby/debian/README.source	2010-08-13 21:56:06 UTC (rev 5766)
@@ -31,4 +31,22 @@
 Anyway, at least up to this moment, ttfunk and pdf-inspector have a
 _way_ lower change rate than the main Prawn project.
 
- -- Gunnar Wolf <gwolf at debian.org>, Fri,  9 Apr 2010 18:19:17 -0500
+	      What's the deal with the +dfsg versioning?
+	      ==========================================
+
+The Prawn module as shipped by upstream includes two areas regarded
+non-free by Debian:
+
+- Images in the data/images directory. Some of the included images are
+  protected as trademarks (i.e. rails) or their copyright status is
+  nonfree. Look at README.missing_images for further details.
+
+- Font files in the data/fonts directory. Prawn ships several free
+  fonts, but also with some fonts for which their copyright
+  information is not clear (or clearly non-free). Although they are
+  free-as-in-beer, we cannot legally redistribute them.
+
+  We have removed all fonts save for the core 14 PostScript AFM fonts,
+  which _are_ free.
+
+ -- Gunnar Wolf <gwolf at debian.org>, Fri, 13 Aug 2010 16:44:57 -0500

Modified: trunk/libprawn-ruby/debian/changelog
===================================================================
--- trunk/libprawn-ruby/debian/changelog	2010-08-10 07:45:47 UTC (rev 5765)
+++ trunk/libprawn-ruby/debian/changelog	2010-08-13 21:56:06 UTC (rev 5766)
@@ -1,3 +1,10 @@
+libprawn-ruby (0.9.1+dfsg2-1) unstable; urgency=low
+
+  * New +dfsg version, no longer including non-free fonts (Closes: #592915)
+  * Standards-version: 3.8.4 → 3.9.1.0 (No changes needed)
+
+ -- Gunnar Wolf <gwolf at debian.org>  Fri, 13 Aug 2010 16:16:36 -0500
+
 libprawn-ruby (0.9.1+dfsg-1) unstable; urgency=low
 
   [ Paul van Tilburg ]

Modified: trunk/libprawn-ruby/debian/control
===================================================================
--- trunk/libprawn-ruby/debian/control	2010-08-10 07:45:47 UTC (rev 5765)
+++ trunk/libprawn-ruby/debian/control	2010-08-13 21:56:06 UTC (rev 5766)
@@ -6,7 +6,7 @@
  Ryan Niebur <ryanryan52 at gmail.com>
 Build-Depends: ruby-pkg-tools (>= 0.17), cdbs, debhelper (>= 7), libsetup-ruby1.8
 Build-Depends-Indep: ruby1.8, rdoc, ruby1.9.1
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1.0
 Homepage: http://prawn.majesticseacreature.com/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/libprawn-ruby/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/libprawn-ruby/

Modified: trunk/libprawn-ruby/debian/rules
===================================================================
--- trunk/libprawn-ruby/debian/rules	2010-08-10 07:45:47 UTC (rev 5765)
+++ trunk/libprawn-ruby/debian/rules	2010-08-13 21:56:06 UTC (rev 5766)
@@ -48,15 +48,10 @@
 	ln -s ../libprawn-ruby-common/examples/ ./debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/examples
 
 install/libprawn-ruby-common::
-	# Instead of copying fonts that are often found in Debian
-	# systems, recommend the relevant packages and symlink
-	# them. That way, lintian will be happier.
-	rm ./debian/$(cdbs_curpkg)/usr/share/libprawn-ruby/fonts/DejaVuSans.ttf
+	# Symlink well-known fonts to their expected location
 	ln -s ../../fonts/truetype/ttf-dejavu/DejaVuSans.ttf \
 		./debian/$(cdbs_curpkg)/usr/share/libprawn-ruby/fonts/DejaVuSans.ttf
-	rm ./debian/$(cdbs_curpkg)/usr/share/libprawn-ruby/fonts/Dustismo_Roman.ttf
 	ln -s ../../fonts/truetype/dustin/Dustismo_Roman.ttf \
 		./debian/$(cdbs_curpkg)/usr/share/libprawn-ruby/fonts/Dustismo_Roman.ttf
-	rm ./debian/$(cdbs_curpkg)/usr/share/libprawn-ruby/fonts/gkai00mp.ttf
 	ln -s ../../fonts/truetype/arphic/gkai00mp.ttf \
 		./debian/$(cdbs_curpkg)/usr/share/libprawn-ruby/fonts/gkai00mp.ttf