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

    add upstream references for patches 0200 and 0205

diff --git a/debian/patches/0200_replace_BASEDIR_data_by_DATADIR.patch b/debian/patches/0200_replace_BASEDIR_data_by_DATADIR.patch
index 42af3d7..a56f7e6 100644
--- a/debian/patches/0200_replace_BASEDIR_data_by_DATADIR.patch
+++ b/debian/patches/0200_replace_BASEDIR_data_by_DATADIR.patch
@@ -7,6 +7,7 @@ Description: define Prawn::DATADIR as the name of the directory containing data
  constant instead of the hardcoded path
 Author: Cédric Boutillier <cedric.boutillier at gmail.com>
 Last-Update: 2011-11-15
+Bug: https://github.com/sandal/prawn/pull/299
 
 --- a/lib/prawn/document.rb
 +++ b/lib/prawn/document.rb
diff --git a/debian/patches/0205_replace_BASEDIR_data_by_DATADIR_manual.patch b/debian/patches/0205_replace_BASEDIR_data_by_DATADIR_manual.patch
index 6ccbfb3..c2ac363 100644
--- a/debian/patches/0205_replace_BASEDIR_data_by_DATADIR_manual.patch
+++ b/debian/patches/0205_replace_BASEDIR_data_by_DATADIR_manual.patch
@@ -1,3 +1,14 @@
+Description: define Prawn::DATADIR as the name of the directory containing data (manual)
+ Upstream hardcoded the relative path with respect to prawn/core.rb of the
+ directory containing data.
+ A new constant, Prawn::DATADIR is introduced to permit using another
+ directory, and change its name just once.
+ The code producing the manual is patched to make use of this new
+ constant instead of the hardcoded path
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Last-Update: 2011-11-15
+Bug: https://github.com/sandal/prawn/pull/299
+Bug: https://github.com/sandal/prawn/pull/299
 --- a/manual/manual/cover.rb
 +++ b/manual/manual/cover.rb
 @@ -9,7 +9,7 @@

-- 
ruby-prawn.git