[Dh-make-php-commits] r205 - in branches/R-0-1-1: . debian pear.template

[Charles Fry]

Author: cfry-guest
Date: 2006-06-05 12:27:07 +0000 (Mon, 05 Jun 2006)
New Revision: 205

Modified:
   branches/R-0-1-1/debian/changelog
   branches/R-0-1-1/pear.mk
   branches/R-0-1-1/pear.template/rules
Log:
move debhelper call from pear.mk to pear.template/rules


Modified: branches/R-0-1-1/debian/changelog
===================================================================
--- branches/R-0-1-1/debian/changelog	2006-06-05 12:23:55 UTC (rev 204)
+++ branches/R-0-1-1/debian/changelog	2006-06-05 12:27:07 UTC (rev 205)
@@ -1,3 +1,9 @@
+dh-make-php (0.1.1) unstable; urgency=low
+
+  * call debhelper.mk from debian/rules not pear.mk
+
+ -- Charles Fry <debian at frogcircus.org>  Mon,  5 Jun 2006 08:24:14 -0400
+
 dh-make-php (0.1.0) unstable; urgency=low
 
   * made it native debian package

Modified: branches/R-0-1-1/pear.mk
===================================================================
--- branches/R-0-1-1/pear.mk	2006-06-05 12:23:55 UTC (rev 204)
+++ branches/R-0-1-1/pear.mk	2006-06-05 12:27:07 UTC (rev 205)
@@ -26,8 +26,6 @@
 ifndef _cdbs_class_pear
 _cdbs_class_pear := 1
 
-include $(_cdbs_rules_path)/debhelper.mk$(_cdbs_makefile_suffix)
-
 # modify these variables as necessary
 PEAR_PKG := $(shell /usr/bin/xmlstarlet sel -t -v '/package/name/text()' package.xml)
 PEAR_PKG_VERSION := $(shell /usr/bin/xmlstarlet sel -t -v '/package/release/version/text()' package.xml)

Modified: branches/R-0-1-1/pear.template/rules
===================================================================
--- branches/R-0-1-1/pear.template/rules	2006-06-05 12:23:55 UTC (rev 204)
+++ branches/R-0-1-1/pear.template/rules	2006-06-05 12:27:07 UTC (rev 205)
@@ -1,4 +1,5 @@
 #!/usr/bin/make -f
 # template debian/rules provided by dh-make-php.
 
+include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/pear.mk