[DRE-commits] r1976 - in packages/libjson-ruby/trunk/debian: . patches

[paulvt at alioth.debian.org]

Author: paulvt
Date: 2007-10-07 12:06:22 +0000 (Sun, 07 Oct 2007)
New Revision: 1976

Added:
   packages/libjson-ruby/trunk/debian/prettify_json.1
Modified:
   packages/libjson-ruby/trunk/debian/changelog
   packages/libjson-ruby/trunk/debian/control
   packages/libjson-ruby/trunk/debian/patches/00-icon-path.patch
   packages/libjson-ruby/trunk/debian/rules
Log:
* Added a man-page for prettify_json(1).
* Changed the depend of edit-json on libgtk2-ruby to libgtk2-ruby1.8 to
  follow convention.
* Use a modified source tarball which renames data/ -> docs/ since
  it uses setup.rb with a non-setup.rb-compliant dir layout. Also
  all files have been processed by dos2unix.

Modified: packages/libjson-ruby/trunk/debian/changelog
===================================================================
--- packages/libjson-ruby/trunk/debian/changelog	2007-10-07 11:47:12 UTC (rev 1975)
+++ packages/libjson-ruby/trunk/debian/changelog	2007-10-07 12:06:22 UTC (rev 1976)
@@ -11,8 +11,14 @@
     for it is used in the clean target.
   * Updated setup.rb so that it supports the distclean target.
   * Added myself to the Uploaders field.
+  * Added a man-page for prettify_json(1).
+  * Changed the depend of edit-json on libgtk2-ruby to libgtk2-ruby1.8 to
+    follow convention.
+  * Use a modified source tarball which renames data/ -> docs/ since
+    it uses setup.rb with a non-setup.rb-compliant dir layout. Also
+    all files have been processed by dos2unix.
 
- -- Paul van Tilburg <paulvt at debian.org>  Tue, 19 Jun 2007 11:12:13 +0100
+ -- Paul van Tilburg <paulvt at debian.org>  Sun, 07 Oct 2007 14:05:59 +0200
 
 libjson-ruby (0.4.2-1) unstable; urgency=low
 

Modified: packages/libjson-ruby/trunk/debian/control
===================================================================
--- packages/libjson-ruby/trunk/debian/control	2007-10-07 11:47:12 UTC (rev 1975)
+++ packages/libjson-ruby/trunk/debian/control	2007-10-07 12:06:22 UTC (rev 1976)
@@ -34,7 +34,7 @@
 Package: edit-json
 Architecture: all
 Section: devel
-Depends: ruby1.8, libjson-ruby1.8, libgtk2-ruby
+Depends: ruby1.8, libjson-ruby1.8, 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.

Modified: packages/libjson-ruby/trunk/debian/patches/00-icon-path.patch
===================================================================
--- packages/libjson-ruby/trunk/debian/patches/00-icon-path.patch	2007-10-07 11:47:12 UTC (rev 1975)
+++ packages/libjson-ruby/trunk/debian/patches/00-icon-path.patch	2007-10-07 12:06:22 UTC (rev 1976)
@@ -1,7 +1,7 @@
 diff -ur lib/json/editor.rb lib-new/json/editor.rb
 --- lib/json/editor.rb	2006-01-05 00:48:37.000000000 +0000
 +++ lib-new/json/editor.rb	2006-01-05 00:49:32.000000000 +0000
-@@ -26,7 +26,7 @@
+@@ -39,7 +39,7 @@
      def Editor.fetch_icon(name)
        @icon_cache ||= {}
        unless @icon_cache.key?(name)

Added: packages/libjson-ruby/trunk/debian/prettify_json.1
===================================================================
--- packages/libjson-ruby/trunk/debian/prettify_json.1	                        (rev 0)
+++ packages/libjson-ruby/trunk/debian/prettify_json.1	2007-10-07 12:06:22 UTC (rev 1976)
@@ -0,0 +1,21 @@
+.\" 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.

Modified: packages/libjson-ruby/trunk/debian/rules
===================================================================
--- packages/libjson-ruby/trunk/debian/rules	2007-10-07 11:47:12 UTC (rev 1975)
+++ packages/libjson-ruby/trunk/debian/rules	2007-10-07 12:06:22 UTC (rev 1976)
@@ -5,12 +5,14 @@
 include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
 
 BASEDIR = `pwd`/debian
-DEB_INSTALL_MANPAGES_edit-json = debian/edit_json.1
+DEB_INSTALL_MANPAGES_edit-json = debian/edit_json.1 debian/prettify_json.1
 
 common-binary-post-install-indep::
 	# Move edit_json.rb and related files to edit-json package
 	mv $(BASEDIR)/libjson-ruby1.8/usr/bin/edit_json.rb \
 	   $(BASEDIR)/edit-json/usr/bin/edit_json
+	mv $(BASEDIR)/libjson-ruby1.8/usr/bin/prettify_json.rb \
+	   $(BASEDIR)/edit-json/usr/bin/prettify_json
 	mv $(BASEDIR)/libjson-ruby1.8/usr/lib/ruby/1.8/json/editor.rb \
 	   $(BASEDIR)/edit-json/usr/lib/ruby/1.8/json/
 	cp lib/json/*.xpm \