[Pkg-php-commits] r1017 - php5/trunk/debian

[Raphael Geissert]

Author: atomo64-guest
Date: 2008-04-19 03:59:58 +0000 (Sat, 19 Apr 2008)
New Revision: 1017

Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/compat
   php5/trunk/debian/control
   php5/trunk/debian/rules
   php5/trunk/debian/watch
Log:
Build php5-dbg with the debug symbols of the SAPIs
Refactored the watch file


Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2008-03-31 21:41:52 UTC (rev 1016)
+++ php5/trunk/debian/changelog	2008-04-19 03:59:58 UTC (rev 1017)
@@ -14,8 +14,13 @@
   [ Thijs Kinkhorst ]
   * Checked for policy 3.7.3, no changes.
 
- -- Thijs Kinkhorst <thijs at debian.org>  Mon, 31 Mar 2008 23:41:20 +0200
+  [ Raphael Geissert ]
+  * Build a php5-dbg package with the debug symbols of all the SAPIs
+   + Bump debhelper dependency to >= 5 as dh_strip behaves differently.
+  * debian/watch: refactored so it can actually be used to download the tarball
 
+ -- Raphael Geissert <atomo64 at gmail.com>  Fri, 18 Apr 2008 22:57:06 -0500
+
 php5 (5.2.5-3) unstable; urgency=high
 
   * zend_parse_parameters does not handle size_t's, causing issues with

Modified: php5/trunk/debian/compat
===================================================================
--- php5/trunk/debian/compat	2008-03-31 21:41:52 UTC (rev 1016)
+++ php5/trunk/debian/compat	2008-04-19 03:59:58 UTC (rev 1017)
@@ -1 +1 @@
-4
+5

Modified: php5/trunk/debian/control
===================================================================
--- php5/trunk/debian/control	2008-03-31 21:41:52 UTC (rev 1016)
+++ php5/trunk/debian/control	2008-04-19 03:59:58 UTC (rev 1017)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian PHP Maintainers <pkg-php-maint at lists.alioth.debian.org>
 Uploaders: Adam Conrad <adconrad at 0c3.net>, Steve Langasek <vorlon at debian.org>, Jeroen van Wolffelaar <jeroen at wolffelaar.nl>, Ondřej Surý <ondrej at debian.org>, Sean Finney <seanius at debian.org>
-Build-Depends: apache2-prefork-dev (>= 2.0.53-3), autoconf, automake1.4, bison, chrpath, debhelper (>= 3), firebird2.0-dev [i386 amd64 powerpc sparc] | firebird1.5-dev [i386 amd64] | firebird2-dev [i386 amd64], flex (>= 2.5.4), freetds-dev, libapr1-dev (>= 1.2.7-8), libbz2-dev (>= 1.0.0), libc-client-dev, libcurl4-openssl-dev | libcurl-dev, libdb4.6-dev, libexpat1-dev (>= 1.95.2-2.1), libfreetype6-dev, libgcrypt11-dev, libgd2-xpm-dev (>= 2.0.28-3), libgmp3-dev, libjpeg62-dev, libkrb5-dev, libldap2-dev, libmcrypt-dev, libmhash-dev (>= 0.8.8), libmysqlclient15-dev, libncurses5-dev, libpam0g-dev, libpcre3-dev (>= 6.6), libpng12-dev, libpq-dev | postgresql-dev, libpspell-dev, librecode-dev, libsasl2-dev, libsnmp-dev, libsqlite0-dev, libssl-dev (>= 0.9.6), libt1-dev, libtidy-dev, libtool (>= 1.4.2-4), libwrap0-dev, libxmltok1-dev, libxml2-dev (>= 2.4.14), libxslt1-dev (>= 1.0.18), quilt, re2c, unixodbc-dev, zlib1g-dev (>= 1.0.9)
+Build-Depends: apache2-prefork-dev (>= 2.0.53-3), autoconf, automake1.4, bison, chrpath, debhelper (>= 5), firebird2.0-dev [i386 amd64 powerpc sparc] | firebird1.5-dev [i386 amd64] | firebird2-dev [i386 amd64], flex (>= 2.5.4), freetds-dev, libapr1-dev (>= 1.2.7-8), libbz2-dev (>= 1.0.0), libc-client-dev, libcurl4-openssl-dev | libcurl-dev, libdb4.6-dev, libexpat1-dev (>= 1.95.2-2.1), libfreetype6-dev, libgcrypt11-dev, libgd2-xpm-dev (>= 2.0.28-3), libgmp3-dev, libjpeg62-dev, libkrb5-dev, libldap2-dev, libmcrypt-dev, libmhash-dev (>= 0.8.8), libmysqlclient15-dev, libncurses5-dev, libpam0g-dev, libpcre3-dev (>= 6.6), libpng12-dev, libpq-dev | postgresql-dev, libpspell-dev, librecode-dev, libsasl2-dev, libsnmp-dev, libsqlite0-dev, libssl-dev (>= 0.9.6), libt1-dev, libtidy-dev, libtool (>= 1.4.2-4), libwrap0-dev, libxmltok1-dev, libxml2-dev (>= 2.4.14), libxslt1-dev (>= 1.0.18), quilt, re2c, unixodbc-dev, zlib1g-dev (>= 1.0.9)
 Build-Conflicts: bind-dev
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/pkg-php/php5/trunk
@@ -106,6 +106,21 @@
  in. The goal of the language is to allow web developers to write
  dynamically generated pages quickly.
 
