[Pkg-ruby-extras-maintainers] r885 - in tools/ruby-pkg-tools/trunk: 1/class debian

[Ari Pollak]

Author: ari
Date: 2006-10-07 15:55:56 +0000 (Sat, 07 Oct 2006)
New Revision: 885

Modified:
   tools/ruby-pkg-tools/trunk/1/class/ruby-common.mk
   tools/ruby-pkg-tools/trunk/debian/changelog
Log:
* Fix DEB_RUBY_ARCHDIR in ruby-common.mk to call the current ruby version
  instead of just ruby, so installing an extension will work with ruby 1.9.

Modified: tools/ruby-pkg-tools/trunk/1/class/ruby-common.mk
===================================================================
--- tools/ruby-pkg-tools/trunk/1/class/ruby-common.mk	2006-10-06 23:46:52 UTC (rev 884)
+++ tools/ruby-pkg-tools/trunk/1/class/ruby-common.mk	2006-10-07 15:55:56 UTC (rev 885)
@@ -46,7 +46,7 @@
 DEB_RUBY_VERSIONS = 1.8 1.9
 DEB_RUBY_DEFAULT_VERSION = 1.8
 DEB_RUBY_LIBDIR=$(strip $(shell ruby -rrbconfig -e 'puts Config::CONFIG["libdir"]')/ruby)
-DEB_RUBY_ARCHDIR=$(strip $(shell ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]'))
+DEB_RUBY_ARCHDIR=$(strip $(shell ruby$(cdbs_ruby_ver) -rrbconfig -e 'puts Config::CONFIG["archdir"]'))
 
 # Separate lib packages from the rest
 LIB_PACKAGE_FILTER = %-ruby $(patsubst %,\%-ruby%,$(DEB_RUBY_VERSIONS))

Modified: tools/ruby-pkg-tools/trunk/debian/changelog
===================================================================
--- tools/ruby-pkg-tools/trunk/debian/changelog	2006-10-06 23:46:52 UTC (rev 884)
+++ tools/ruby-pkg-tools/trunk/debian/changelog	2006-10-07 15:55:56 UTC (rev 885)
@@ -6,8 +6,10 @@
   [ Ari Pollak ]
   * Removed rcov and libgems-ruby from the sources file, since they
     have watch files.
+  * Fix DEB_RUBY_ARCHDIR in ruby-common.mk to call the current ruby version
+    instead of just ruby, so installing an extension will work with ruby 1.9.
 
- -- Ari Pollak <ari at debian.org>  Fri,  6 Oct 2006 19:30:55 -0400
+ -- Ari Pollak <ari at debian.org>  Sat,  7 Oct 2006 11:51:41 -0400
 
 ruby-pkg-tools (0.11.1) unstable; urgency=low