[DRE-commits] [ruby-prawn] 11/15: remove obsolete Debian patches

Cédric Boutillier boutil at moszumanska.debian.org
Mon Sep 8 14:04:24 UTC 2014


This is an automated email from the git hooks/post-receive script.

boutil pushed a commit to branch master
in repository ruby-prawn.

commit 1e6d4437a4c0dd1606cd383277a09d97c88e2d22
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Sep 8 15:20:01 2014 +0200

    remove obsolete Debian patches
---
 debian/patches/0102_simply_require_ttfunk.patch    |  26 --
 ...105_remove_rubygems_loadpath_stuff_manual.patch |   4 -
 ...05_replace_BASEDIR_data_by_DATADIR_manual.patch | 273 ---------------------
 .../0210_change_spec_data_to_datadir_pdfs.patch    |  84 -------
 debian/patches/0600_add_require_date_table_cell.rb |  18 --
 .../patches/0700_dont_call_git_from_manual.patch   |  21 --
 .../patches/1001_fix_encoding_in_font_spec.patch   |  21 --
 .../1002_define_external_encoding_for_manual.patch |  18 --
 debian/patches/series                              |   8 -
 9 files changed, 473 deletions(-)

diff --git a/debian/patches/0102_simply_require_ttfunk.patch b/debian/patches/0102_simply_require_ttfunk.patch
deleted file mode 100644
index 3a757b1..0000000
--- a/debian/patches/0102_simply_require_ttfunk.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: replace complicated statements by a simple require 'ttfunk'
- ttfunk is available as a Debian package. We do not need $LOAD_PATH
- manipulations and rescues to load this library.
-Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2014-01-16
-
-Index: ruby-prawn/lib/prawn.rb
-===================================================================
---- ruby-prawn.orig/lib/prawn.rb	2014-01-16 13:08:10.000000000 -0600
-+++ ruby-prawn/lib/prawn.rb	2014-01-16 13:08:57.000000000 -0600
-@@ -8,14 +8,7 @@
-   $LOAD_PATH.unshift(File.dirname(__FILE__) + "/../../vendor/#{dep}")
- end
- 
--begin
--  require 'ttfunk'
--rescue LoadError
--  puts "Failed to load ttfunk. If you are running Prawn from git:"
--  puts "  git submodule init"
--  puts "  git submodule update"
--  exit
--end
-+require 'ttfunk'
- 
- require "set"
- 
diff --git a/debian/patches/0105_remove_rubygems_loadpath_stuff_manual.patch b/debian/patches/0105_remove_rubygems_loadpath_stuff_manual.patch
deleted file mode 100644
index ac42ee4..0000000
--- a/debian/patches/0105_remove_rubygems_loadpath_stuff_manual.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-Description: remove LOAD_PATH manipulation from manual sources
-Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2014-01-16
-
diff --git a/debian/patches/0205_replace_BASEDIR_data_by_DATADIR_manual.patch b/debian/patches/0205_replace_BASEDIR_data_by_DATADIR_manual.patch
deleted file mode 100644
index 2e459ff..0000000
--- a/debian/patches/0205_replace_BASEDIR_data_by_DATADIR_manual.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-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 <boutil at debian.org>
-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 @@
- Prawn::Example.generate(filename) do
-   move_down 200
- 
--  image "#{Prawn::BASEDIR}/data/images/prawn.png",
-+  image "#{Prawn::DATADIR}/images/prawn.png",
-         :scale => 0.9,
-         :at => [10, cursor]
-         
---- a/manual/text/single_usage.rb
-+++ b/manual/text/single_usage.rb
-@@ -17,7 +17,7 @@
- filename = File.basename(__FILE__).gsub('.rb', '.pdf')
- Prawn::Example.generate(filename) do
-   # Using a TTF font file
--  font "#{Prawn::BASEDIR}/data/fonts/Chalkboard.ttf" do
-+  font "#{Prawn::DATADIR}/fonts/Chalkboard.ttf" do
-     text "Written with the Chalkboard TTF font."
-   end
-   move_down 20
-@@ -26,7 +26,7 @@
-   move_down 20
-   
-   # Using an DFONT font file
--  font "#{Prawn::BASEDIR}/data/fonts/Action Man.dfont" do
-+  font "#{Prawn::DATADIR}/fonts/Action Man.dfont" do
-     text "Written with the Action Man DFONT font"
-   end
-   move_down 20
---- a/manual/text/utf8.rb
-+++ b/manual/text/utf8.rb
-@@ -21,7 +21,7 @@
-   text "Let's try them with another font."
-   move_down 20
-   
--  font("#{Prawn::BASEDIR}/data/fonts/DejaVuSans.ttf") do
-+  font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf") do
-     text "ὕαλον ϕαγεῖν δύναμαι· τοῦτο οὔ με βλάπτει."
-     text "There you go."
-   end
---- a/manual/document_and_page_options/background.rb
-+++ b/manual/document_and_page_options/background.rb
-@@ -7,7 +7,7 @@
- require File.expand_path(File.join(File.dirname(__FILE__),
-                                    %w[.. example_helper]))
- 
--img = "#{Prawn::BASEDIR}/data/images/letterhead.jpg"
-+img = "#{Prawn::DATADIR}/images/letterhead.jpg"
- 
- Prawn::Document.generate("background.pdf",
-                          :background => img,
---- a/manual/example_helper.rb
-+++ b/manual/example_helper.rb
-@@ -143,11 +143,11 @@
-   
-       text(extract_introduction_text(data), :inline_format => true)
- 
--      kai_file = "#{Prawn::BASEDIR}/data/fonts/gkai00mp.ttf"
-+      kai_file = "#{Prawn::DATADIR}/fonts/gkai00mp.ttf"
-       font_families["Kai"] = {
-         :normal => { :file => kai_file, :font => "Kai" }
-       }
--      dejavu_file = "#{Prawn::BASEDIR}/data/fonts/DejaVuSans.ttf"
-+      dejavu_file = "#{Prawn::DATADIR}/fonts/DejaVuSans.ttf"
-       font_families["DejaVu"] = {
-         :normal => { :file => dejavu_file, :font => "DejaVu" }
-       }
---- a/manual/images/absolute_position.rb
-+++ b/manual/images/absolute_position.rb
-@@ -17,7 +17,7 @@
-   y_position = cursor
-   text "The image won't go below this line of text."
-   
--  image "#{Prawn::BASEDIR}/data/images/fractal.jpg", :at => [200, y_position]
-+  image "#{Prawn::DATADIR}/images/fractal.jpg", :at => [200, y_position]
-   
-   text "And this line of text will go just below the previous one."
- end
---- a/manual/images/fit.rb
-+++ b/manual/images/fit.rb
-@@ -15,7 +15,7 @@
-   
-   text "Using the fit option"
-   bounding_box([0, cursor], :width => size, :height => size) do
--    image "#{Prawn::BASEDIR}/data/images/pigs.jpg", :fit => [size, size]
-+    image "#{Prawn::DATADIR}/images/pigs.jpg", :fit => [size, size]
-     stroke_bounds
-   end
- end
---- a/manual/images/horizontal.rb
-+++ b/manual/images/horizontal.rb
-@@ -16,10 +16,10 @@
-     
-     [:left, :center, :right].each do |position|
-       text "Image aligned to the #{position}."
--      image "#{Prawn::BASEDIR}/data/images/stef.jpg", :position => position
-+      image "#{Prawn::DATADIR}/images/stef.jpg", :position => position
-     end
-     
-     text "The next image has a 50 point offset from the left boundary"
--    image "#{Prawn::BASEDIR}/data/images/stef.jpg", :position => 50
-+    image "#{Prawn::DATADIR}/images/stef.jpg", :position => 50
-   end
- end
---- a/manual/images/plain_image.rb
-+++ b/manual/images/plain_image.rb
-@@ -14,5 +14,5 @@
- filename = File.basename(__FILE__).gsub('.rb', '.pdf')
- Prawn::Example.generate(filename) do
-   text "The image will go right below this line of text."
--  image "#{Prawn::BASEDIR}/data/images/pigs.jpg"
-+  image "#{Prawn::DATADIR}/images/pigs.jpg"
- end
---- a/manual/images/scale.rb
-+++ b/manual/images/scale.rb
-@@ -11,13 +11,13 @@
- filename = File.basename(__FILE__).gsub('.rb', '.pdf')
- Prawn::Example.generate(filename) do
-   text "Normal size"
--  image "#{Prawn::BASEDIR}/data/images/stef.jpg"
-+  image "#{Prawn::DATADIR}/images/stef.jpg"
-   move_down 10
-   
-   text "Scaled to 50%"
--  image "#{Prawn::BASEDIR}/data/images/stef.jpg", :scale => 0.5
-+  image "#{Prawn::DATADIR}/images/stef.jpg", :scale => 0.5
-   move_down 10
-   
-   text "Scaled to 200%"
--  image "#{Prawn::BASEDIR}/data/images/stef.jpg", :scale => 2
-+  image "#{Prawn::DATADIR}/images/stef.jpg", :scale => 2
- end
---- a/manual/images/vertical.rb
-+++ b/manual/images/vertical.rb
-@@ -15,13 +15,13 @@
-     
-     [:top, :center, :bottom].each do |vposition|
-       text "Image vertically aligned to the #{vposition}.", :valign => vposition
--      image "#{Prawn::BASEDIR}/data/images/stef.jpg", :position => 250,
-+      image "#{Prawn::DATADIR}/images/stef.jpg", :position => 250,
-                                                       :vposition => vposition
-     end
-     
-     text_box "The next image has a 100 point offset from the top boundary",
-              :at => [bounds.width - 110, bounds.top - 10], :width => 100
--    image "#{Prawn::BASEDIR}/data/images/stef.jpg", :position => :right,
-+    image "#{Prawn::DATADIR}/images/stef.jpg", :position => :right,
-                                                     :vposition => 100
-   end
- end
---- a/manual/images/width_and_height.rb
-+++ b/manual/images/width_and_height.rb
-@@ -13,13 +13,13 @@
- filename = File.basename(__FILE__).gsub('.rb', '.pdf')
- Prawn::Example.generate(filename) do
-   text "Scale by setting only the width"
--  image "#{Prawn::BASEDIR}/data/images/pigs.jpg", :width => 150
-+  image "#{Prawn::DATADIR}/images/pigs.jpg", :width => 150
-   move_down 10
-   
-   text "Scale by setting only the height"
--  image "#{Prawn::BASEDIR}/data/images/pigs.jpg", :height => 100
-+  image "#{Prawn::DATADIR}/images/pigs.jpg", :height => 100
-   move_down 10
-   
-   text "Stretch to fit the width and height provided"
--  image "#{Prawn::BASEDIR}/data/images/pigs.jpg", :width => 500, :height => 100
-+  image "#{Prawn::DATADIR}/images/pigs.jpg", :width => 500, :height => 100
- end
---- a/manual/table/image_cells.rb
-+++ b/manual/table/image_cells.rb
-@@ -17,7 +17,7 @@
- 
- filename = File.basename(__FILE__).gsub('.rb', '.pdf')
- Prawn::Example.generate(filename) do
--  image = "#{Prawn::BASEDIR}/data/images/prawn.png"
-+  image = "#{Prawn::DATADIR}/images/prawn.png"
- 
-   table [
-     ["Standard image cell",   {:image => image}],
---- a/manual/templates/full_template.rb
-+++ b/manual/templates/full_template.rb
-@@ -11,7 +11,7 @@
- require File.expand_path(File.join(File.dirname(__FILE__),
-                                    %w[.. example_helper]))
- 
--filename = "#{Prawn::BASEDIR}/data/pdfs/multipage_template.pdf"
-+filename = "#{Prawn::DATADIR}/pdfs/multipage_template.pdf"
- 
- Prawn::Example.generate("full_template.pdf", :template => filename) do
-   go_to_page(page_count)
---- a/manual/templates/page_template.rb
-+++ b/manual/templates/page_template.rb
-@@ -22,7 +22,7 @@
-   url = "https://github.com/sandal/prawn/raw/master/data/pdfs/form.pdf"
-   formatted_text [{:text => url, :link => url}]
-   
--  filename = "#{Prawn::BASEDIR}/data/pdfs/form.pdf"
-+  filename = "#{Prawn::DATADIR}/pdfs/form.pdf"
-   start_new_page(:template => filename)
-   
-   start_new_page(:template => filename, :template_page => 2)
---- a/manual/text/fallback_fonts.rb
-+++ b/manual/text/fallback_fonts.rb
-@@ -9,11 +9,11 @@
- 
- filename = File.basename(__FILE__).gsub('.rb', '.pdf')
- Prawn::Example.generate(filename) do
--  file = "#{Prawn::BASEDIR}/data/fonts/gkai00mp.ttf"
-+  file = "#{Prawn::DATADIR}/fonts/gkai00mp.ttf"
-   font_families["Kai"] = {
-     :normal => { :file => file, :font => "Kai" }
-   }
--  file = "#{Prawn::BASEDIR}/data/fonts/Action Man.dfont"
-+  file = "#{Prawn::DATADIR}/fonts/Action Man.dfont"
-   font_families["Action Man"] = {
-     :normal      => { :file => file, :font => "ActionMan" },
-   }
---- a/manual/text/line_wrapping.rb
-+++ b/manual/text/line_wrapping.rb
-@@ -29,7 +29,7 @@
-     "nearer your destination the more you're slip#{nbsp}sliding away."
-   move_down 20
- 
--  font("#{Prawn::BASEDIR}/data/fonts/gkai00mp.ttf", :size => 16) do
-+  font("#{Prawn::DATADIR}/fonts/gkai00mp.ttf", :size => 16) do
-     long_text = "No word boundaries:\n更可怕的是,同质化竞争对手可以按照URL中后面这个ID来遍历您的DB中的内容,写个小爬虫把你的页面上的关键信息顺次爬下来也不是什么难事,这样的话,你就非常被动了。更可怕的是,同质化竞争对手可以按照URL中后面这个ID来遍历您的DB中的内容,写个小爬虫把你的页面上的关键信息顺次爬下来也不是什么难事,这样的话,你就非常被动了。"
-     text long_text
-     move_down 20
---- a/manual/text/registering_families.rb
-+++ b/manual/text/registering_families.rb
-@@ -15,7 +15,7 @@
- Prawn::Example.generate(filename) do
-   # Registering a single TTF font
-   font_families.update("Chalkboard" => {
--    :normal => "#{Prawn::BASEDIR}/data/fonts/Chalkboard.ttf"
-+    :normal => "#{Prawn::DATADIR}/fonts/Chalkboard.ttf"
-   })
-   
-   font("Chalkboard") do
-@@ -24,7 +24,7 @@
-   move_down 20
-   
-   # Registering a DFONT package
--  font_path = "#{Prawn::BASEDIR}/data/fonts/Action Man.dfont"
-+  font_path = "#{Prawn::DATADIR}/fonts/Action Man.dfont"
-   font_families.update("Action Man" => {
-     :normal      => { :file => font_path, :font => "ActionMan" },
-     :italic      => { :file => font_path, :font => "ActionMan-Italic" },
---- a/manual/text/right_to_left_text.rb
-+++ b/manual/text/right_to_left_text.rb
-@@ -16,7 +16,7 @@
-   # set the direction document-wide
-   self.text_direction = :rtl
- 
--  font("#{Prawn::BASEDIR}/data/fonts/gkai00mp.ttf", :size => 16) do
-+  font("#{Prawn::DATADIR}/fonts/gkai00mp.ttf", :size => 16) do
-     long_text = "写个小爬虫把你的页面上的关键信息顺次爬下来也不是什么难事写个小爬虫把你的页面上的关键信息顺次爬下来也不是什么难事写个小爬虫把你的页面上的关键信息顺次爬下来也不是什么难事写个小"
-     text long_text
-     move_down 20
diff --git a/debian/patches/0210_change_spec_data_to_datadir_pdfs.patch b/debian/patches/0210_change_spec_data_to_datadir_pdfs.patch
deleted file mode 100644
index 08b3ade..0000000
--- a/debian/patches/0210_change_spec_data_to_datadir_pdfs.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Description: reflect the fact that spec/data moved to data/spec
- The specs use some (one) pdf files stored in spec/data. In order to test the
- library installed in debian/ruby-prawn/, these files are moved to data/spec, so
- that they can be installed too (see debian/ruby-prawn.install).
- The code of the specs has to be modified to find correctly the files which moved away.
-Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2014-01-16
-
-Index: ruby-prawn/spec/object_store_spec.rb
-===================================================================
---- ruby-prawn.orig/spec/object_store_spec.rb	2014-01-16 12:09:40.000000000 -0600
-+++ ruby-prawn/spec/object_store_spec.rb	2014-01-16 12:11:00.000000000 -0600
-@@ -16,20 +16,20 @@
-   end
- 
-   it "should import objects from an existing PDF" do
--    filename = "#{Prawn::BASEDIR}/spec/data/curves.pdf"
-+    filename = "#{Prawn::DATADIR}/spec/curves.pdf"
-     store = PDF::Core::ObjectStore.new(:template => filename)
-     store.size.should == 5
-   end
- 
-   it "should point to existing roots when importing objects from an existing PDF" do
--    filename = "#{Prawn::BASEDIR}/spec/data/curves.pdf"
-+    filename = "#{Prawn::DATADIR}/spec/curves.pdf"
-     store = PDF::Core::ObjectStore.new(:template => filename)
-     store.info.class.should == PDF::Core::Reference
-     store.root.class.should == PDF::Core::Reference
-   end
- 
-   it "should initialize with pages when importing objects from an existing PDF" do
--    filename = "#{Prawn::BASEDIR}/spec/data/curves.pdf"
-+    filename = "#{Prawn::DATADIR}/spec/curves.pdf"
-     store = PDF::Core::ObjectStore.new(:template => filename)
-     store.pages.data[:Count].should == 1
-   end
-Index: ruby-prawn/spec/template_spec_obsolete.rb
-===================================================================
---- ruby-prawn.orig/spec/template_spec_obsolete.rb	2014-01-16 12:09:40.000000000 -0600
-+++ ruby-prawn/spec/template_spec_obsolete.rb	2014-01-16 12:09:40.000000000 -0600
-@@ -3,7 +3,7 @@
- 
- describe "Document built from a template" do
-   it "should have the same page count as the source document" do
--    filename = "#{Prawn::BASEDIR}/spec/data/curves.pdf"
-+    filename = "#{Prawn::DATADIR}/spec/curves.pdf"
-     @pdf = Prawn::Document.new(:template => filename)
-     page_counter = PDF::Inspector::Page.analyze(@pdf.render)
- 
-@@ -18,14 +18,14 @@
- 
- 
-   it "should have start with the Y cursor at the top of the document" do
--    filename = "#{Prawn::BASEDIR}/spec/data/curves.pdf"
-+    filename = "#{Prawn::DATADIR}/spec/curves.pdf"
- 
-     @pdf = Prawn::Document.new(:template => filename)
-     (@pdf.y == nil).should == false
-   end
- 
-   it "should respect margins set by Prawn" do
--    filename = "#{Prawn::BASEDIR}/spec/data/curves.pdf"
-+    filename = "#{Prawn::DATADIR}/spec/curves.pdf"
- 
-     @pdf = Prawn::Document.new(:template => filename, :margin => 0)
-     @pdf.page.margins.should == { :left   => 0,
-@@ -52,7 +52,7 @@
-   end
- 
-   it "should not add an extra restore_graphics_state operator to the end of any content stream" do
--    filename = "#{Prawn::BASEDIR}/spec/data/curves.pdf"
-+    filename = "#{Prawn::DATADIR}/spec/curves.pdf"
- 
-     @pdf = Prawn::Document.new(:template => filename)
-     output = StringIO.new(@pdf.render)
-@@ -196,7 +196,7 @@
- end
- 
- describe "Document#start_new_page with :template option" do
--  filename = "#{Prawn::BASEDIR}/spec/data/curves.pdf"
-+  filename = "#{Prawn::DATADIR}/spec/curves.pdf"
- 
-   it "should set the imported page's parent to the document pages catalog" do
-     @pdf = Prawn::Document.new()
diff --git a/debian/patches/0600_add_require_date_table_cell.rb b/debian/patches/0600_add_require_date_table_cell.rb
deleted file mode 100644
index 09a1648..0000000
--- a/debian/patches/0600_add_require_date_table_cell.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: add missing require 'date' statement
- The file lib/prawn/table/cell.rb uses the test .kind_of?(Date) but the class
- Date is not defined.
-Bug: https://github.com/sandal/prawn/issues/298
-Author: Cédric Boutillier <cedric.boutillier at gmail.com>
-Last-Update: 2011-11-22
-
---- a/lib/prawn/table/cell.rb
-+++ b/lib/prawn/table/cell.rb
-@@ -6,6 +6,8 @@
- #
- # This is free software. Please see the LICENSE and COPYING files for details.
- 
-+require "date"
-+
- module Prawn
-   class Document
- 
diff --git a/debian/patches/0700_dont_call_git_from_manual.patch b/debian/patches/0700_dont_call_git_from_manual.patch
deleted file mode 100644
index bb7e5b4..0000000
--- a/debian/patches/0700_dont_call_git_from_manual.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: do not call Git from the manual
- There is no reason to have gotten prawn from a Git repository
-Bug: https://github.com/prawnpdf/prawn/issues/545#issuecomment-37019036
-Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2014-03-07
-
---- a/manual/manual/cover.rb
-+++ b/manual/manual/cover.rb
-@@ -26,10 +26,9 @@
-   #long git commit hash
-   #commit = `git show --pretty=%H`
-   #short git commit hash
--  commit = `git show --pretty=%h`
-+  #commit = `git show --pretty=%h`
-   formatted_text_box([  {:text => "Last Update: #{Time.now.strftime("%Y-%m-%d")}\n"+
--                                  "Prawn Version: #{Prawn::VERSION}\n"+
--                                  "git commit: #{commit}",
-+                                  "Prawn Version: #{Prawn::VERSION}\n",
-                          :size => 12}
-                     ],   :at => [390, cursor - 620])
-   
diff --git a/debian/patches/1001_fix_encoding_in_font_spec.patch b/debian/patches/1001_fix_encoding_in_font_spec.patch
deleted file mode 100644
index 6d641a7..0000000
--- a/debian/patches/1001_fix_encoding_in_font_spec.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Fix encoding of the result of a test of font_spec.rb
- encode_text method returns in that case a 8 bit ASCII string, not 7 bit.
-From: James Healy <jimmy at deefa.com>
-Origin: https://github.com/prawnpdf/prawn/commit/0ceab27
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676199 
-Bug: https: https://github.com/prawnpdf/prawn/issues/357
-Last-Update: 2011-06-12
-
---- a/spec/font_spec.rb
-+++ b/spec/font_spec.rb
-@@ -293,8 +293,8 @@
-   it "should encode text without kerning by default" do
-     @activa.encode_text("To").should == [[0, "To"]]
- 
--    tele = (RUBY_VERSION < '1.9') ? "T\216l\216" :
--      "T\216l\216".force_encoding("US-ASCII")
-+    tele = "T\216l\216"
-+    tele.force_encoding("binary") if tele.respond_to?(:force_encoding)
-     @activa.encode_text("Télé").should == [[0, tele]]
- 
-     @activa.encode_text("Technology").should == [[0, "Technology"]]
diff --git a/debian/patches/1002_define_external_encoding_for_manual.patch b/debian/patches/1002_define_external_encoding_for_manual.patch
deleted file mode 100644
index 3c157dd..0000000
--- a/debian/patches/1002_define_external_encoding_for_manual.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Set default external encoding with Ruby 1.9 for the manual
- This is needed to successfully build the manual on systems with non unicode
- locale
-Author: Cédric Boutillier <boutil at debian.org>
-Bug: https://github.com/prawnpdf/prawn/pull/358
-Last-Update: 2012-06-12
-
---- a/manual/manual/manual.rb
-+++ b/manual/manual/manual.rb
-@@ -2,6 +2,8 @@
- #
- # Generates the Prawn by example manual.
- #
-+Encoding.default_external = "UTF-8" if defined? Encoding
-+
- require File.expand_path(File.join(File.dirname(__FILE__),
-                                    %w[.. example_helper]))
- 
diff --git a/debian/patches/series b/debian/patches/series
index 876adc0..1ee169b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,16 +1,8 @@
 0100_remove_bundler_rubygems_stuff.patch
-#0102_simply_require_ttfunk.patch
-#0105_remove_rubygems_loadpath_stuff_manual.patch
 0200_replace_BASEDIR_data_by_DATADIR.patch
-#0205_replace_BASEDIR_data_by_DATADIR_manual.patch
-#0210_change_spec_data_to_datadir_pdfs.patch
 0300_fix_paths.patch
 0400_use_system_fonts.patch
 0405_use_system_fonts_manual.patch
 0500_disable_tests_using_removed_files.patch
-#0600_add_require_date_table_cell.rb
-#1001_fix_encoding_in_font_spec.patch
-#1002_define_external_encoding_for_manual.patch
-#0700_dont_call_git_from_manual.patch
 0600_replace_require_relative_manual.patch
 0650_move_VERSION.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-prawn.git



More information about the Pkg-ruby-extras-commits mailing list