[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 df328ebcfd6cf4f99ffbe437705f5b6a6f3a5c0e
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Tue Nov 22 10:16:07 2011 +0100

    refresh patches

diff --git a/debian/patches/0100_remove_bundler_rubygems_stuff.patch b/debian/patches/0100_remove_bundler_rubygems_stuff.patch
index 1eb87ab..12e60a1 100644
--- a/debian/patches/0100_remove_bundler_rubygems_stuff.patch
+++ b/debian/patches/0100_remove_bundler_rubygems_stuff.patch
@@ -16,7 +16,7 @@ Last-Update: 2011-11-07
 +#Bundler.setup
  
 -$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib') 
-+#$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib') 
++#$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
  require "prawn"
  
  Prawn.debug = true
diff --git a/debian/patches/0200_replace_BASEDIR_data_by_DATADIR.patch b/debian/patches/0200_replace_BASEDIR_data_by_DATADIR.patch
index 9e89beb..42af3d7 100644
--- a/debian/patches/0200_replace_BASEDIR_data_by_DATADIR.patch
+++ b/debian/patches/0200_replace_BASEDIR_data_by_DATADIR.patch
@@ -745,7 +745,7 @@ Last-Update: 2011-11-15
  
 --- a/lib/prawn/core.rb
 +++ b/lib/prawn/core.rb
-@@ -29,7 +29,11 @@
+@@ -17,7 +17,11 @@
                            
    # The base source directory for Prawn as installed on the system
    #
diff --git a/debian/patches/0400_use_system_fonts.patch b/debian/patches/0400_use_system_fonts.patch
index c7b96b3..5d44068 100644
--- a/debian/patches/0400_use_system_fonts.patch
+++ b/debian/patches/0400_use_system_fonts.patch
@@ -1,3 +1,10 @@
+Description: use system fonts when possible
+ Upstream ships embedded copies of several truetype fonts. Some of them are
+ available in Debian. These copies have been removed from the Debian source
+ package, and system fonts are used instead. 
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Last-Update: 2011-11-21
+
 --- a/spec/line_wrap_spec.rb
 +++ b/spec/line_wrap_spec.rb
 @@ -51,7 +51,7 @@
diff --git a/debian/patches/0500_disable_tests_using_removed_files.patch b/debian/patches/0500_disable_tests_using_removed_files.patch
index bf82287..5158a3c 100644
--- a/debian/patches/0500_disable_tests_using_removed_files.patch
+++ b/debian/patches/0500_disable_tests_using_removed_files.patch
@@ -1,3 +1,10 @@
+Description: disable some specs after removal of some files from the source package
+ Some specs are using for the moment images with unclear license and/or
+ non-free fonts. These are disabled because they cannot be run since these
+ files have been removed from the Debian source package.
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Last-Update: 2011-11-21
+
 --- a/spec/font_spec.rb
 +++ b/spec/font_spec.rb
 @@ -95,7 +95,8 @@

-- 
ruby-prawn.git