[DRE-commits] [SCM] ruby-prawn.git branch, master, updated. upstream/1.0.0_rc1-44-g6e97afc

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 061505917fe690330df4ab52655968980f3783d9
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Thu Nov 24 12:25:36 2011 +0100

    mention repacking and add README.source
    
    * add some words about repacking in debian/copyright
    * create a get-orig-source: target in debian/rules
    * detail removed/modified files in README.source

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..8469168
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,51 @@
+This package uses the Debian 3.0 (quilt) source package format.
+
+The source has been repacked to comply to Debian Free Software Guidelines:
+ - files removed because they are non-free fonts:
+	data/fonts/Activa.ttf
+	data/fonts/Action Man.dfont
+	data/fonts/Chalkboard.ttf
+	data/fonts/comicsans.ttf
+ - files removed because they are available in Debian packages:
+	data/fonts/DejaVuSans.ttf (ttf-dejavu-core)
+	data/fonts/Dustismo_Roman.ttf (fonts-dustin)
+	data/fonts/gkai00mp.ttf (fonts-arphic-gkai00mp)
+ - image and data files removed because their license is not specified, or they
+   are non-free
+	data/images/16bit.alpha
+	data/images/16bit.dat
+	data/images/16bit.png
+	data/images/arrow2.png
+	data/images/arrow.png
+	data/images/barcode_issue.png
+	data/images/dice.alpha
+	data/images/dice.dat
+	data/images/dice_interlaced.png
+	data/images/dice.png
+	data/images/fractal.jpg
+	data/images/letterhead.jpg
+	data/images/page_white_text.alpha
+	data/images/page_white_text.dat
+	data/images/page_white_text.png
+	data/images/prawn.png
+	data/images/rails.dat
+	data/images/rails.png
+	data/images/ruport_data.dat
+	data/images/ruport.png
+	data/images/ruport_transparent.png
+	data/images/ruport_type0.png
+	data/images/tru256.bmp
+	data/images/web-links.dat
+	data/images/web-links.png
+	
+  - image files with content removed and replaced because their license is not
+    specified, but are needed for testing the library and building the manual
+	data/images/pigs.jpg
+	data/images/stef.jpg
+
+These operations are done automatically by the script debian/repack.sh, called
+in the get-orig-source: target in debian/rules
+
+
+Cédric Boutillier <cedric.boutillier at gmail.com>
+Last update: 2011-11-24
diff --git a/debian/changelog b/debian/changelog
index ea31607..921fe36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,12 @@ ruby-prawn (1.0.0~rc1+dfsg-1) UNRELEASED; urgency=low
   * Packaging with gem2deb
     + renaming source and binary packages
   * Bump Standards-version to 3.9.2
-  * Add myself as an uploader.
+  * Add debian/repack.sh script to remove unwanted fonts and images
+    (Closes: #631276)
+  * Disable several specs requiring removed data files
+  * Build Prawn's manual and register in doc-base (ruby-prawn-doc package)
+  * Add lintian overrides for duplicate descriptions of transition packages
+  * Add myself as an uploader
 
  -- Cédric Boutillier <cedric.boutillier at gmail.com>  Mon, 24 Oct 2011 18:47:19 +0200
 
diff --git a/debian/copyright b/debian/copyright
index b83f262..e552081 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,11 @@
 Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
 Upstream-Name: prawn
 Source: http://www.github.com/sandal/prawn
+ Source has been repacked to exclude embedded (free or non-free) truetype and
+ .dfont font files, and images with unclear license statement. Two image files
+ (pigs.jpg and stef.jpg) are kept but their content is wiped out, as they are
+ needed for the construction of the manual and testing purpose.
+ See README.source for details.
 
 Files: *
 Copyright: 2008-2011 Gregory Brown <gregory.t.brown at gmail.com>
diff --git a/debian/ruby-prawn-doc.docs b/debian/ruby-prawn-doc.docs
index 37bbb58..d614c62 100644
--- a/debian/ruby-prawn-doc.docs
+++ b/debian/ruby-prawn-doc.docs
@@ -1,2 +1,3 @@
 README.md
+README.source
 manual.pdf
diff --git a/debian/ruby-prawn.docs b/debian/ruby-prawn.docs
index b43bf86..ee5de20 100644
--- a/debian/ruby-prawn.docs
+++ b/debian/ruby-prawn.docs
@@ -1 +1,2 @@
 README.md
+README.source
diff --git a/debian/rules b/debian/rules
index f1b1927..232e325 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-export DH_VERBOSE=1
+#export DH_VERBOSE=1
 #
 # Uncomment to ignore all test failures (but the tests will run anyway)
 #export DH_RUBY_IGNORE_TESTS=all
@@ -31,3 +31,7 @@ override_dh_auto_clean:
 	rm -rf data/spec
 	rm -f manual.pdf
 	dh_auto_clean
+
+get-orig-source:
+	chmod +x debian/repack.sh
+	debian/repack.sh

-- 
ruby-prawn.git