[DRE-commits] [SCM] ruby-pdf-reader.git branch, master, updated. upstream/0.10.0+real-16-g5f59bde

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 5f59bde7725ddf8a1e92cf05746a8ade0e24ca77
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Mon Sep 12 08:11:36 2011 +0200

    Revert unnecessary patching of unshipped bin/* utilities
    
    This reverts commit 6cb66aaa6ad04b024b1186693082d84f7dda211e.
    
    Conflicts:
    
    	debian/patches/series

diff --git a/debian/patches/0001-bin_rubygems_load_path.patch b/debian/patches/0001-bin_rubygems_load_path.patch
deleted file mode 100644
index 8e58376..0000000
--- a/debian/patches/0001-bin_rubygems_load_path.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: Deactivate rubygems and $LOAD_PATH override in bin/
-Author: Cédric Boutillier <cedric.boutillier at gmail.com>
-Last-Update: 2011-09-06
---- a/bin/pdf_list_callbacks
-+++ b/bin/pdf_list_callbacks
-@@ -1,9 +1,5 @@
- #!/usr/bin/env ruby
- 
--require 'rubygems'
--
--$LOAD_PATH.unshift(File.dirname(__FILE__) + "/../lib")
--
- require 'pdf/reader'
- 
- receiver = PDF::Reader::PrintReceiver.new
---- a/bin/pdf_object
-+++ b/bin/pdf_object
-@@ -1,9 +1,5 @@
- #!/usr/bin/env ruby
- 
--require 'rubygems'
--
--$LOAD_PATH.unshift(File.dirname(__FILE__) + "/../lib")
--
- USAGE = "USAGE: " + File.basename(__FILE__) + " <file> <object id> [generation]"
- 
- require 'pdf/reader'
---- a/bin/pdf_text
-+++ b/bin/pdf_text
-@@ -1,8 +1,5 @@
- #!/usr/bin/env ruby
- 
--require 'rubygems'
--$LOAD_PATH.unshift(File.dirname(__FILE__) + "/../lib")
--
- require 'pdf/reader'
- 
- class PageTextReceiver
---- a/bin/pdf2txt
-+++ b/bin/pdf2txt
-@@ -23,7 +23,6 @@
- # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- #
- ################################################################################
--$LOAD_PATH.unshift(File.dirname(__FILE__) + "/../lib")
- 
- require 'pdf/reader'
- 
diff --git a/debian/patches/series b/debian/patches/series
index 7bcf1a0..39ae8b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0001-bin_rubygems_load_path.patch
 0002-examples_rubygems.patch
 0003-examples_fix_shebang.patch
 0004-spec_fix_requires.patch

-- 
ruby-pdf-reader.git