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

[Thierry Reding]

Author: beatle-guest
Date: 2006-03-21 11:42:37 +0000 (Tue, 21 Mar 2006)
New Revision: 362

Modified:
   tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk
   tools/ruby-pkg-tools/trunk/debian/changelog
Log:
* Added a configurable variable DEB_RUBY_CLEAN_ARGS to the ruby-setup.rb CDBS
  class which can be used to override the default clean command (distclean)
  passed to the setup.rb/install.rb script.

* Now runs `config' before each `clean' to avoid failures caused by missing
  configuration.



Modified: tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk
===================================================================
--- tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk	2006-03-21 10:35:50 UTC (rev 361)
+++ tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk	2006-03-21 11:42:37 UTC (rev 362)
@@ -36,6 +36,7 @@
 
 DEB_RUBY_SETUP_CMD = setup.rb
 DEB_RUBY_CONFIG_ARGS = --siteruby=$(DEB_RUBY_LIBDIR)
+DEB_RUBY_CLEAN_ARGS = distclean
 
 
 # Build simple packages
@@ -48,8 +49,9 @@
 $(patsubst %,install/%,$(DEB_RUBY_REAL_LIB_PACKAGES)) :: install/% :
 	$(call pop_cfg_file,$(cdbs_curpkg))
 	cd $(DEB_SRCDIR)
-	/usr/bin/ruby$(cdbs_ruby_ver) $(DEB_RUBY_SETUP_CMD) distclean
 	/usr/bin/ruby$(cdbs_ruby_ver) $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS)
+	/usr/bin/ruby$(cdbs_ruby_ver) $(DEB_RUBY_SETUP_CMD) $(DEB_RUBY_CLEAN_ARGS)
+	/usr/bin/ruby$(cdbs_ruby_ver) $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS)
 	/usr/bin/ruby$(cdbs_ruby_ver) $(DEB_RUBY_SETUP_CMD) setup
 	/usr/bin/ruby$(cdbs_ruby_ver) $(DEB_RUBY_SETUP_CMD) install --prefix=debian/$(cdbs_curpkg)
 	$(call push_cfg_file,$(cdbs_curpkg))
@@ -62,9 +64,8 @@
 
 
 clean::
-# Ignore errors from this rule.  In a tarball build, the file
-# may not exist.
-	-ruby $(DEB_RUBY_SETUP_CMD) distclean
+	/usr/bin/ruby $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS)
+	/usr/bin/ruby $(DEB_RUBY_SETUP_CMD) $(DEB_RUBY_CLEAN_ARGS)
 	rm -f $(DEB_SRCDIR)/.config-*
 
 endif

Modified: tools/ruby-pkg-tools/trunk/debian/changelog
===================================================================
--- tools/ruby-pkg-tools/trunk/debian/changelog	2006-03-21 10:35:50 UTC (rev 361)
+++ tools/ruby-pkg-tools/trunk/debian/changelog	2006-03-21 11:42:37 UTC (rev 362)
@@ -1,10 +1,18 @@
 ruby-pkg-tools (0.8) UNRELEASED; urgency=low
 
+  [ Paul van Tilburg ]
   * Updated the sources file to use the upstream-cache for clean tarballs
     of facets (upstream original missing) and commandline (contained CVS dirs).
 
- -- Paul van Tilburg <paulvt at debian.org>  Tue, 21 Mar 2006 11:32:17 +0100
+  [ Thierry Reding ]
+  * Added a configurable variable DEB_RUBY_CLEAN_ARGS to the ruby-setup.rb
+    CDBS class which can be used to override the default clean command
+    (distclean) passed to the setup.rb/install.rb script.
+  * Now runs `config' before each `clean' to avoid failures caused by missing
+    configuration.
 
+ -- Thierry Reding <thierry at doppeltgemoppelt.de>  Tue, 21 Mar 2006 12:42:09 +0100
+
 ruby-pkg-tools (0.7) unstable; urgency=low
 
   [ Lucas Nussbaum ]