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

[Marc Dequènes]

Author: duck
Date: 2006-01-05 20:46:04 +0000 (Thu, 05 Jan 2006)
New Revision: 225

Modified:
   tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk
   tools/ruby-pkg-tools/trunk/debian/changelog
Log:
Ensure we use debhelper scripts only if debhelper class was loaded before

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 19:48:18 UTC (rev 224)
+++ tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk	2006-01-05 20:46:04 UTC (rev 225)
@@ -87,8 +87,11 @@
 	$(call push_cfg_file,$(cdbs_curpkg))
 
 # Generate rdoc documentation for *-doc packages
+# Just be sure you include debhelper.mk before including this file.
+ifdef _cdbs_rules_debhelper
 $(patsubst %,binary-install/%,$(DEB_RUBY_LIB_DOC_PACKAGES)) :: binary-install/% :
 	dh_rdoc -p$(cdbs_curpkg)
+endif
 
 
 clean::

Modified: tools/ruby-pkg-tools/trunk/debian/changelog
===================================================================
--- tools/ruby-pkg-tools/trunk/debian/changelog	2006-01-05 19:48:18 UTC (rev 224)
+++ tools/ruby-pkg-tools/trunk/debian/changelog	2006-01-05 20:46:04 UTC (rev 225)
@@ -2,6 +2,8 @@
 
   [ Marc Dequènes (Duck) ]
   * Fixed CDBS class for 'simple packages' case.
+  * Ensure we use debhelper scripts only if debhelper class was loaded
+    before.
 
   [ Thierry Reding ]
   * pkg-ruby-get-sources:
@@ -14,7 +16,7 @@
      + The `--sources' switch can now also handle HTTP, HTTPS and FTP URLs.
      + The script now also has a vi modeline. =)
 
- -- Thierry Reding <thierry at doppeltgemoppelt.de>  Thu,  5 Jan 2006 20:45:50 +0100
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Thu,  5 Jan 2006 21:45:19 +0100
 
 ruby-pkg-tools (0.5) unstable; urgency=low