[DRE-commits] r2789 - in tools/ruby-pkg-tools/trunk: 1/class debian

[lucas at alioth.debian.org]

Author: lucas
Date: 2008-06-16 12:18:30 +0000 (Mon, 16 Jun 2008)
New Revision: 2789

Modified:
   tools/ruby-pkg-tools/trunk/1/class/ruby-common.mk
   tools/ruby-pkg-tools/trunk/1/class/ruby-extconf-rb.mk
   tools/ruby-pkg-tools/trunk/debian/changelog
Log:
install 1.9 libs to /usr/lib/ruby/1.9.0. fix for #484611

Modified: tools/ruby-pkg-tools/trunk/1/class/ruby-common.mk
===================================================================
--- tools/ruby-pkg-tools/trunk/1/class/ruby-common.mk	2008-06-14 23:26:10 UTC (rev 2788)
+++ tools/ruby-pkg-tools/trunk/1/class/ruby-common.mk	2008-06-16 12:18:30 UTC (rev 2789)
@@ -45,7 +45,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_LIBDIR=$(strip $(shell ruby$(cdbs_ruby_ver) -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]'))
 DEB_RUBY_ARCHDIR=$(strip $(shell ruby$(cdbs_ruby_ver) -rrbconfig -e 'puts Config::CONFIG["archdir"]'))
 
 # Separate lib packages from the rest

Modified: tools/ruby-pkg-tools/trunk/1/class/ruby-extconf-rb.mk
===================================================================
--- tools/ruby-pkg-tools/trunk/1/class/ruby-extconf-rb.mk	2008-06-14 23:26:10 UTC (rev 2788)
+++ tools/ruby-pkg-tools/trunk/1/class/ruby-extconf-rb.mk	2008-06-16 12:18:30 UTC (rev 2789)
@@ -18,7 +18,7 @@
 DEB_RUBY_SETUP_ARGS =
 
 cdbs_pkgdir = $(CURDIR)/debian/$(cdbs_curpkg)
-cdbs_ruby_libdir_ver = $(cdbs_pkgdir)$(DEB_RUBY_LIBDIR)/$(cdbs_ruby_ver)
+cdbs_ruby_libdir_ver = $(cdbs_pkgdir)$(DEB_RUBY_LIBDIR)
 cdbs_ruby_archdir_ver = $(cdbs_pkgdir)$(DEB_RUBY_ARCHDIR)
 
 DEB_RUBY_INSTALL_ARGS = DESTDIR=$(cdbs_pkgdir) \

Modified: tools/ruby-pkg-tools/trunk/debian/changelog
===================================================================
--- tools/ruby-pkg-tools/trunk/debian/changelog	2008-06-14 23:26:10 UTC (rev 2788)
+++ tools/ruby-pkg-tools/trunk/debian/changelog	2008-06-16 12:18:30 UTC (rev 2789)
@@ -1,10 +1,16 @@
 ruby-pkg-tools (0.14) UNRELEASED; urgency=low
 
+  [ Antonio Terceiro ]
   * debian/control: fix typo in package description. Thanks to Kobayashi
     Noritada (Closes: #471517)
 
- -- Antonio Terceiro <terceiro at softwarelivre.org>  Tue, 18 Mar 2008 16:38:35 -0300
+  [ Lucas Nussbaum ]
+  * extconf class: install ruby 1.9 libraries to /usr/lib/ruby/1.9.0, not
+    /usr/lib/ruby/1.9. If your package uses this class and builds libs for
+    1.9, you must build-depend on ruby-pkg-tools >= 0.14. Closes: #484611.
 
+ -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Mon, 16 Jun 2008 14:16:49 +0200
+
 ruby-pkg-tools (0.13) unstable; urgency=low
 
   [ Antonio Terceiro ]