+Package: php5-dbg
+Depends: php5-cli (= ${binary:Version}) | php5-cgi (= ${binary:Version}) | libapache2-mod-php5 (= ${binary:Version})
+Recommends: gdb
+Section: devel
+Priority: extra
+Architecture: any
+Description: Debug symbols for PHP5
+ This package provides the debug symbols for PHP5 needed for properly
+ debugging errors in PHP5 with gdb.
+ .
+ PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
+ from C, Java and Perl with a couple of unique PHP-specific features thrown
+ in. The goal of the language is to allow web developers to write
+ dynamically generated pages quickly.
+
 Package: php-pear
 Architecture: all
 Depends: php5-cli | php4-cli, php5-common (>= ${source:Version})

Modified: php5/trunk/debian/rules
===================================================================
--- php5/trunk/debian/rules	2008-03-31 21:41:52 UTC (rev 1016)
+++ php5/trunk/debian/rules	2008-04-19 03:59:58 UTC (rev 1017)
@@ -476,13 +476,13 @@
 		ln -s php5-common debian/php5-$$package/usr/share/doc/php5-$$package; \
 	done
 
-	for package in php5-dev php5-cgi php5-cli libapache2-mod-php5; do \
+	for package in php5-dbg php5-dev php5-cgi php5-cli libapache2-mod-php5; do \
 		rm -rf debian/$$package/usr/share/doc/$$package; \
 		ln -s php5-common debian/$$package/usr/share/doc/$$package; \
 	done
 	dh_installcron -pphp5-common --name=php5
 	dh_installchangelogs -pphp5-common NEWS
-	dh_strip -s
+	dh_strip -s --dbg-package=php5-dbg
 	dh_link -s
 	dh_compress -s -Xphp.ini
 	dh_fixperms -s -X /var/lib/php5

Modified: php5/trunk/debian/watch
===================================================================
--- php5/trunk/debian/watch	2008-03-31 21:41:52 UTC (rev 1016)
+++ php5/trunk/debian/watch	2008-04-19 03:59:58 UTC (rev 1017)
@@ -1,2 +1,4 @@
-version=2
+version=3
+opts=downloadurlmangle=s#/a/#/this/#,\
+filenamemangle=s#/get/(php-(5\.[0-9\.]*)\.tar\.gz)/.*#$1# \
 http://www.php.net/downloads.php /get/php-(5\.[0-9\.]*)\.tar\.gz/from/a/mirror