Bug#569037: php-zeroc-ice FTBFS with new PHP API

[Thorvald Natvig]

Package: php-zeroc-ice
Version: 3.3.1-11
Severity: important
Tags: patch
Justification: fails to build from source

With the new PHP API released, php-zeroc-ice fails to build. The applied
trivial patch fixes this, and has been tested on fully updated unstable on
i386.


-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.32-trunk-686 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages php-zeroc-ice depends on:
ii  libapache2-mod-php5 [ph 5.3.1-3          server-side, HTML-embedded scripti
ii  libc6                   2.10.2-5         Embedded GNU C Library: Shared lib
ii  libgcc1                 1:4.5-20100107-1 GCC support library
ii  libiceutil33            3.3.1-11         Ice for C++ misc utility library
ii  libslice33              3.3.1-11         Ice for C++ Slice parser library
ii  libstdc++6              4.5-20100107-1   The GNU Standard C++ Library v3
ii  libzeroc-ice33          3.3.1-11         Ice for C++ runtime library
ii  php5                    5.3.1-3          server-side, HTML-embedded scripti
ii  php5-cli [phpapi-200906 5.3.1-3          command-line interpreter for the p

Versions of packages php-zeroc-ice recommends:
ii  ice33-slice [ice-slice]       3.3.1-11   Slice definitions for Ice 3.3 serv

php-zeroc-ice suggests no packages.

-- no debconf information

--- zeroc-ice-3.3.1/php/src/IcePHP/Marshal.cpp.orig     2010-02-09 
15:42:58.000000000 +0100
+++ zeroc-ice-3.3.1/php/src/IcePHP/Marshal.cpp  2010-02-09 15:43:51.000000000 
+0100
@@ -1941,7 +1941,7 @@
     this->TSRMLS_C = TSRMLS_C;
 #endif
 
-    ZVAL_ADDREF(_value);
+    Z_ADDREF_P(_value);
 
     _class = Z_OBJCE_P(_value);
 }