[Dh-make-php-commits] r235 - trunk

[Uwe Steinmann]

Author: steinm
Date: 2006-11-03 11:52:03 +0100 (Fri, 03 Nov 2006)
New Revision: 235

Modified:
   trunk/dh-make-pear
   trunk/dh-make-pecl
   trunk/dh-make-php.lib
Log:
- set XMLSTARLET to /usr/bin/xmlstarlet or /usr/bin/xml and use
  it instead of xmlstarlet


Modified: trunk/dh-make-pear
===================================================================
--- trunk/dh-make-pear	2006-11-03 10:17:19 UTC (rev 234)
+++ trunk/dh-make-pear	2006-11-03 10:52:03 UTC (rev 235)
@@ -9,7 +9,7 @@
 # at http://www.gnu.org/.
 
 PROGNAME=dh-make-pear
-PROGVERSION=0.0.13
+PROGVERSION=0.2.0
 PREFIX=/usr
 
 DEBPACKAGEPREFIX=php
@@ -18,7 +18,13 @@
 # if you change the examples directory make sure to adjust the
 # regular expression to set the PACKAGEDOCFILES
 PACKAGEEXPFILES="examples"
-
+# There has been versions of xmlstarlet which were called xml
+# instead of xmlstarlet
+if [ -x /usr/bin/xmlstarlet ]; then
+	XMLSTARLET=/usr/bin/xmlstarlet
+else
+	XMLSTARLET=/usr/bin/xml
+fi
 DEBMAINTAINER=
 DEPENDS=
 DEPARCH=all

Modified: trunk/dh-make-pecl
===================================================================
--- trunk/dh-make-pecl	2006-11-03 10:17:19 UTC (rev 234)
+++ trunk/dh-make-pecl	2006-11-03 10:52:03 UTC (rev 235)
@@ -18,7 +18,13 @@
 # if you change the examples directory make sure to adjust the
 # regular expression to set the PACKAGEDOCFILES
 PACKAGEEXPFILES="examples"
-
+# There has been versions of xmlstarlet which were called xml
+# instead of xmlstarlet
+if [ -x /usr/bin/xmlstarlet ]; then
+	XMLSTARLET=/usr/bin/xmlstarlet
+else
+	XMLSTARLET=/usr/bin/xml
+fi
 DEBMAINTAINER=
 DEPENDS=
 BUILDDEPENDS=
@@ -257,11 +263,11 @@
 		${DEBTEMPDIR}/control-bin >> ${SRCPACKAGEDIR}/debian/control
 
 #	xsltproc --nonet --novalid --param Element "/package/summary" ${PREFIX}/share/dh-make-php/xslt/common.xsl ${SRCPACKAGEDIR}/package.xml|sed -e 's/^/ /g' >> ${SRCPACKAGEDIR}/debian/control
-	xmlstarlet sel -T -t -v "/package/summary" ${SRCPACKAGEDIR}/package.xml|sed -e 's/^/ /g' >> ${SRCPACKAGEDIR}/debian/control
+	${XMLSTARLET} sel -T -t -v "/package/summary" ${SRCPACKAGEDIR}/package.xml|sed -e 's/^/ /g' >> ${SRCPACKAGEDIR}/debian/control
 	echo ""  >> ${SRCPACKAGEDIR}/debian/control
 	echo " ."  >> ${SRCPACKAGEDIR}/debian/control
 #	xsltproc --nonet --novalid --param Element "/package/description" ${PREFIX}/share/dh-make-php/xslt/common.xsl ${SRCPACKAGEDIR}/package.xml|fold -s -w70|sed -e 's/^[[:space:]]*$/./g'|sed -e 's/^/ /g' >> ${SRCPACKAGEDIR}/debian/control
-	xmlstarlet sel -T -t -v "/package/description" ${SRCPACKAGEDIR}/package.xml|fold -s -w70|sed -e 's/^[[:space:]]*$/./g'|sed -e 's/^/ /g' >> ${SRCPACKAGEDIR}/debian/control
+	${XMLSTARLET} sel -T -t -v "/package/description" ${SRCPACKAGEDIR}/package.xml|fold -s -w70|sed -e 's/^[[:space:]]*$/./g'|sed -e 's/^/ /g' >> ${SRCPACKAGEDIR}/debian/control
 	echo ""  >> ${SRCPACKAGEDIR}/debian/control
 	echo ""  >> ${SRCPACKAGEDIR}/debian/control
 

Modified: trunk/dh-make-php.lib
===================================================================
--- trunk/dh-make-php.lib	2006-11-03 10:17:19 UTC (rev 234)
+++ trunk/dh-make-php.lib	2006-11-03 10:52:03 UTC (rev 235)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 get_packageversion() {
-	PACKAGEVERSION=$(xmlstarlet sel -t -m "/package" -v "@version" package.xml)
+	PACKAGEVERSION=$(${XMLSTARLET} sel -t -m "/package" -v "@version" package.xml)
 }
 
 get_zendapi() {
@@ -73,11 +73,11 @@
 eval_package() {
 	if [ "${PACKAGEVERSION}" = "2.0" ] ; then
 	echo "lajdflaljfa"
-		VERSION=$(xmlstarlet sel -t -v "/package/version/release" package.xml)
-		LICENSE=$(xmlstarlet sel -t -v "/package/license" package.xml)
+		VERSION=$(${XMLSTARLET} sel -t -v "/package/version/release" package.xml)
+		LICENSE=$(${XMLSTARLET} sel -t -v "/package/license" package.xml)
 		UPSTREAM=$(xsltproc --nonet --novalid ${PREFIX}/share/dh-make-php/xslt/maintainers-2.0.xsl package.xml | sed -e 's/; $//g')
-		PACKAGEDOCFILES=$(xmlstarlet sel -t -m "/package/contents/*/file[@role='doc']" -v "@name" -o " " package.xml | sed -e 's# examples/[^ ]*##g' -e 's#^examples/[^ ]*##g')
-		PACKAGETESTFILES=$(xmlstarlet sel -t -m "/package/contents/*/file[@role='test']" -v "@name" -o " " package.xml | sed -e 's# examples/[^ ]*##g' -e 's#^examples/[^ ]*##g')
+		PACKAGEDOCFILES=$(${XMLSTARLET} sel -t -m "/package/contents/*/file[@role='doc']" -v "@name" -o " " package.xml | sed -e 's# examples/[^ ]*##g' -e 's#^examples/[^ ]*##g')
+		PACKAGETESTFILES=$(${XMLSTARLET} sel -t -m "/package/contents/*/file[@role='test']" -v "@name" -o " " package.xml | sed -e 's# examples/[^ ]*##g' -e 's#^examples/[^ ]*##g')
 	else
 		VERSION=$(xsltproc --nonet --novalid --param Element "/package/release/version" ${PREFIX}/share/dh-make-php/xslt/common.xsl package.xml)
 		LICENSE=$(xsltproc --nonet --novalid --param Element "/package/release/license" ${PREFIX}/share/dh-make-php/xslt/common.xsl package.xml)