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

[Uwe Steinmann]

Author: steinm
Date: 2006-06-02 12:09:46 +0000 (Fri, 02 Jun 2006)
New Revision: 200

Modified:
   trunk/dh-make-pecl
Log:
- use xmlstarlet instead of xsltproc when possible, to reduce the number
  of extra xslt scripts
- new version 0.2.0
- initial support for version 2.0 of package.xml


Modified: trunk/dh-make-pecl
===================================================================
--- trunk/dh-make-pecl	2006-06-02 12:07:25 UTC (rev 199)
+++ trunk/dh-make-pecl	2006-06-02 12:09:46 UTC (rev 200)
@@ -9,7 +9,7 @@
 # at http://www.gnu.org/.
 
 PROGNAME=dh-make-pecl
-PROGVERSION=0.0.13
+PROGVERSION=0.2.0
 PREFIX=/usr
 
 DEBPACKAGEPREFIX=php
@@ -130,6 +130,9 @@
 	exit 0
 fi
 
+# sets $PACKAGEVERSION, which is the version of the package.xml file
+get_packageversion
+
 # get information about package from package.xml
 eval_package
 
@@ -158,11 +161,9 @@
 mkdir ${SRCPACKAGEDIR}
 mv ${PHP_PKG_NAME}-${VERSION} ${SRCPACKAGEDIR}
 mv package.xml ${SRCPACKAGEDIR}
-#tar czf ${DEBPACKAGEPREFIX}-${PHP_PKG_LOWNAME}_${VERSION}.orig.tar.gz ${SRCPACKAGEDIR}
 mkdir -p ${SRCPACKAGEDIR}/debian
 
 cp ${DEBTEMPDIR}/compat ${SRCPACKAGEDIR}/debian
-#cp ${DEBTEMPDIR}/templates ${SRCPACKAGEDIR}/debian
 
 install_docfiles
 install_expfiles
@@ -245,10 +246,12 @@
 		-e "s/##binpackagename##/${BINPACKAGE}/g" \
 		${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
+#	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
 	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
+#	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
 	echo ""  >> ${SRCPACKAGEDIR}/debian/control
 	echo ""  >> ${SRCPACKAGEDIR}/debian/control
 
@@ -263,7 +266,5 @@
     -e "s/##architecture##/${DEPARCH}/g" \
     -i ${SRCPACKAGEDIR}/debian/control
 
-#xsltproc --nonet --novalid  --param Element "/*/description" ${PREFIX}/share/dh-make-php/xslt/common.xsl ${PACKAGEXML} | fold -s -w 70|sed -e "s§^[ \t]*$§.§g" -e "s§^§ §g" >> ${SRCPACKAGEDIR}/debian/control
-
 echo "modules/${PHP_PKG_LOWNAME}.so" > ${SRCPACKAGEDIR}/debian/pecl