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

[Thijs Kinkhorst]

Author: thijs
Date: 2008-07-23 12:54:56 +0000 (Wed, 23 Jul 2008)
New Revision: 1125

Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/control
Log:
Drop unneeded php5-timezonedb Suggests and obsolete php3 Conflicts.

Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2008-07-14 17:09:48 UTC (rev 1124)
+++ php5/trunk/debian/changelog	2008-07-23 12:54:56 UTC (rev 1125)
@@ -2,8 +2,11 @@
 
   * NOT RELEASED YET
 
- -- Sean Finney <seanius at debian.org>  Thu, 03 Jul 2008 08:44:38 +0200
+  [ Thijs Kinkhorst ]
+  * Drop unneeded php5-timezonedb Suggests and obsolete php3 Conflicts.
 
+ -- Thijs Kinkhorst <thijs at debian.org>  Wed, 23 Jul 2008 14:53:52 +0200
+
 php5 (5.2.6-2) unstable; urgency=high
 
   [ Raphael Geissert ]

Modified: php5/trunk/debian/control
===================================================================
--- php5/trunk/debian/control	2008-07-14 17:09:48 UTC (rev 1124)
+++ php5/trunk/debian/control	2008-07-23 12:54:56 UTC (rev 1125)
@@ -43,7 +43,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support, ${apache2:Depends}, php5-common (= ${binary:Version}), libmagic1, ucf, tzdata
 Conflicts: libapache2-mod-php4, libapache2-mod-php5filter
 Provides: ${php:Provides}
-Suggests: php-pear, php5-timezonedb
+Suggests: php-pear
 Description: server-side, HTML-embedded scripting language (Apache 2 module)
  This package provides the PHP5 module for the Apache 2 webserver (as
  found in the apache2-mpm-prefork package).  Please note that this package
@@ -81,8 +81,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support, php5-common (= ${binary:Version}), libmagic1, ucf, tzdata
 Provides: ${php:Provides}
-Conflicts: php3 (<= 3.0.18-1)
-Suggests: php-pear, php5-timezonedb
+Suggests: php-pear
 Description: server-side, HTML-embedded scripting language (CGI binary)
  This package provides the /usr/lib/cgi-bin/php5 CGI interpreter built
  for use in Apache 2 with mod_actions, or any other CGI httpd that
@@ -100,8 +99,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support, php5-common (= ${binary:Version}), libmagic1, ucf, tzdata
 Provides: ${php:Provides}
-Conflicts: php3 (<= 3.0.18-1)
-Suggests: php-pear, php5-timezonedb
+Suggests: php-pear
 Description: command-line interpreter for the php5 scripting language
  This package provides the /usr/bin/php5 command interpreter, useful for
  testing PHP scripts from a shell, or perhaps even performing general