[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 8a56099cfe100ca3da23c2f3f0b2b8ccc19f9dab
Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
Date:   Sun Apr 3 14:11:49 2011 +0200

    cleanup

diff --git a/patches/00-icon-path.patch b/patches/00-icon-path.patch
deleted file mode 100644
index 354ce6b..0000000
--- a/patches/00-icon-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 @@
-     def Editor.fetch_icon(name)
-       @icon_cache ||= {}
-       unless @icon_cache.key?(name)
--        path = File.dirname(__FILE__)
-+        path = '/usr/share/edit-json'
-         @icon_cache[name] = Gdk::Pixbuf.new(File.join(path, name + '.xpm'))
-       end
-      @icon_cache[name]
diff --git a/patches/02-fix-fuzz.rb-shebang.patch b/patches/02-fix-fuzz.rb-shebang.patch
deleted file mode 100644
index 37d849b..0000000
--- a/patches/02-fix-fuzz.rb-shebang.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-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
-@@ -1,3 +1,5 @@
-+#!/usr/bin/env ruby
-+
- require 'json'
- 
- require 'iconv'
diff --git a/patches/03-bin-prettify_json.rb-Set-max_nesting-and-create_addi.patch b/patches/03-bin-prettify_json.rb-Set-max_nesting-and-create_addi.patch
deleted file mode 100644
index ff167b2..0000000
--- a/patches/03-bin-prettify_json.rb-Set-max_nesting-and-create_addi.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 0d8c191b4fab5d87f71f3d9e9b2b1269a8e618b8 Mon Sep 17 00:00:00 2001
-From: Laurent Arnoud <laurent at spkdev.net>
-Date: Fri, 8 Oct 2010 23:59:16 +0200
-Forwarded: yes (http://github.com/flori/json/pull/48)
-Subject: [PATCH] bin/prettify_json.rb: Set max_nesting and create_additions to false like edit_json
-
-it refers to http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=561839
-
-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
- end
- 
- filename = nil
--json = JSON[
--  if args.empty?
--    STDIN.read
--  else
--    File.read filename = args.first
--  end
--]
-+str = nil
-+json_opts = {:max_nesting => false, :create_additions => false}
-+
-+if args.empty?
-+  str = STDIN.read
-+else
-+  str = File.read(filename = args.first)
-+end
-+
-+json = JSON[str, json_opts]
- 
- output = if opts['s']
--  JSON.fast_generate json
-+  JSON.fast_generate json, json_opts
- else # default is -l
--  JSON.pretty_generate json
-+  JSON.pretty_generate json, json_opts
- end
- 
- if opts['i'] && filename
--- 
-1.7.1
-
diff --git a/patches/series b/patches/series
deleted file mode 100644
index c04c1d7..0000000
--- a/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-00-icon-path.patch
-02-fix-fuzz.rb-shebang.patch
-03-bin-prettify_json.rb-Set-max_nesting-and-create_addi.patch

-- 
Packaging for ruby-json