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

[terceiro-guest at alioth.debian.org]

Author: terceiro-guest
Date: 2008-03-21 22:13:44 +0000 (Fri, 21 Mar 2008)
New Revision: 2531

Added:
   packages/libjson-ruby/trunk/debian/edit-json.install
Modified:
   packages/libjson-ruby/trunk/debian/changelog
   packages/libjson-ruby/trunk/debian/control
   packages/libjson-ruby/trunk/debian/rules
Log:
installing files at their right places.



Modified: packages/libjson-ruby/trunk/debian/changelog
===================================================================
--- packages/libjson-ruby/trunk/debian/changelog	2008-03-21 21:07:56 UTC (rev 2530)
+++ packages/libjson-ruby/trunk/debian/changelog	2008-03-21 22:13:44 UTC (rev 2531)
@@ -17,8 +17,15 @@
 
   [ 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
+    - remeving 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 package
+  * debian/control: added myself to Uploaders: field
 
- -- Antonio Terceiro <terceiro at softwarelivre.org>  Fri, 21 Mar 2008 18:07:19 -0300
+ -- Antonio Terceiro <terceiro at softwarelivre.org>  Fri, 21 Mar 2008 19:08:46 -0300
 
 libjson-ruby (1.1.1-1) unstable; urgency=low
 

Modified: packages/libjson-ruby/trunk/debian/control
===================================================================
--- packages/libjson-ruby/trunk/debian/control	2008-03-21 21:07:56 UTC (rev 2530)
+++ packages/libjson-ruby/trunk/debian/control	2008-03-21 22:13:44 UTC (rev 2531)
@@ -2,7 +2,7 @@
 Section: libs
 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>
+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>
 Build-Depends: ruby-pkg-tools (>= 0.13), cdbs, debhelper (>= 4.1.0), ruby1.8-dev
 Build-Depends-Indep: ruby1.8, rdoc, graphviz
 Standards-Version: 3.7.3

Added: packages/libjson-ruby/trunk/debian/edit-json.install
===================================================================
--- packages/libjson-ruby/trunk/debian/edit-json.install	                        (rev 0)
+++ packages/libjson-ruby/trunk/debian/edit-json.install	2008-03-21 22:13:44 UTC (rev 2531)
@@ -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

Modified: packages/libjson-ruby/trunk/debian/rules
===================================================================
--- packages/libjson-ruby/trunk/debian/rules	2008-03-21 21:07:56 UTC (rev 2530)
+++ packages/libjson-ruby/trunk/debian/rules	2008-03-21 22:13:44 UTC (rev 2531)
@@ -7,15 +7,17 @@
 BASEDIR = `pwd`/debian
 DEB_INSTALL_MANPAGES_edit-json = debian/edit_json.1 debian/prettify_json.1
 
-install/libkson-ruby1.8::
-	# Move edit_json.rb and related files to edit-json package.
-	mv $(BASEDIR)/libjson-ruby1.8/usr/bin/edit_json.rb \
+install/libjson-ruby1.8::
+	# remove files already installed in edit-json package
+	rm -rf $(BASEDIR)/libjson-ruby1.8/usr/bin
+	rm -f $(BASEDIR)/libjson-ruby1.8/usr/lib/ruby/1.8/json/editor.tb
+	rm -f $(BASEDIR)/libjson-ruby1.8/usr/lib/ruby/1.8/json/*.xpm
+	# Remove erroneously installed examples as shared data (under data/).
+	rm $(BASEDIR)/libjson-ruby1.8/usr/share/*
+
+binary-install/edit-json::
+	# remove .rb suffix from programs
+	mv $(BASEDIR)/edit-json/usr/bin/edit_json.rb \
 	   $(BASEDIR)/edit-json/usr/bin/edit_json
-	mv $(BASEDIR)/libjson-ruby1.8/usr/bin/prettify_json.rb \
+	mv $(BASEDIR)/edit-json/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 \
-	   $(BASEDIR)/edit-json/usr/share/edit-json/
-        # Remove erroneously installed examples as shared data (under data/).
-	rm $(BASEDIR)/libjson-ruby1.8/usr/share/*