[DRE-commits] r4296 - trunk/soap4r/debian

[Ryan Niebur]

Author: ryan
Date: 2009-11-01 23:26:50 +0000 (Sun, 01 Nov 2009)
New Revision: 4296

Modified:
   trunk/soap4r/debian/changelog
   trunk/soap4r/debian/rules
   trunk/soap4r/debian/soap4r.examples
Log:
more fixing

Modified: trunk/soap4r/debian/changelog
===================================================================
--- trunk/soap4r/debian/changelog	2009-11-01 23:17:58 UTC (rev 4295)
+++ trunk/soap4r/debian/changelog	2009-11-01 23:26:50 UTC (rev 4296)
@@ -5,6 +5,7 @@
   * new upstream release
   * switch to cdbs
   * add actual packages
+    - both ruby1.8 (Closes: 531794) and ruby1.9 (closes: 472307) packages
   * clean stuff up
 
  -- Ryan Niebur <ryan at debian.org>  Sun, 01 Nov 2009 15:14:40 -0800

Modified: trunk/soap4r/debian/rules
===================================================================
--- trunk/soap4r/debian/rules	2009-11-01 23:17:58 UTC (rev 4295)
+++ trunk/soap4r/debian/rules	2009-11-01 23:26:50 UTC (rev 4296)
@@ -3,4 +3,13 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
 
-DEB_RUBY_LIBDIR=$(strip $(shell ruby$(cdbs_ruby_ver) -rrbconfig -e 'puts Config::CONFIG["vendorlibdir"]'))
+ifeq ($(cdbs_ruby_ver), 1.8)
+DEB_RUBY_LIBDIR = $(strip $(shell ruby$(cdbs_ruby_ver) -rrbconfig -e 'puts Config::CONFIG["vendorlibdir"]'))
+DEB_RUBY_CONFIG_ARGS =  --installdirs=std --librubyver=$(DEB_RUBY_LIBDIR)
+endif
+
+install/libsoap4r-ruby1.8 ::
+	rm -fr debian/libsoap4r-ruby1.8/usr/bin/
+
+install/libsoap4r-ruby1.9 ::
+	rm -fr debian/libsoap4r-ruby1.9/usr/bin/

Modified: trunk/soap4r/debian/soap4r.examples
===================================================================
--- trunk/soap4r/debian/soap4r.examples	2009-11-01 23:17:58 UTC (rev 4295)
+++ trunk/soap4r/debian/soap4r.examples	2009-11-01 23:26:50 UTC (rev 4296)
@@ -1,2 +1,3 @@
 sample
 test
+bin