[Pkg-ruby-extras-maintainers] r222 - in packages/libjson-ruby/trunk/debian: . patches

[Esteban Manchado Velázquez]

Author: zoso
Date: 2006-01-05 01:38:31 +0000 (Thu, 05 Jan 2006)
New Revision: 222

Added:
   packages/libjson-ruby/trunk/debian/patches/
   packages/libjson-ruby/trunk/debian/patches/00-icon-path.patch
Modified:
   packages/libjson-ruby/trunk/debian/edit-json.dirs
   packages/libjson-ruby/trunk/debian/rules
Log:
- Moved pixmaps to /usr/share/edit-json
- Renamed edit_json.rb to edit_json when installing in /usr/bin


Modified: packages/libjson-ruby/trunk/debian/edit-json.dirs
===================================================================
--- packages/libjson-ruby/trunk/debian/edit-json.dirs	2006-01-05 00:33:16 UTC (rev 221)
+++ packages/libjson-ruby/trunk/debian/edit-json.dirs	2006-01-05 01:38:31 UTC (rev 222)
@@ -1,2 +1,3 @@
 usr/bin
 usr/lib/ruby/1.8/json
+usr/share/edit-json

Added: packages/libjson-ruby/trunk/debian/patches/00-icon-path.patch
===================================================================
--- packages/libjson-ruby/trunk/debian/patches/00-icon-path.patch	2006-01-05 00:33:16 UTC (rev 221)
+++ packages/libjson-ruby/trunk/debian/patches/00-icon-path.patch	2006-01-05 01:38:31 UTC (rev 222)
@@ -0,0 +1,12 @@
+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 @@
+     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]

Modified: packages/libjson-ruby/trunk/debian/rules
===================================================================
--- packages/libjson-ruby/trunk/debian/rules	2006-01-05 00:33:16 UTC (rev 221)
+++ packages/libjson-ruby/trunk/debian/rules	2006-01-05 01:38:31 UTC (rev 222)
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
 include /usr/share/ruby-pkg-tools/1/rules/uploaders.mk
 
@@ -9,8 +10,8 @@
 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/
+	   $(BASEDIR)/edit-json/usr/bin/edit_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 \
-	   $(BASEDIR)/edit-json/usr/lib/ruby/1.8/json/
+	   $(BASEDIR)/edit-json/usr/share/edit-json/