tags 336311 +patch
quit

Here's a patch which adopts the php4-config method of determining the PHP API,
as suggested by Bug#321324.  It also includes a fix for Bug#326378 (attached
redundantly there also).

Daniel, unless you have objections, I'll upload to delayed+7d within the next
day or so.

-- 
Devin  \ aqua(at)devin.com, IRC:Requiem; http://www.devin.com
Carraway \ 1024D/E9ABFCD2: 13E7 199E DD1E 65F0 8905 2E43 5395 CA0D E9AB FCD2
diff -aruN orig/dbtcp-0.1.17/debian/changelog dbtcp-0.1.17/debian/changelog
--- orig/dbtcp-0.1.17/debian/changelog  2006-01-23 23:30:07.000000000 -0800
+++ dbtcp-0.1.17/debian/changelog       2006-01-24 00:03:56.000000000 -0800
@@ -1,3 +1,13 @@
+dbtcp (0.1.17-4.3) unstable; urgency=low
+
+  * NMU
+  * debian/control:
+     + Fix libreadline build-dependency (Closes: #326378)
+  * debian/rules:
+     + Fix PHP API determination (Closes: #336311)
+
+ -- Devin Carraway <[EMAIL PROTECTED]>  Mon, 23 Jan 2006 23:26:46 -0800
+
 dbtcp (0.1.17-4.2) unstable; urgency=medium
 
   * NMU
diff -aruN orig/dbtcp-0.1.17/debian/control dbtcp-0.1.17/debian/control
--- orig/dbtcp-0.1.17/debian/control    2006-01-23 23:30:07.000000000 -0800
+++ dbtcp-0.1.17/debian/control 2006-01-24 00:03:44.000000000 -0800
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Daniel Stone <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.0.0), php4-dev (>= 4:4.3.10-10), libdbi-perl, 
libreadline4-dev
+Build-Depends: debhelper (>> 4.0.0), php4-dev (>= 4:4.3.10-10), libdbi-perl, 
libreadline5-dev | libreadline-dev
 Standards-Version: 3.6.1.0
 
 Package: dbtcp
diff -aruN orig/dbtcp-0.1.17/debian/rules dbtcp-0.1.17/debian/rules
--- orig/dbtcp-0.1.17/debian/rules      2006-01-23 23:30:07.000000000 -0800
+++ dbtcp-0.1.17/debian/rules   2006-01-24 00:03:44.000000000 -0800
@@ -9,7 +9,7 @@
 PERL=/usr/bin/perl
 endif
 
-phpapiver=$(shell grep '\#define PHP_API_VERSION ' 
/usr/include/php4/main/php.h |sed 's/\#define PHP_API_VERSION //')
+phpapiver=$(shell php-config4 --phpapi)
 
 configure: configure-stamp
 configure-stamp:

Attachment: signature.asc
Description: Digital signature

Reply via email to