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

[terceiro-guest at alioth.debian.org]

Author: terceiro-guest
Date: 2007-12-14 18:50:56 +0000 (Fri, 14 Dec 2007)
New Revision: 2271

Modified:
   tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk
   tools/ruby-pkg-tools/trunk/debian/changelog
   tools/ruby-pkg-tools/trunk/debian/control
Log:
installing symlink to packaged setup.rb if no setup.rb is found



Modified: tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk
===================================================================
--- tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk	2007-12-13 20:05:42 UTC (rev 2270)
+++ tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk	2007-12-14 18:50:56 UTC (rev 2271)
@@ -34,13 +34,15 @@
 
 include /usr/share/ruby-pkg-tools/1/class/ruby-common.mk
 
+PACKAGED_RUBY_SETUP_CMD = /usr/lib/ruby/1.8/setup.rb
 DEB_RUBY_SETUP_CMD = setup.rb
 DEB_RUBY_CONFIG_ARGS = --installdirs=std
 DEB_RUBY_CLEAN_TARGET = distclean
+DEB_RUBY_INSTALL_SETUP_CMD = [ -f $(DEB_RUBY_SETUP_CMD) ] || ln -s $(PACKAGED_RUBY_SETUP_CMD) $(DEB_RUBY_SETUP_CMD)
 
-
 # Build simple packages
 $(patsubst %,build/%,$(DEB_RUBY_SIMPLE_PACKAGES)) :: build/% :
+	$(DEB_RUBY_INSTALL_SETUP_CMD)
 	cd $(DEB_SRCDIR) && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS) && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) setup
 	$(call push_cfg_file,$(cdbs_curpkg))
 
@@ -64,8 +66,10 @@
 
 
 clean::
+	$(DEB_RUBY_INSTALL_SETUP_CMD)
 	/usr/bin/ruby $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS)
 	/usr/bin/ruby $(DEB_RUBY_SETUP_CMD) $(DEB_RUBY_CLEAN_TARGET)
 	rm -f $(DEB_SRCDIR)/.config-*
+	[ -L $(DEB_RUBY_SETUP_CMD) ] && rm -f $(DEB_RUBY_SETUP_CMD)
 
 endif

Modified: tools/ruby-pkg-tools/trunk/debian/changelog
===================================================================
--- tools/ruby-pkg-tools/trunk/debian/changelog	2007-12-13 20:05:42 UTC (rev 2270)
+++ tools/ruby-pkg-tools/trunk/debian/changelog	2007-12-14 18:50:56 UTC (rev 2271)
@@ -15,8 +15,15 @@
   * fixed Vcs-*: point to dir containing debian/, not dir containing
     trunk/
 
- -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Wed, 12 Dec 2007 12:32:00 +0100
+  [ Antonio Terceiro ]
+  * 1/class/ruby-setup-rb.mk: installing a symbolic link to packaged setup.rb
+    in build directory root when maintainer wants to use setup.rb but the
+    package does not provide one. Original idea and initial patch by
+    Gunnar Wolf.
+  * debian/control: added depencency on libsetup-ruby1.8
 
+ -- Antonio Terceiro <terceiro at softwarelivre.org>  Thu, 13 Dec 2007 17:48:10 -0300
+
 ruby-pkg-tools (0.12) unstable; urgency=low
 
   [ Lucas Nussbaum ]

Modified: tools/ruby-pkg-tools/trunk/debian/control
===================================================================
--- tools/ruby-pkg-tools/trunk/debian/control	2007-12-13 20:05:42 UTC (rev 2270)
+++ tools/ruby-pkg-tools/trunk/debian/control	2007-12-14 18:50:56 UTC (rev 2271)
@@ -10,7 +10,7 @@
 
 Package: ruby-pkg-tools
 Architecture: all
-Depends: ruby, rdoc
+Depends: ruby, rdoc, libsetup-ruby1.8
 Recommends: svn-buildpackage, devscripts, libwww-perl
 Description: Tools for building Debian Ruby packages
  This package contains some useful tools for building Debian Ruby packages