[Dh-make-php-commits] r307 - trunk
steinm at alioth.debian.org
steinm at alioth.debian.org
Tue Mar 4 08:17:56 UTC 2008
Author: steinm
Date: 2008-03-04 08:17:55 +0000 (Tue, 04 Mar 2008)
New Revision: 307
Modified:
trunk/dh-make-pear
trunk/dh-make-pecl
trunk/dh-make-php.lib
Log:
- value of option --prefix isn't separated from the package name
with a hyphen anymore. This makes empty prefixes possible
(Closes #464486)
Modified: trunk/dh-make-pear
===================================================================
--- trunk/dh-make-pear 2008-03-04 08:15:27 UTC (rev 306)
+++ trunk/dh-make-pear 2008-03-04 08:17:55 UTC (rev 307)
@@ -12,7 +12,7 @@
PROGVERSION=0.2.8
PREFIX=/usr
-DEBPACKAGEPREFIX=php
+DEBPACKAGEPREFIX=php-
DEBTEMPDIR=${PREFIX}/share/dh-make-php/pear.template
PACKAGEDOCFILES="README readme CREDITS TODO AUTHORS"
# if you change the examples directory make sure to adjust the
@@ -114,7 +114,7 @@
# get information about package from package.xml
eval_package
-SRCPACKAGEDIR=${DEBPACKAGEPREFIX}-${PHP_PKG_LOWNAME}-${VERSION}
+SRCPACKAGEDIR=${DEBPACKAGEPREFIX}${PHP_PKG_LOWNAME}-${VERSION}
echo "Creating debian source package: ${SRCPACKAGEDIR}"
echo "Upstream is: ${UPSTREAM}"
@@ -126,7 +126,7 @@
echo "Directory '${SRCPACKAGEDIR}' already exits."
exit
fi
-ln -s ${PEARPACKAGENAME} ${DEBPACKAGEPREFIX}-${PHP_PKG_LOWNAME}_${VERSION}.orig.tar.gz
+ln -s ${PEARPACKAGENAME} ${DEBPACKAGEPREFIX}${PHP_PKG_LOWNAME}_${VERSION}.orig.tar.gz
mkdir ${SRCPACKAGEDIR}
mv ${PHP_PKG_NAME}-${VERSION} ${SRCPACKAGEDIR}
mv package.xml ${SRCPACKAGEDIR}
@@ -147,26 +147,26 @@
if [ -n "${LICENSEFILE}" ]; then
cat "${LICENSEFILE}" >> ${SRCPACKAGEDIR}/debian/copyright
fi
-sed -e "s/##packagename##/${DEBPACKAGEPREFIX}-${PHP_PKG_LOWNAME}/g" \
+sed -e "s/##packagename##/${DEBPACKAGEPREFIX}${PHP_PKG_LOWNAME}/g" \
-e "s/##maintainer##/${DEBMAINTAINER}/g" \
-e "s§##summary##§${SUMMARY}§g" \
-e "s/##depends##/${DEPENDS}/g" \
-e "s/##architecture##/${DEPARCH}/g" \
${DEBTEMPDIR}/control > ${SRCPACKAGEDIR}/debian/control
${PHPPKGINFO} ${SRCPACKAGEDIR} description | fold -s -w 70|sed -e "s§^[ \t]*$§.§g" -e "s§^§ §g" >> ${SRCPACKAGEDIR}/debian/control
-sed -e "s/##packagename##/${DEBPACKAGEPREFIX}-${PHP_PKG_LOWNAME}/g" \
+sed -e "s/##packagename##/${DEBPACKAGEPREFIX}${PHP_PKG_LOWNAME}/g" \
-e "s/##version##/${VERSION}/g" \
-e "s/##pearpkgname##/${PHP_PKG_NAME}/g" \
${DEBTEMPDIR}/rules > ${SRCPACKAGEDIR}/debian/rules
chmod 755 ${SRCPACKAGEDIR}/debian/rules
-sed -e "s/##packagename##/${DEBPACKAGEPREFIX}-${PHP_PKG_LOWNAME}/g" \
+sed -e "s/##packagename##/${DEBPACKAGEPREFIX}${PHP_PKG_LOWNAME}/g" \
-e "s/##date##/`(LC_ALL=C; date -R)`/g" \
-e "s/##maintainer##/${DEBMAINTAINER}/g" \
-e "s/##version##/${VERSION}/g" \
${DEBTEMPDIR}/changelog > ${SRCPACKAGEDIR}/debian/changelog
-sed -e "s/##packagename##/${DEBPACKAGEPREFIX}-${PHP_PKG_LOWNAME}/g" \
+sed -e "s/##packagename##/${DEBPACKAGEPREFIX}${PHP_PKG_LOWNAME}/g" \
-e "s/##date##/`(LC_ALL=C; date -R)`/g" \
-e "s/##maintainer##/${DEBMAINTAINER}/g" \
${DEBTEMPDIR}/README.Debian > ${SRCPACKAGEDIR}/debian/README.Debian
@@ -174,7 +174,7 @@
sed -e "s/##pearpkgname##/${PHP_PKG_NAME}/g" \
${DEBTEMPDIR}/watch > ${SRCPACKAGEDIR}/debian/watch
-#sed -e "s/##packagename##/${DEBPACKAGEPREFIX}-${PHP_PKG_LOWNAME}/g" \
+#sed -e "s/##packagename##/${DEBPACKAGEPREFIX}${PHP_PKG_LOWNAME}/g" \
# ${DEBTEMPDIR}/postinst > ${SRCPACKAGEDIR}/debian/postinst
#chmod 755 ${SRCPACKAGEDIR}/debian/postinst
Modified: trunk/dh-make-pecl
===================================================================
--- trunk/dh-make-pecl 2008-03-04 08:15:27 UTC (rev 306)
+++ trunk/dh-make-pecl 2008-03-04 08:17:55 UTC (rev 307)
@@ -12,7 +12,7 @@
PROGVERSION=0.2.8
PREFIX=/usr
-DEBPACKAGEPREFIX=php
+DEBPACKAGEPREFIX=php-
DEBTEMPDIR=${PREFIX}/share/dh-make-php/pecl.template
PACKAGEDOCFILES="README readme CREDITS TODO AUTHORS"
# if you change the examples directory make sure to adjust the
@@ -145,7 +145,7 @@
PHP_PKG_LOWNAME=$(echo $PHP_PKG_NAME | awk '{print tolower($0)}' | sed 's/_/-/g')
fi
-SRCPACKAGEDIR=${DEBPACKAGEPREFIX}-${PHP_PKG_LOWNAME}-${VERSION}
+SRCPACKAGEDIR=${DEBPACKAGEPREFIX}${PHP_PKG_LOWNAME}-${VERSION}
echo "Creating debian source package: ${SRCPACKAGEDIR}"
echo "Upstream is: ${UPSTREAM}"
@@ -157,7 +157,7 @@
echo "Directory '${SRCPACKAGEDIR}' already exists."
exit
fi
-ln -s ${PECLPACKAGENAME} ${DEBPACKAGEPREFIX}-${PHP_PKG_LOWNAME}_${VERSION}.orig.tar.gz
+ln -s ${PECLPACKAGENAME} ${DEBPACKAGEPREFIX}${PHP_PKG_LOWNAME}_${VERSION}.orig.tar.gz
mkdir ${SRCPACKAGEDIR}
mv ${PHP_PKG_NAME}-${VERSION} ${SRCPACKAGEDIR}
mv package.xml ${SRCPACKAGEDIR}
@@ -193,24 +193,24 @@
PHPDEVDEPENDS="${PHPDEVDEPENDS}, php${PHPVER}-dev "
done
-sed -e "s/##packagename##/${DEBPACKAGEPREFIX}-${PHP_PKG_LOWNAME}/g" \
+sed -e "s/##packagename##/${DEBPACKAGEPREFIX}${PHP_PKG_LOWNAME}/g" \
-e "s/##peclpackagerealname##/${PHP_PKG_NAME}/g" \
-e "s/##peclpackagename##/${PHP_PKG_LOWNAME}/g" \
-e "s/##version##/${VERSION}/g" \
-e "s/##binarytargets##/${BINARYTARGETS}/g" \
-e "s/##buildtargets##/${BUILDTARGETS}/g" \
-e "s/##cleantargets##/${CLEANTARGETS}/g" \
- -e "s/##packageprefix##/${DEBPACKAGEPREFIX}/g" \
+ -e "s/##packageprefix##/php/g" \
${DEBTEMPDIR}/rules > ${SRCPACKAGEDIR}/debian/rules
chmod 755 ${SRCPACKAGEDIR}/debian/rules
-sed -e "s/##packagename##/${DEBPACKAGEPREFIX}-${PHP_PKG_LOWNAME}/g" \
+sed -e "s/##packagename##/${DEBPACKAGEPREFIX}${PHP_PKG_LOWNAME}/g" \
-e "s/##date##/`(LC_ALL=C; date -R)`/g" \
-e "s/##maintainer##/${DEBMAINTAINER}/g" \
-e "s/##version##/${VERSION}/g" \
${DEBTEMPDIR}/changelog > ${SRCPACKAGEDIR}/debian/changelog
-sed -e "s/##packagename##/${DEBPACKAGEPREFIX}-${PHP_PKG_LOWNAME}/g" \
+sed -e "s/##packagename##/${DEBPACKAGEPREFIX}${PHP_PKG_LOWNAME}/g" \
-e "s/##date##/`(LC_ALL=C; date -R)`/g" \
-e "s/##maintainer##/${DEBMAINTAINER}/g" \
${DEBTEMPDIR}/README.Debian > ${SRCPACKAGEDIR}/debian/README.Debian
@@ -235,7 +235,7 @@
# Generate templates specific to php[4|5]-(module) binary packages
for PHPVERSION in $PHPVERSIONS
do
- BINPREFIX=${DEBPACKAGEPREFIX}${PHPVERSION}
+ BINPREFIX=php${PHPVERSION} #${DEBPACKAGEPREFIX}${PHPVERSION}
BINPACKAGE=${BINPREFIX}-${PHP_PKG_LOWNAME}
if [ "$DONTUSECONFD" = "true" ]; then
sed -e "s/##peclpackagename##/${PHP_PKG_LOWNAME}/g" \
@@ -278,7 +278,7 @@
done
-sed -e "s/##packagename##/${DEBPACKAGEPREFIX}-${PHP_PKG_LOWNAME}/g" \
+sed -e "s/##packagename##/${DEBPACKAGEPREFIX}${PHP_PKG_LOWNAME}/g" \
-e "s/##maintainer##/${DEBMAINTAINER}/g" \
-e "s/##depends##/${DEPENDS}/g" \
-e "s/##builddepends##/${BUILDDEPENDS}/g" \
Modified: trunk/dh-make-php.lib
===================================================================
--- trunk/dh-make-php.lib 2008-03-04 08:15:27 UTC (rev 306)
+++ trunk/dh-make-php.lib 2008-03-04 08:17:55 UTC (rev 307)
@@ -47,17 +47,17 @@
install_docfiles() {
for i in ${PACKAGEDOCFILES}; do
- if [ -f ${DEBPACKAGEPREFIX}-${PHP_PKG_LOWNAME}-${VERSION}/${PHP_PKG_NAME}-${VERSION}/$i ] ; then
-# chmod 644 ${DEBPACKAGEPREFIX}-${PHP_PKG_LOWNAME}-${VERSION}/$i
- echo ${PHP_PKG_NAME}-${VERSION}/$i >> ${DEBPACKAGEPREFIX}-${PHP_PKG_LOWNAME}-${VERSION}/debian/docs
+ if [ -f ${DEBPACKAGEPREFIX}${PHP_PKG_LOWNAME}-${VERSION}/${PHP_PKG_NAME}-${VERSION}/$i ] ; then
+# chmod 644 ${DEBPACKAGEPREFIX}${PHP_PKG_LOWNAME}-${VERSION}/$i
+ echo ${PHP_PKG_NAME}-${VERSION}/$i >> ${DEBPACKAGEPREFIX}${PHP_PKG_LOWNAME}-${VERSION}/debian/docs
fi
done
}
install_expfiles() {
for i in ${PACKAGEEXPFILES}; do
- if [ -d ${DEBPACKAGEPREFIX}-${PHP_PKG_LOWNAME}-${VERSION}/${PHP_PKG_NAME}-${VERSION}/$i ] ; then
- echo "${PHP_PKG_NAME}-${VERSION}/$i/*" >> ${DEBPACKAGEPREFIX}-${PHP_PKG_LOWNAME}-${VERSION}/debian/examples
+ if [ -d ${DEBPACKAGEPREFIX}${PHP_PKG_LOWNAME}-${VERSION}/${PHP_PKG_NAME}-${VERSION}/$i ] ; then
+ echo "${PHP_PKG_NAME}-${VERSION}/$i/*" >> ${DEBPACKAGEPREFIX}${PHP_PKG_LOWNAME}-${VERSION}/debian/examples
fi
done
}
More information about the Dh-make-php-commits
mailing list