[Pkg-php-commits] r1031 - php5/trunk/debian
Raphael Geissert
atomo64-guest at alioth.debian.org
Thu May 1 20:05:50 UTC 2008
tags 243214 pending
thanks
Author: atomo64-guest
Date: 2008-05-01 20:05:50 +0000 (Thu, 01 May 2008)
New Revision: 1031
Added:
php5/trunk/debian/README.source
Modified:
php5/trunk/debian/changelog
php5/trunk/debian/control
php5/trunk/debian/rules
Log:
debian/rules: s/DEB_BUILD_ARCH/DEB_HOST_ARCH
+ HOST is the machine the package is built for.
Recommend php5-cli instead of depending on it in php-pear (Closes: #243214)
+ php5-cli is only needed by the, rearely used, pear installer
debian/README.source: inform how to generate php5-dbg's Depends
Added: php5/trunk/debian/README.source
===================================================================
--- php5/trunk/debian/README.source (rev 0)
+++ php5/trunk/debian/README.source 2008-05-01 20:05:50 UTC (rev 1031)
@@ -0,0 +1,8 @@
+
+ == Generation of the php5-dbg package Depends ==
+
+ The following command can be used to generate a heuristic list of packages
+the php5-dbg package probably needs to Depend on:
+dh_testdir && egrep '^Package' debian/control | cut '-d ' -f2 | \
+ egrep -v '(^php5|dbg|dev|common|pear)$' | tr "\n" "|" | sed 's/|$//' |\
+ sed -r 's/([^|]+)(\||$)/ \1 (= ${binary:Version}) \2/g'; echo
Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog 2008-05-01 06:36:43 UTC (rev 1030)
+++ php5/trunk/debian/changelog 2008-05-01 20:05:50 UTC (rev 1031)
@@ -14,7 +14,7 @@
* Checked for policy 3.7.3, no changes.
[ Raphael Geissert ]
- * Build a php5-dbg package with the debug symbols of all the SAPIs
+ * Build a php5-dbg package with the debug symbols of the SAPIs & extensions
+ Bump debhelper dependency to >= 5 as dh_strip behaves differently.
* debian/watch: refactored so it can actually be used to download the tarball
* debian/rules: removed bashisms (Closes: #478613)
@@ -32,12 +32,17 @@
* Set our custom PHP_PEAR_DOWNLOAD_DIR when building the pear stuff
+ Avoids the creation of /tmp/pear (Closes: #463979)
* Replaced all 'make' with '$(MAKE)' so any extra flag is preserved
+ * debian/rules: s/DEB_BUILD_ARCH/DEB_HOST_ARCH
+ + HOST is the machine the package is built for.
+ * Recommend php5-cli instead of depending on it in php-pear (Closes: #243214)
+ + php5-cli is only needed by the, rearely used, pear installer
+ * debian/README.source: inform how to generate php5-dbg's Depends
[ Steve Langasek ]
* Step down from the PHP maintenance team, removing myself from uploaders.
So long, and thanks for all the fish!
- -- Raphael Geissert <atomo64 at gmail.com> Thu, 01 May 2008 01:33:43 -0500
+ -- Raphael Geissert <atomo64 at gmail.com> Thu, 01 May 2008 15:04:25 -0500
php5 (5.2.5-3) unstable; urgency=high
Modified: php5/trunk/debian/control
===================================================================
--- php5/trunk/debian/control 2008-05-01 06:36:43 UTC (rev 1030)
+++ php5/trunk/debian/control 2008-05-01 20:05:50 UTC (rev 1031)
@@ -107,7 +107,7 @@
generated pages quickly. This version of PHP5 was built with the Suhosin patch.
Package: php5-dbg
-Depends: php5-cli (= ${binary:Version}) | php5-cgi (= ${binary:Version}) | libapache2-mod-php5 (= ${binary:Version})
+Depends: libapache2-mod-php5 (= ${binary:Version}) | php5-cgi (= ${binary:Version}) | php5-cli (= ${binary:Version}) | php5-curl (= ${binary:Version}) | php5-gd (= ${binary:Version}) | php5-gmp (= ${binary:Version}) | php5-imap (= ${binary:Version}) | php5-interbase (= ${binary:Version}) | php5-ldap (= ${binary:Version}) | php5-mcrypt (= ${binary:Version}) | php5-mhash (= ${binary:Version}) | php5-mysql (= ${binary:Version}) | php5-odbc (= ${binary:Version}) | php5-pgsql (= ${binary:Version}) | php5-pspell (= ${binary:Version}) | php5-recode (= ${binary:Version}) | php5-snmp (= ${binary:Version}) | php5-sqlite (= ${binary:Version}) | php5-sybase (= ${binary:Version}) | php5-tidy (= ${binary:Version}) | php5-xmlrpc (= ${binary:Version}) | php5-xsl (= ${binary:Version})
Recommends: gdb
Section: devel
Priority: extra
@@ -123,8 +123,8 @@
Package: php-pear
Architecture: all
-Depends: php5-cli | php4-cli, php5-common (>= ${source:Version})
-Recommends: gnupg
+Depends: php5-common (>= ${source:Version})
+Recommends: php5-cli | php4-cli, gnupg
Suggests: php5-dev | php4-dev
Replaces: php4-pear (<< 4:4.4.0-0)
Description: PEAR - PHP Extension and Application Repository
Modified: php5/trunk/debian/rules
===================================================================
--- php5/trunk/debian/rules 2008-05-01 06:36:43 UTC (rev 1030)
+++ php5/trunk/debian/rules 2008-05-01 20:05:50 UTC (rev 1031)
@@ -18,7 +18,7 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
PHP5_SOURCE_VERSION = $(shell dpkg-parsechangelog | grep ^Version | sed "s/Version: //")
PHP5_UPSTREAM_VERSION = $(shell echo $(PHP5_SOURCE_VERSION) | sed -e "s/-.*//" -e "s/.*://")
@@ -53,7 +53,7 @@
endif
# only enable interbase support for i386/amd64/powerpc/sparc
-ifneq (,$(filter $(DEB_BUILD_ARCH),amd64 i386 powerpc sparc))
+ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 powerpc sparc))
IBFLAGS=--with-interbase=shared,/usr \
--with-pdo-firebird=shared,/usr
endif
More information about the Pkg-php-commits
mailing list