[DRE-commits] [SCM] ruby-json.git branch, master, updated. upstream/1.5.3-26-g7a1050f

Lucas Nussbaum lucas at lucas-nussbaum.net
Sun Sep 25 09:37:57 UTC 2011 

The following commit has been merged in the master branch:
commit 56892b8513aaf093579611eb4994c679c75ce4b3
Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
Date:   Sun Sep 25 11:28:44 2011 +0200

    New upstream release. executables were dropped from this gem.
    
    * New upstream release.
    * executables have been moved to a separate gem.
      + drop edit-json package.

diff --git a/debian/changelog b/debian/changelog
index 8bb7c88..29d9bd2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-json (1.6.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * executables have been moved to a separate gem.
+    + drop edit-json package.
+
+ -- Lucas Nussbaum <lucas at debian.org>  Sun, 25 Sep 2011 11:24:54 +0200
+
 ruby-json (1.5.3-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 1fa904b..46723c4 100644
--- a/debian/control
+++ b/debian/control
@@ -24,14 +24,6 @@ Description: JSON library for Ruby
  can think of it as a low fat alternative to XML, if you want to store data to
  disk or transmit it over a network rather than use a verbose markup language.
 
-Package: edit-json
-Architecture: all
-Section: devel
-Depends: ${misc:Depends}, ruby | ruby-interpreter, ruby-json, libgtk2-ruby1.8
-Description: JSON files editor
- Small graphical JSON editor. It allows creating and modifying JSON (JavaScript
- Object Notation) files with the aid of a graphical user interface.
-
 Package: libjson-ruby
 Section: oldlibs
 Architecture: all
diff --git a/debian/edit-json.1 b/debian/edit-json.1
deleted file mode 100644
index fc6d5ad..0000000
--- a/debian/edit-json.1
+++ /dev/null
@@ -1,22 +0,0 @@
-.\" In .TH, FOO should be all caps, SECTION should be 1-8, maybe w/ subsection
-.\" other parms are allowed: see man(7), man(1)
-.\"
-.\" This template provided by Tom Christiansen <tchrist at jhereg.perl.com>.
-.\" 
-.TH EDIT-JSON 1
-.SH NAME
-edit-json \- JSON GUI editor
-.SH SYNOPSIS
-JSON-formatted content GUI editor.
-.PP
-.B edit-json
-.SH DESCRIPTION
-.\" Putting a newline after each sentence can generate better output.
-Graphical interface for editing JSON-formatted files. It allows to graphically
-see some JSON structure, and edit it, adding and removing nodes of different
-tyoes, modifying their value, etc.
-.SH AUTHOR
-Florian Frank <flori at ping.de>
-.SH NOTES
-This manual page was written by Esteban Manchado Vel\['a]zquez
-<zoso at debian.org> for the Debian project, but can be used by others.
diff --git a/debian/edit-json.dirs b/debian/edit-json.dirs
deleted file mode 100644
index f5cf2ca..0000000
--- a/debian/edit-json.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/ruby/1.8/json
-usr/share/edit-json
diff --git a/debian/edit-json.install b/debian/edit-json.install
deleted file mode 100644
index 9e22175..0000000
--- a/debian/edit-json.install
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/json/editor.rb   usr/lib/ruby/1.8/json
-lib/json/*.xpm       usr/share/edit-json
diff --git a/debian/edit-json.manpages b/debian/edit-json.manpages
deleted file mode 100644
index b87c200..0000000
--- a/debian/edit-json.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/edit-json.1
-debian/prettify-json.1
diff --git a/debian/patches/00-icon-path.patch b/debian/patches/00-icon-path.patch
deleted file mode 100644
index 27dfab7..0000000
--- a/debian/patches/00-icon-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)
--        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/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
deleted file mode 100644
index 19b8232..0000000
--- a/debian/patches/03-bin-prettify_json.rb-Set-max_nesting-and-create_addi.patch
+++ /dev/null
@@ -1,46 +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(-)
-
---- 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
diff --git a/debian/patches/series b/debian/patches/series
index 9ed6307..594b1c7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-00-icon-path.patch
 02-fix-fuzz.rb-shebang.patch
-03-bin-prettify_json.rb-Set-max_nesting-and-create_addi.patch
 04-fix-tests-path.patch
diff --git a/debian/prettify-json.1 b/debian/prettify-json.1
deleted file mode 100644
index 6d90a6c..0000000
--- a/debian/prettify-json.1
+++ /dev/null
@@ -1,21 +0,0 @@
-.\" In .TH, FOO should be all caps, SECTION should be 1-8, maybe w/ subsection
-.\" other parms are allowed: see man(7), man(1)
-.\"
-.\" This template provided by Tom Christiansen <tchrist at jhereg.perl.com>.
-.\" 
-.TH PRETTIFY-JSON 1
-.SH NAME
-prettify-json \- JSON file pretty-printer
-.SH SYNOPSIS
-.PP
-.B prettify-json [file ...]
-.SH DESCRIPTION
-.\" Putting a newline after each sentence can generate better output.
-This pretty-printer takes a badly or unformatted JSON file as an argument
-or from standard input and prints a nicely formatted version to standard
-output.
-.SH AUTHOR
-Florian Frank <flori at ping.de>
-.SH NOTES
-This manual page was written by Paul van Tilburg
-<p at debian.org> for the Debian project, but can be used by others.
diff --git a/debian/rules b/debian/rules
index 0ed853d..76ff133 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,19 +19,6 @@ override_dh_auto_install:
 	ln -s generator/generator.so generator.so
 	dh_auto_install
 
-override_dh_install:
-	dh_install
-	# cannot be done in edit-json.dirs in case we are doing a binary-arch build
-	mkdir -p debian/edit-json/usr/bin
-	mv debian/ruby-json/usr/bin/* debian/edit-json/usr/bin/
-	rm -rf debian/ruby-json/usr/bin
-	rm debian/ruby-json/usr/lib/ruby/vendor_ruby/json/editor.rb
-	rm debian/ruby-json/usr/lib/ruby/vendor_ruby/json/*.xpm
-	mv debian/edit-json/usr/bin/edit_json.rb \
-	   debian/edit-json/usr/bin/edit-json
-	mv debian/edit-json/usr/bin/prettify_json.rb \
-	   debian/edit-json/usr/bin/prettify-json
-
 override_dh_auto_clean:
 	dh_auto_clean
 	cd ext/json/ext && rm -f parser.so generator.so

-- 
ruby-json.git

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