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

[Marc Dequènes]

Author: duck
Date: 2006-01-05 22:15:03 +0000 (Thu, 05 Jan 2006)
New Revision: 226

Modified:
   tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk
   tools/ruby-pkg-tools/trunk/debian/changelog
Log:
Removed unneeded variables

Modified: tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk
===================================================================
--- tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk	2006-01-05 20:46:04 UTC (rev 225)
+++ tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk	2006-01-05 22:15:03 UTC (rev 226)
@@ -41,10 +41,7 @@
 DEB_RUBY_LIBDIR=/usr/lib/ruby # FIXME: hardcoded!
 
 DEB_RUBY_SETUP_CMD = setup.rb
-DEB_RUBY_CLEAN_ARGS = 
 DEB_RUBY_CONFIG_ARGS = --siteruby=$(DEB_RUBY_LIBDIR)
-DEB_RUBY_SETUP_ARGS = 
-DEB_RUBY_INSTALL_ARGS_ALL = 
 
 # Separate lib packages from the rest
 LIB_PACKAGE_FILTER = %-ruby $(patsubst %,\%-ruby%,$(DEB_RUBY_VERSIONS))
@@ -65,25 +62,25 @@
 
 # Build regular library packages
 $(patsubst %,build/%,$(DEB_RUBY_REAL_LIB_PACKAGES)) :: build/% :
-	cd $(DEB_SRCDIR) && /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 $(DEB_RUBY_SETUP_ARGS)
+	cd $(DEB_SRCDIR) && /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
 	$(call push_cfg_file,$(cdbs_curpkg))
 
 # Build simple packages
 $(patsubst %,build/%,$(DEB_RUBY_SIMPLE_PACKAGES)) :: build/% :
-	cd $(DEB_SRCDIR) && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS) && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) setup $(DEB_RUBY_SETUP_ARGS)
+	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))
 
 
 # Install regular library packages
 $(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) install --prefix=debian/$(cdbs_curpkg) $(DEB_RUBY_INSTALL_ARGS_ALL) $(DEB_RUBY_INSTALL_ARGS_$(cdbs_curpkg))
+	cd $(DEB_SRCDIR) && /usr/bin/ruby$(cdbs_ruby_ver) $(DEB_RUBY_SETUP_CMD) install --prefix=debian/$(cdbs_curpkg)
 	$(call push_cfg_file,$(cdbs_curpkg))
 
 # Install simple packages
 $(patsubst %,install/%,$(DEB_RUBY_SIMPLE_PACKAGES)) :: install/% :
 	$(call pop_cfg_file,$(cdbs_curpkg))
-	cd $(DEB_SRCDIR) && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) install --prefix=debian/$(cdbs_curpkg) $(DEB_RUBY_INSTALL_ARGS_ALL) $(DEB_RUBY_INSTALL_ARGS_$(cdbs_curpkg))
+	cd $(DEB_SRCDIR) && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) install --prefix=debian/$(cdbs_curpkg)
 	$(call push_cfg_file,$(cdbs_curpkg))
 
 # Generate rdoc documentation for *-doc packages
@@ -97,7 +94,7 @@
 clean::
 # Ignore errors from this rule.  In a tarball build, the file
 # may not exist.
-	-ruby $(DEB_RUBY_SETUP_CMD) distclean $(DEB_RUBY_CLEAN_ARGS)
+	-ruby $(DEB_RUBY_SETUP_CMD) distclean
 	rm -f $(DEB_SRCDIR)/.config-*
 
 endif

Modified: tools/ruby-pkg-tools/trunk/debian/changelog
===================================================================
--- tools/ruby-pkg-tools/trunk/debian/changelog	2006-01-05 20:46:04 UTC (rev 225)
+++ tools/ruby-pkg-tools/trunk/debian/changelog	2006-01-05 22:15:03 UTC (rev 226)
@@ -4,6 +4,9 @@
   * Fixed CDBS class for 'simple packages' case.
   * Ensure we use debhelper scripts only if debhelper class was loaded
     before.
+  * Removed unneeded variables : DEB_RUBY_CLEAN_ARGS,
+    DEB_RUBY_SETUP_ARGS, and DEB_RUBY_INSTALL_ARGS_ALL (based on
+    setup.rb and install.rb capabilities).
 
   [ Thierry Reding ]
   * pkg-ruby-get-sources:
@@ -16,7 +19,7 @@
      + The `--sources' switch can now also handle HTTP, HTTPS and FTP URLs.
      + The script now also has a vi modeline. =)
 
- -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Thu,  5 Jan 2006 21:45:19 +0100
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Thu,  5 Jan 2006 23:14:40 +0100
 
 ruby-pkg-tools (0.5) unstable; urgency=low