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

Lucas Nussbaum lucas at lucas-nussbaum.net
Sun Apr 3 12:03:05 UTC 2011


The following commit has been merged in the master branch:
commit 80e353ed5ffe67a64768d3a1adaa7902b8d13f10
Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
Date:   Sun Apr 3 13:59:47 2011 +0200

    merged with old ruby-pkg-tools packaging

diff --git a/debian/changelog b/debian/changelog
index d8e78f0..2e85678 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,163 @@
 ruby-json (1.5.1-1) UNRELEASED; urgency=low
 
-  * Initial release (Closes: #nnnn)
+  * New upstream release. Closes: #617721
+  * Switch to gem2deb-based packaging. Source and binary package renamed to
+    ruby-json. Transitional packages added.
+  * Merge with the old ruby-pkg-tools packaging.
+    + Add patch for prettify_json.rb (Closes: #561839)
 
  -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Sun, 03 Apr 2011 10:05:22 +0200
+
+libjson-ruby (1.4.6-1) unstable; urgency=low
+
+  [Laurent Arnoud]
+  * Team upload.
+  * New upstream release
+  * Switch to dpkg-source 3.0 (quilt) format
+  * Debian policy 3.9.1
+  * Add patch for prettify_json.rb (Closes: #561839)
+  [Joshua Timberman]
+  * Fixes bugs between 1.1.9 and 1.4.6, including bug affecting ohai
+    (Closes: #596351)
+  * Update watchfile for githubredir and upstream version tagging.
+
+ -- Laurent Arnoud <laurent at spkdev.net>  Fri, 22 Oct 2010 22:14:17 +0200
+
+libjson-ruby (1.1.9-1) unstable; urgency=low
+
+  * New upstream release
+  * Debian Policy 3.8.3
+
+ -- Ryan Niebur <ryanryan52 at gmail.com>  Wed, 02 Sep 2009 17:36:43 -0700
+
+libjson-ruby (1.1.7-1) unstable; urgency=low
+
+  * New upstream release
+  * Debian Policy 3.8.2
+
+ -- Ryan Niebur <ryanryan52 at gmail.com>  Thu, 09 Jul 2009 03:35:48 -0700
+
+libjson-ruby (1.1.6-1) unstable; urgency=low
+
+  * move myself to Maintainer
+  * new upstream release
+  * refresh patches
+  * add README.source
+  * delete empty directories
+
+ -- Ryan Niebur <ryanryan52 at gmail.com>  Sun, 10 May 2009 23:25:50 -0700
+
+libjson-ruby (1.1.4-1) unstable; urgency=low
+
+  [ Ryan Niebur ]
+  * New upstream release
+  * add myself to Uploaders
+  * refresh patches
+  * debhelper 5
+  * change section to ruby
+  * debian policy 3.8.1
+  * add dependency on ${misc:Depends}
+  * stop setup.rb from changing the shebang in the source
+  * always change the shebang in the installed version of edit-json to
+    ruby1.8
+  * instead of installing the included prototype in the examples,
+    symlink to the one from the libjs-prototype package, and depend on
+    it
+
+  [ Antonio Terceiro ]
+  * Added DM-Upload-Allowed flag to debian/control.
+
+ -- Antonio Terceiro <terceiro at softwarelivre.org>  Fri, 01 May 2009 20:52:44 -0300
+
+libjson-ruby (1.1.2-1) unstable; urgency=low
+
+  [ Paul van Tilburg ]
+  * New upstream release.
+  * Added Homepage and Vcs-* headers to debian/control.
+  * Bumped standards version to 3.7.3; performed minor fixes to
+    debian/copyright.
+  * Added build-depend on ruby1.8-dev for mkmf.rb. (Closes: #465673)
+  * Bumped ruby-pkg-tools version depend to >= 0.13, since it will be
+    using Debian's setup.rb.
+  * Modified debian/libjson-ruby-doc.examples to install data/* instead
+    of examples/* so that we do not have to have a modified tarball.
+  * Remove cruft installed by setup.rb to /usr/share in the hook in
+    debian/rules.
+  * Changed architecture of libjson-ruby1.8 to 'any'!  Added ${shlib:Depends}
+    and ${misc:Depends} to the dependencies.
+
+  [ Antonio Terceiro ]
+  * debian/copyight: recoded as UTF-8.
+  * debian/edit-json.install: added.
+  * debian/rules:
+    - fixed typo in custom install target for libjson-ruby1.8.
+    - removing stuff instead of moving them to edit-json package. These are
+      now installed by the newly added debian/edit-json.install.
+    - renaming binaries to remove .rb suffix in edit-json packag.e
+  * debian/control: added myself to Uploaders field.
+
+ -- Paul van Tilburg <paulvt at debian.org>  Fri, 04 Apr 2008 22:55:06 +0200
+
+libjson-ruby (1.1.1-1) unstable; urgency=low
+
+  [ Esteban Manchado Velázquez ]
+  * Changed edit-json section to "devel" (again???).
+
+  [ Paul van Tilburg ]
+  * New upstream release.
+  * Adapted debian/control, debian/rules, and remove debian/control.in to
+    drop the Uploaders rule.
+  * Moved the build-depend-indep on ruby-pkg-tools to the build-depends
+    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 ruby1.8 dependency of the edit-json package to ruby.
+  * 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.
+  * Added some example files to libjson-ruby-doc.
+  * Added 02-fix-fuzz.rb-shebang.patch to add a missing shebang to the
+    executable fuzz.rb tool.
+  * Removed unnecessary 01-fix-edit_json-shebang.patch.
+
+ -- Paul van Tilburg <paulvt at debian.org>  Sun, 07 Oct 2007 15:04:24 +0200
+
+libjson-ruby (0.4.2-1) unstable; urgency=low
+
+  * New upstream release
+  * Changed edit-json section to "devel"
+  * Bump Standards-Version to 3.7.2 (no changes required)
+
+ -- Esteban Manchado Velázquez <zoso at debian.org>  Sat, 21 Oct 2006 21:27:43 +0100
+
+libjson-ruby (0.4.1-1) unstable; urgency=low
+
+  * New upstream version
+  * Add watch file
+  * Changed Section to "libs" for every package except libjson-ruby-doc
+  * Adapted to ruby-pkg-tools 0.8
+
+ -- Esteban Manchado Velázquez <zoso at debian.org>  Sun, 16 Apr 2006 16:35:26 +0100
+
+libjson-ruby (0.4.0-3) unstable; urgency=low
+
+  * Changed libjson-ruby-doc package Section to "doc".
+  * Set the Maintainer field to myself
+
+ -- Esteban Manchado Velázquez <zoso at debian.org>  Sat, 25 Mar 2006 00:27:42 +0000
+
+libjson-ruby (0.4.0-2) unstable; urgency=low
+
+  * Fixed the errors (missing commas) in the Depend field (closes: #350866).
+  * Added missing build-depend-indep on graphviz.
+
+ -- Paul van Tilburg <paulvt at debian.org>  Wed, 15 Feb 2006 22:22:31 +0000
+
+libjson-ruby (0.4.0-1) unstable; urgency=low
+
+  * Initial upload (Closes: #341904).
+
+ -- Esteban Manchado Velázquez <zoso at debian.org>  Sat,  3 Dec 2005 23:24:14 +0000
diff --git a/debian/control b/debian/control
index 1d609cf..6bb9570 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: ruby-json
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: Lucas Nussbaum <lucas at lucas-nussbaum.net>
+Uploaders: Lucas Nussbaum <lucas at lucas-nussbaum.net>, Antonio Terceiro <terceiro at softwarelivre.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.0)
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.1)
 Standards-Version: 3.9.1
-#Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-json.git
-#Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-json;a=summary
+Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-json.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-json;a=summary
 Homepage: http://flori.github.com/json
 XS-Ruby-Versions: all
 
@@ -15,5 +15,16 @@ Package: ruby-json
 Architecture: any
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 | ruby-interpreter
-Description: JSON Implementation for Ruby
- This is a JSON implementation as a Ruby extension in C.
+Description: JSON library for Ruby
+ This library implements the JSON (JavaScript Object Notation) specification in
+ Ruby, allowing the developer to easily convert data between Ruby and JSON. You
+ 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}, ruby1.8, 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.
diff --git a/debian/copyright b/debian/copyright
index fee5c7b..b74efc1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,27 @@
-FIXME. fill-in with DEP5 copyright file. http://dep.debian.net/deps/dep5/
 Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
 Upstream-Name: json
-Source: FIXME (URL where source can be downloaded)
+Source: https://rubygems.org/gems/json
 
 Files: *
-Copyright: Copyright 1998 John Doe <jdoe at example.com>
-License: GPL-2+
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
+Copyright: Copyright 2005-2007 by Florian Frank <flori at ping.de>
+License: GPL-2
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License Version 2 as published
+ by the Free Software Foundation.
  .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
  .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
 
 Files: debian/*
-Copyright: Copyright 1998 Jane Smith <jsmith at example.net>
-License:
- [LICENSE TEXT]
+Copyright: Copyright 2011 Lucas Nussbaum <lucas at lucas-nussbaum.net>
+License: GPL-2+
diff --git a/debian/edit-json.1 b/debian/edit-json.1
new file mode 100644
index 0000000..fc6d5ad
--- /dev/null
+++ b/debian/edit-json.1
@@ -0,0 +1,22 @@
+.\" 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
new file mode 100644
index 0000000..b210ef5
--- /dev/null
+++ b/debian/edit-json.dirs
@@ -0,0 +1,3 @@
+usr/bin
+usr/lib/ruby/1.8/json
+usr/share/edit-json
diff --git a/debian/edit-json.install b/debian/edit-json.install
new file mode 100644
index 0000000..cc7e72b
--- /dev/null
+++ b/debian/edit-json.install
@@ -0,0 +1,4 @@
+bin/edit_json.rb     usr/bin
+bin/prettify_json.rb usr/bin
+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
new file mode 100644
index 0000000..b87c200
--- /dev/null
+++ b/debian/edit-json.manpages
@@ -0,0 +1,2 @@
+debian/edit-json.1
+debian/prettify-json.1
diff --git a/debian/prettify-json.1 b/debian/prettify-json.1
new file mode 100644
index 0000000..6d90a6c
--- /dev/null
+++ b/debian/prettify-json.1
@@ -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.
diff --git a/debian/ruby-json.docs b/debian/ruby-json.docs
index d1a75b1..b7a518e 100644
--- a/debian/ruby-json.docs
+++ b/debian/ruby-json.docs
@@ -1,3 +1,2 @@
-# FIXME: READMEs found
-# README
-# README-json-jruby.markdown
+README
+README-json-jruby.markdown
diff --git a/debian/ruby-json.examples b/debian/ruby-json.examples
new file mode 100644
index 0000000..7f8eb7d
--- /dev/null
+++ b/debian/ruby-json.examples
@@ -0,0 +1 @@
+tools/*
diff --git a/debian/ruby-test-files.yaml b/debian/ruby-test-files.yaml
deleted file mode 100644
index f4f96ac..0000000
--- a/debian/ruby-test-files.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
---- 
-- ./tests/test_json_encoding.rb
-- ./tests/test_json_addition.rb
-- ./tests/test_json.rb
-- ./tests/test_json_string_matching.rb
-- ./tests/test_json_generate.rb
-- ./tests/test_json_unicode.rb
-- ./tests/test_json_fixtures.rb
diff --git a/debian/rules b/debian/rules
index 76ff133..afe0d7d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,17 @@ override_dh_auto_install:
 	ln -s generator/generator.so generator.so
 	dh_auto_install
 
+override_dh_install:
+	dh_install
+	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

-- 
Packaging for ruby-json



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