tags 329065 pending
tags 418734 pending
thanks

Author: ondrej
Date: 2007-07-11 22:10:25 +0000 (Wed, 11 Jul 2007)
New Revision: 835

Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/control
   php5/trunk/debian/extramodulelist
   php5/trunk/debian/modulelist
   php5/trunk/debian/rules
Log:
Prepare php5-mssql

Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2007-07-02 20:58:46 UTC (rev 834)
+++ php5/trunk/debian/changelog	2007-07-11 22:10:25 UTC (rev 835)
@@ -1,15 +1,21 @@
 php5 (5.2.3-2) UNRELEASED; urgency=low
 
+  [ sean finney ]
   * NOT RELEASED YET
   * patch from Jan Wagner to be able to conditionally disable any
     patches that break binary-compatibility with official php
     binary-only extensions.  see debian/rules for more information.
   * now incorporate the php unit tests into the build process.  for
     those interested the output is stored in the file
-    /usr/share/doc/php5-common/test-results.txt .  
+    /usr/share/doc/php5-common/test-results.txt .
 
- -- sean finney <email address hidden>  Sat, 09 Jun 2007 18:50:58 +0200
+  [ Ondřej Surý ]
+  * Add support for native mssql functions using freetds libraries.
+    php5-sybase depends on php5-mssql for smooth upgrades.
+    (Closes: #418734, #329065)
 
+ -- Ondřej Surý <email address hidden>  Thu, 12 Jul 2007 00:06:37 +0200
+
 php5 (5.2.3-1) unstable; urgency=low
 
   * new upstream release.

Modified: php5/trunk/debian/control
===================================================================
--- php5/trunk/debian/control	2007-07-02 20:58:46 UTC (rev 834)
+++ php5/trunk/debian/control	2007-07-11 22:10:25 UTC (rev 835)
@@ -301,16 +301,29 @@
 
 Package: php5-sybase
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version}), php5-mssql
 Description: Sybase / MS SQL Server module for php5
- This package provides a module for Sybase and Microsoft SQL Server database
- connections directly from PHP scripts.
+ This package provides a module for Sybase and Microsoft SQL Server
+ database connections directly from PHP scripts.
  .
  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: php5-mssql
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version})
+Description: MS SQL Server module for php5
+ This package provides a module for Microsoft SQL Server database
+ connections directly from PHP scripts. It also includes the pdo_mssql
+ module for use with the PHP Data Object extension.
+ .
+ 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: php5-tidy
 Architecture: any
 Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${Source-Version})

Modified: php5/trunk/debian/extramodulelist
===================================================================
--- php5/trunk/debian/extramodulelist	2007-07-02 20:58:46 UTC (rev 834)
+++ php5/trunk/debian/extramodulelist	2007-07-11 22:10:25 UTC (rev 835)
@@ -5,3 +5,4 @@
 odbc ODBC pdo_odbc
 pgsql PostgreSQL pdo_pgsql
 sqlite SQLite pdo_sqlite
+mssql MSSQL pdo_mssql

Modified: php5/trunk/debian/modulelist
===================================================================
--- php5/trunk/debian/modulelist	2007-07-02 20:58:46 UTC (rev 834)
+++ php5/trunk/debian/modulelist	2007-07-11 22:10:25 UTC (rev 835)
@@ -16,3 +16,4 @@
 tidy tidy
 xmlrpc XML-RPC
 xsl XSL
+mssql MSSQL

Modified: php5/trunk/debian/rules
===================================================================
--- php5/trunk/debian/rules	2007-07-02 20:58:46 UTC (rev 834)
+++ php5/trunk/debian/rules	2007-07-11 22:10:25 UTC (rev 835)
@@ -241,7 +241,9 @@
 		--with-pdo-mysql=shared,/usr \
 		--with-pdo-odbc=shared,unixODBC,/usr \
 		--with-pdo-pgsql=shared,/usr/bin/pg_config \
-		--with-pdo-sqlite=shared,/usr
+		--with-pdo-sqlite=shared,/usr \
+		--with-mssql=shared,/usr \
+		--with-pdo-mssql=shared,/usr
 	cd apache2-build && \
 	cp ../Zend/zend_ini_scanner.c ../Zend/zend_language_scanner.c \
 	   ../Zend/zend_ini_parser.h ../Zend/zend_language_parser.h \