[DRE-commits] r3476 - packages/libjson-ruby/trunk/debian

[Ryan Niebur]

Author: ryan52-guest
Date: 2009-04-28 05:06:04 +0000 (Tue, 28 Apr 2009)
New Revision: 3476

Modified:
   packages/libjson-ruby/trunk/debian/changelog
   packages/libjson-ruby/trunk/debian/compat
   packages/libjson-ruby/trunk/debian/control
   packages/libjson-ruby/trunk/debian/rules
Log:
* debhelper 5
* change section to ruby
* debian policy 3.8.1
* add dependency on ${misc:Depends}
* stop setup.rb from changing the shebang
* instead of installing the included prototype in the examples,
  symlink to the one from the libjs-prototype package, and depend on
  it

Modified: packages/libjson-ruby/trunk/debian/changelog
===================================================================
--- packages/libjson-ruby/trunk/debian/changelog	2009-04-28 04:37:23 UTC (rev 3475)
+++ packages/libjson-ruby/trunk/debian/changelog	2009-04-28 05:06:04 UTC (rev 3476)
@@ -3,8 +3,16 @@
   * 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
+  * instead of installing the included prototype in the examples,
+    symlink to the one from the libjs-prototype package, and depend on
+    it
 
- -- Ryan Niebur <ryanryan52 at gmail.com>  Mon, 27 Apr 2009 21:36:05 -0700
+ -- Ryan Niebur <ryanryan52 at gmail.com>  Mon, 27 Apr 2009 22:05:16 -0700
 
 libjson-ruby (1.1.2-1) unstable; urgency=low
 

Modified: packages/libjson-ruby/trunk/debian/compat
===================================================================
--- packages/libjson-ruby/trunk/debian/compat	2009-04-28 04:37:23 UTC (rev 3475)
+++ packages/libjson-ruby/trunk/debian/compat	2009-04-28 05:06:04 UTC (rev 3476)
@@ -1 +1 @@
-4
+5

Modified: packages/libjson-ruby/trunk/debian/control
===================================================================
--- packages/libjson-ruby/trunk/debian/control	2009-04-28 04:37:23 UTC (rev 3475)
+++ packages/libjson-ruby/trunk/debian/control	2009-04-28 05:06:04 UTC (rev 3476)
@@ -1,18 +1,18 @@
 Source: libjson-ruby
-Section: libs
+Section: ruby
 Priority: optional
 Maintainer: Esteban Manchado Velázquez <zoso at debian.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Paul van Tilburg <paulvt at debian.org>, Antonio Terceiro <terceiro at softwarelivre.org>, Ryan Niebur <ryanryan52 at gmail.com>
-Build-Depends: ruby-pkg-tools (>= 0.13), cdbs, debhelper (>= 4.1.0), ruby1.8-dev
+Build-Depends: ruby-pkg-tools (>= 0.13), cdbs, debhelper (>= 5), ruby1.8-dev
 Build-Depends-Indep: ruby1.8, rdoc, graphviz
-Standards-Version: 3.7.3
+Standards-Version: 3.8.1
 Homepage: http://json.rubyforge.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ruby-extras/packages/libjson-ruby/trunk/
 Vcs-Svn: svn://svn.debian.org/pkg-ruby-extras/packages/libjson-ruby/trunk/
 
 Package: libjson-ruby
 Architecture: all
-Depends: libjson-ruby1.8
+Depends: ${misc:Depends}, libjson-ruby1.8
 Description: JSON library for Ruby (default Ruby version)
  This library implements the JSON (JavaScript Object Notation) specification in
  Ruby, allowing the developer to easily convert data between Ruby and JSON. You
@@ -25,6 +25,7 @@
 Package: libjson-ruby-doc
 Architecture: all
 Section: doc
+Depends: ${misc:Depends}, libjs-prototype
 Description: JSON library for Ruby (documentation)
  This library implements the JSON (JavaScript Object Notation) specification in
  Ruby, allowing the developer to easily convert data between Ruby and JSON. You
@@ -46,7 +47,7 @@
 Package: edit-json
 Architecture: all
 Section: devel
-Depends: ruby, libjson-ruby1.8, libgtk2-ruby1.8
+Depends: ${misc:Depends}, ruby, 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/rules
===================================================================
--- packages/libjson-ruby/trunk/debian/rules	2009-04-28 04:37:23 UTC (rev 3475)
+++ packages/libjson-ruby/trunk/debian/rules	2009-04-28 05:06:04 UTC (rev 3476)
@@ -7,6 +7,11 @@
 BASEDIR = `pwd`/debian
 DEB_INSTALL_MANPAGES_edit-json = debian/edit_json.1 debian/prettify_json.1
 
+binary-install/libjson-ruby-doc::
+	rm $(BASEDIR)/libjson-ruby-doc/usr/share/doc/libjson-ruby-doc/examples/prototype.js
+	ln -s /usr/share/javascript/prototype/prototype.js $(BASEDIR)/libjson-ruby-doc/usr/share/doc/libjson-ruby-doc/examples/prototype.js
+	dh_link -plibjson-ruby-doc
+
 install/libjson-ruby1.8::
 	# remove files already installed in edit-json package
 	rm -r $(BASEDIR)/libjson-ruby1.8/usr/bin
@@ -21,3 +26,7 @@
 	   $(BASEDIR)/edit-json/usr/bin/edit_json
 	mv $(BASEDIR)/edit-json/usr/bin/prettify_json.rb \
 	   $(BASEDIR)/edit-json/usr/bin/prettify_json
+	sed -i 's,#! /usr/bin/ruby1.8,#!/usr/bin/env ruby,' $(BASEDIR)/edit-json/usr/bin/prettify_json $(BASEDIR)/edit-json/usr/bin/edit_json
+
+clean::
+	sed -i 's,#! /usr/bin/ruby1.8,#!/usr/bin/env ruby,' bin/edit_json.rb bin/prettify_json.rb