Bug#301327: php4-idn: PHP4 hokey pokey: please rebuild *without* ZTS support

2005-03-29 Thread Steve Langasek
tags 301327 patch
thanks

Hi Turbo,

I've prepared an NMU for this bug.  Please find the patch attached.

Thanks,
-- 
Steve Langasek
postmodern programmer
diff -Nru /var/tmp/4T0fOTFm9r/php4-idn-1.1/debian/changelog 
/var/tmp/AXucc0hXh1/php4-idn-1.1/debian/changelog
--- /var/tmp/4T0fOTFm9r/php4-idn-1.1/debian/changelog   2005-02-13 
20:21:17.0 -0800
+++ /var/tmp/AXucc0hXh1/php4-idn-1.1/debian/changelog   2005-03-29 
18:42:26.0 -0800
@@ -1,3 +1,13 @@
+php4-idn (1.1-1.2) unstable; urgency=medium
+
+  * NMU
+  * Bump php4-dev build-dep to (= 4:4.3.10-10)
+  * Back out the dependency on the threaded phpapi, as this has been 
+dropped for sarge (closes: #301327).
+  * Also drop support for the caudium SAPI, which has been dropped.
+
+ -- Steve Langasek [EMAIL PROTECTED]  Tue, 29 Mar 2005 18:39:05 -0800
+
 php4-idn (1.1-1.1) unstable; urgency=medium
 
   * NMU
diff -Nru /var/tmp/4T0fOTFm9r/php4-idn-1.1/debian/control 
/var/tmp/AXucc0hXh1/php4-idn-1.1/debian/control
--- /var/tmp/4T0fOTFm9r/php4-idn-1.1/debian/control 2005-02-13 
20:04:19.0 -0800
+++ /var/tmp/AXucc0hXh1/php4-idn-1.1/debian/control 2005-03-29 
18:42:34.0 -0800
@@ -2,7 +2,7 @@
 Section: web
 Priority: optional
 Maintainer: Turbo Fredriksson [EMAIL PROTECTED]
-Build-Depends: debhelper ( 4.0.0), binutils, php4-dev (= 4:4.3.10-3), 
libidn11-dev | libidn9-dev (= 0.2.1)
+Build-Depends: debhelper ( 4.0.0), binutils, php4-dev (= 4:4.3.10-10), 
libidn11-dev | libidn9-dev (= 0.2.1)
 Standards-Version: 3.5.8
 
 Package: php4-idn
diff -Nru /var/tmp/4T0fOTFm9r/php4-idn-1.1/debian/postinst 
/var/tmp/AXucc0hXh1/php4-idn-1.1/debian/postinst
--- /var/tmp/4T0fOTFm9r/php4-idn-1.1/debian/postinst2005-02-13 
20:20:54.0 -0800
+++ /var/tmp/AXucc0hXh1/php4-idn-1.1/debian/postinst2005-03-29 
18:43:06.0 -0800
@@ -14,7 +14,7 @@
 exit 0
 fi
 
-for pkg in apache cli cgi apache2 caudium; do
+for pkg in apache cli cgi apache2; do
 if [ -f /etc/php4/$pkg/php.ini ]; then
if ! grep -q ^[[:space:]]*extension[[:space:]]*=[[:space:]]*idn.so 
/etc/php4/$pkg/php.ini; then
echo You are installing IDN support for php4, but it's not
diff -Nru /var/tmp/4T0fOTFm9r/php4-idn-1.1/debian/prerm 
/var/tmp/AXucc0hXh1/php4-idn-1.1/debian/prerm
--- /var/tmp/4T0fOTFm9r/php4-idn-1.1/debian/prerm   2005-02-13 
20:20:42.0 -0800
+++ /var/tmp/AXucc0hXh1/php4-idn-1.1/debian/prerm   2005-03-29 
18:43:15.0 -0800
@@ -6,7 +6,7 @@
exit 0
 fi
 
-for pkg in apache cli cgi apache2 caudium; do
+for pkg in apache cli cgi apache2; do
 if [ -f /etc/php4/$pkg/php.ini ]; then
if grep -q ^[[:space:]]*extension[[:space:]]*=[[:space:]]*idn.so 
/etc/php4/$pkg/php.ini; then
echo You are removing IDN support for php4, but it is still
diff -Nru /var/tmp/4T0fOTFm9r/php4-idn-1.1/debian/rules 
/var/tmp/AXucc0hXh1/php4-idn-1.1/debian/rules
--- /var/tmp/4T0fOTFm9r/php4-idn-1.1/debian/rules   2005-02-13 
20:04:29.0 -0800
+++ /var/tmp/AXucc0hXh1/php4-idn-1.1/debian/rules   2005-03-29 
18:42:42.0 -0800
@@ -19,7 +19,7 @@
 # Find PHP4 API version - this should probably used in
 php4devver=$(shell dpkg -s php4-dev | grep ^Version | cut -d\  -f2)
 zendapiver=$(shell egrep '\#define ZEND_MODULE_API_NO ' 
/usr/include/php4/Zend/zend_modules.h|sed 's/\#define ZEND_MODULE_API_NO //')
-phpapiver=$(shell grep '\#define PHP_API_VERSION ' 
/usr/include/php4/main/php.h |sed 's/\#define PHP_API_VERSION //')-zts
+phpapiver=$(shell grep '\#define PHP_API_VERSION ' 
/usr/include/php4/main/php.h |sed 's/\#define PHP_API_VERSION //')
 
 configure: configure-stamp
 configure-stamp:


signature.asc
Description: Digital signature


Bug#301327: php4-idn: PHP4 hokey pokey: please rebuild *without* ZTS support

2005-03-25 Thread Steve Langasek
Package: php4-idn
Version: 1.1-1.1
Severity: grave
Tags: sid

After a good deal of soul searching, discussion with upstream, and
various bug reports about the subject (#299820, #297223, #297679), the
PHP team has made the hard decision to revert support for the ZTS ABI in
the Debian packages.  Please rebuild php4-idn to match with a
build-dependency on php4-dev (= 4:4.3.10-10) and a dependency on
phpapi-20020918, and please accept our apologies for the inconvenience.

-- 
Steve Langasek
postmodern programmer


signature.asc
Description: Digital signature