[DRE-commits] r2110 - packages-wip/libpdf-writer-ruby/trunk/debian

[gwolf at alioth.debian.org]

Author: gwolf
Date: 2007-12-06 21:12:19 +0000 (Thu, 06 Dec 2007)
New Revision: 2110

Modified:
   packages-wip/libpdf-writer-ruby/trunk/debian/changelog
   packages-wip/libpdf-writer-ruby/trunk/debian/copyright
   packages-wip/libpdf-writer-ruby/trunk/debian/rules
Log:
taking steps to ensure we stay DFSG-clean on this tainted package


Modified: packages-wip/libpdf-writer-ruby/trunk/debian/changelog
===================================================================
--- packages-wip/libpdf-writer-ruby/trunk/debian/changelog	2007-12-06 19:45:05 UTC (rev 2109)
+++ packages-wip/libpdf-writer-ruby/trunk/debian/changelog	2007-12-06 21:12:19 UTC (rev 2110)
@@ -1,7 +1,11 @@
-libpdf-writer-ruby (1.1.3-1) UNRELEASED; urgency=low
+libpdf-writer-ruby (1.1.3+dfsg-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
   * Initial upload (Closes: #442087)
   * Thanks to Arnaud Cornet for his comments regarding this packaging!
+  * Weeded out some non-DFSG files (although this will mean repackaging
+    upstream always as +dfsg)
+  * Added a couple of checks in debian/rules to avoid us goofing up and
+    _not_ repackaging the files to stay dfsg-clean ;-) )
 
- -- Gunnar Wolf <gwolf at debian.org>  Thu, 20 Sep 2007 09:21:06 -0500
+ -- Gunnar Wolf <gwolf at debian.org>  Thu, 06 Dec 2007 15:11:28 -0600

Modified: packages-wip/libpdf-writer-ruby/trunk/debian/copyright
===================================================================
--- packages-wip/libpdf-writer-ruby/trunk/debian/copyright	2007-12-06 19:45:05 UTC (rev 2109)
+++ packages-wip/libpdf-writer-ruby/trunk/debian/copyright	2007-12-06 21:12:19 UTC (rev 2110)
@@ -30,6 +30,15 @@
 SOFTWARE.
 
 == Works Included Under Other Licences
+
+Please note that the original version of this package (that is, the
+tarball shipped by the original authors) include two demo programs
+(demo/qr-language.rb and demo/qr-library.rb) and three images
+(images/chunkybacon.jpg, images/chunkybacon.png and
+images/bluesmoke.jpg) which are under Creative Commons licenses and
+thus cannot be redistributed in Debian - They were deleted/replaced
+from this packaging.
+
 === pdf/writer/graphics/imageinfo.rb
 PDF::Writer includes a derivative of Keisuke Minami's ImageSize library,
 which can be found at rubycgi[http://www.rubycgi.org/tools/index.en.htm].
@@ -40,20 +49,6 @@
 On Debian systems, the GPL v2 license can be found in
 /usr/share/common-licenses/GPL-2 
 
-=== Ruby Quick Reference Sheets
-PDF::Writer has demo programs that will create Quick Reference cards for
-Ruby. The content and output of these programs is copyright 2003–2005 Ryan
-Davis and is licensed under the Creative Commons
-Attribution-NonCommercial-ShareAlike[http://creativecommons.org/licenses/by-nc-sa/2.0/]
-licence.
-
-=== Images from "Why's (Poignant) Guide to Ruby"
-One of the demo programs uses images originally from "Why's (Poignant) Guide
-to Ruby"[http://poignantguide.net/ruby], with permission. These immages are
-released under the Creative Commons
-Attributions ShareAlike[http://creativecommons.org/licenses/by-sa/2.0/]
-licence.
-
 === Adobe PostScript AFM Files
 pdf/writer/fonts/MustRead.html and the 14 PostScript(R) AFM files it
 accompanies may be used, copied, and distributed for any purpose and without

Modified: packages-wip/libpdf-writer-ruby/trunk/debian/rules
===================================================================
--- packages-wip/libpdf-writer-ruby/trunk/debian/rules	2007-12-06 19:45:05 UTC (rev 2109)
+++ packages-wip/libpdf-writer-ruby/trunk/debian/rules	2007-12-06 21:12:19 UTC (rev 2110)
@@ -2,3 +2,10 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
+
+clean::
+	# Make sure we strip out non-DFSG demo files from the ori
+	[ ! -f demo/qr-library.rb -a ! -f demo/qr-language.rb ] || false 
+	[ $$(md5sum images/bluesmoke.jpg | cut -f 1 -d ' ') == 0586eca5af7523ab871609eceb44724a ] || false
+	[ $$(md5sum images/chunkybacon.jpg | cut -f 1 -d ' ') == a000b1917142ce332fd3474f0722cd6f ] || false
+	[ $$(md5sum images/chunkybacon.png | cut -f 1 -d ' ') == 927feec1cbbf23c4d89a4a5ad88e6d0f ] || false