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

[Raphael Geissert]

Author: atomo64-guest
Date: 2008-06-20 04:30:06 +0000 (Fri, 20 Jun 2008)
New Revision: 1097

Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/control
Log:
{B-,}Depend on tzdata to avoid crashes caused by the tz ext patch


Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2008-06-14 18:20:56 UTC (rev 1096)
+++ php5/trunk/debian/changelog	2008-06-20 04:30:06 UTC (rev 1097)
@@ -8,16 +8,18 @@
     - fixed the generic lintian overrides so they are meaningful
     - dropping linda overrides, linda is gone now
     - s/meta-package/metapackage
-  * debian/control: updated php5's description so it mentions three instead of
-    only two server-side SAPIs
-  * debian/control: Depend on php5-cli in php-pear (Closes: #482517)
-    + Previous change reverted because of lots of FTBFS from the PEAR packages
+  * debian/control:
+    - Updated php5's description so it mentions three instead of 
+       only two server-side SAPIs
+    - Depend on php5-cli in php-pear (Closes: #482517)
+      + Previous change reverted because of PEAR packages FTBFS
+    - {B-,}Depend on tzdata to avoid crashes caused by the tz ext patch
   * php.ini-*: state that when using a custom save_path,
     gc_probability should also be set (Closes: #388808, #321460)
   * tzdb-nofree_ents_ifnotzdata.patch: avoid free'ing ents when the tz dir does
     not exist (Closes: #483461)
 
- -- Raphael Geissert <atomo64 at gmail.com>  Sat, 31 May 2008 16:30:34 -0500
+ -- Raphael Geissert <atomo64 at gmail.com>  Thu, 19 Jun 2008 23:25:58 -0500
 
 php5 (5.2.6-1) unstable; urgency=medium
 

Modified: php5/trunk/debian/control
===================================================================
--- php5/trunk/debian/control	2008-06-14 18:20:56 UTC (rev 1096)
+++ php5/trunk/debian/control	2008-06-20 04:30:06 UTC (rev 1097)
@@ -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>, 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 (>= 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, 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, 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), tzdata
 Build-Conflicts: bind-dev
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/pkg-php/php5/trunk
@@ -40,7 +40,7 @@
 
 Package: libapache2-mod-php5
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), ${apache2:Depends}, php5-common (= ${binary:Version}), libmagic1, ucf
+Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), ${apache2:Depends}, php5-common (= ${binary:Version}), libmagic1, ucf, tzdata
 Conflicts: libapache2-mod-php4, libapache2-mod-php5filter
 Provides: ${php:Provides}
 Suggests: php-pear, php5-timezonedb
@@ -58,7 +58,7 @@
 
 Package: libapache2-mod-php5filter
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), ${apache2:Depends}, php5-common (= ${binary:Version}), libmagic1, ucf
+Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), ${apache2:Depends}, php5-common (= ${binary:Version}), libmagic1, ucf, tzdata
 Conflicts: libapache2-mod-php4, libapache2-mod-php5
 Provides: ${php:Provides}
 Suggests: php-pear
@@ -79,7 +79,7 @@
 
 Package: php5-cgi
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), php5-common (= ${binary:Version}), libmagic1, ucf
+Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), php5-common (= ${binary:Version}), libmagic1, ucf, tzdata
 Provides: ${php:Provides}
 Conflicts: php3 (<= 3.0.18-1)
 Suggests: php-pear, php5-timezonedb
@@ -98,7 +98,7 @@
 
 Package: php5-cli
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), php5-common (= ${binary:Version}), libmagic1, ucf
+Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), php5-common (= ${binary:Version}), libmagic1, ucf, tzdata
 Provides: ${php:Provides}
 Conflicts: php3 (<= 3.0.18-1)
 Suggests: php-pear, php5-timezonedb