[DRE-commits] [SCM] Packaging for ruby-json branch, master, updated. upstream/1.5.1-11-gdbac6b3

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit 6e86528cbc31beac16945b24b63613d782d058d0
Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
Date:   Sun Apr 3 14:08:26 2011 +0200

    refresh patches

diff --git a/debian/patches/00-icon-path.patch b/debian/patches/00-icon-path.patch
index 354ce6b..27dfab7 100644
--- a/debian/patches/00-icon-path.patch
+++ b/debian/patches/00-icon-path.patch
@@ -1,7 +1,6 @@
-diff -Nur -x '*.orig' -x '*~' trunk/lib/json/editor.rb trunk.new/lib/json/editor.rb
---- trunk/lib/json/editor.rb	2009-04-29 06:10:53.000000000 -0700
-+++ trunk.new/lib/json/editor.rb	2009-05-10 23:03:15.000000000 -0700
-@@ -39,7 +39,7 @@
+--- a/lib/json/editor.rb
++++ b/lib/json/editor.rb
+@@ -38,7 +38,7 @@ module JSON
      def Editor.fetch_icon(name)
        @icon_cache ||= {}
        unless @icon_cache.key?(name)
diff --git a/debian/patches/02-fix-fuzz.rb-shebang.patch b/debian/patches/02-fix-fuzz.rb-shebang.patch
index 37d849b..4fa9b0c 100644
--- a/debian/patches/02-fix-fuzz.rb-shebang.patch
+++ b/debian/patches/02-fix-fuzz.rb-shebang.patch
@@ -1,6 +1,5 @@
-diff -Nur -x '*.orig' -x '*~' trunk/tools/fuzz.rb trunk.new/tools/fuzz.rb
---- trunk/tools/fuzz.rb	2009-04-29 19:29:12.000000000 -0700
-+++ trunk.new/tools/fuzz.rb	2009-05-10 23:03:32.000000000 -0700
+--- a/tools/fuzz.rb
++++ b/tools/fuzz.rb
 @@ -1,3 +1,5 @@
 +#!/usr/bin/env ruby
 +
diff --git a/debian/patches/03-bin-prettify_json.rb-Set-max_nesting-and-create_addi.patch b/debian/patches/03-bin-prettify_json.rb-Set-max_nesting-and-create_addi.patch
index ff167b2..19b8232 100644
--- a/debian/patches/03-bin-prettify_json.rb-Set-max_nesting-and-create_addi.patch
+++ b/debian/patches/03-bin-prettify_json.rb-Set-max_nesting-and-create_addi.patch
@@ -11,8 +11,6 @@ Signed-off-by: Laurent Arnoud <laurent at spkdev.net>
  bin/prettify_json.rb |   21 ++++++++++++---------
  1 files changed, 12 insertions(+), 9 deletions(-)
 
-diff --git a/bin/prettify_json.rb b/bin/prettify_json.rb
-index 5e1f806..943546f 100755
 --- a/bin/prettify_json.rb
 +++ b/bin/prettify_json.rb
 @@ -53,18 +53,21 @@ EOT
@@ -46,6 +44,3 @@ index 5e1f806..943546f 100755
  end
  
  if opts['i'] && filename
--- 
-1.7.1
-

-- 
Packaging for ruby-json