Your message dated Wed, 01 Feb 2017 21:45:00 +0000
with message-id <bb613e6c-5c83-3414-d624-a6e6cdfa9...@thykier.net>
and subject line Re: Bug#853842: unblock: php-solr/2.4.0-4
has caused the Debian Bug report #853842,
regarding unblock: php-solr/2.4.0-4
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
853842: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=853842
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package php-solr
This update fixes the FTBFS caused by multi-arch include in curl
header files. I have just removed the test for curl/easy.h from
the upstream config.m4. It was not needed anyway.
Diff attached.
unblock php-solr/2.4.0-4
-- System Information:
Debian Release: 9.0
APT prefers testing
APT policy: (900, 'testing'), (800, 'unstable'), (500, 'unstable-debug'),
(500, 'testing-debug'), (1, 'experimental-debug'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.9.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_DK.utf8, LC_CTYPE=en_DK.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff --git a/debian/changelog b/debian/changelog
index 75403d5..bf11219 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+php-solr (2.4.0-4) unstable; urgency=high
+
+ * Remove extra check for curl headers (Closes: #852912)
+
+ -- Ondřej Surý <ond...@debian.org> Wed, 01 Feb 2017 10:34:33 +0100
+
php-solr (2.4.0-3) unstable; urgency=medium
* Move the default makefile snippet to dh-php and use a simple d/rules
diff --git a/debian/patches/0001-Remove-extra-check-for-curl-headers.patch
b/debian/patches/0001-Remove-extra-check-for-curl-headers.patch
new file mode 100644
index 0000000..524131b
--- /dev/null
+++ b/debian/patches/0001-Remove-extra-check-for-curl-headers.patch
@@ -0,0 +1,33 @@
+From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= <ond...@sury.org>
+Date: Wed, 1 Feb 2017 10:33:51 +0100
+Subject: Remove extra check for curl headers
+
+---
+ solr-2.4.0/config.m4 | 14 +-------------
+ 1 file changed, 1 insertion(+), 13 deletions(-)
+
+diff --git a/solr-2.4.0/config.m4 b/solr-2.4.0/config.m4
+index 965eed5..021b7bc 100644
+--- a/solr-2.4.0/config.m4
++++ b/solr-2.4.0/config.m4
+@@ -7,19 +7,7 @@ dnl Configuring the CURL external library
+ dnl This folder is the grand-parent folder of easy.h
+ PHP_ARG_WITH(curl, for cURL support, [ --with-curl[=DIR] SOLR :
libcurl install prefix])
+
+-if test -r $PHP_CURL/include/curl/easy.h; then
+- CURL_DIR=$PHP_CURL
+- AC_MSG_RESULT(curl headers found in $PHP_CURL)
+-else
+- AC_MSG_CHECKING(for cURL in default path)
+- for i in /usr/local /usr; do
+- if test -r $i/include/curl/easy.h; then
+- CURL_DIR=$i
+- AC_MSG_RESULT(found in $i)
+- break
+- fi
+- done
+-fi
++CURL_DIR=$PHP_CURL
+
+ if test -z "$CURL_DIR"; then
+ AC_MSG_RESULT(not found)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..592b358
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Remove-extra-check-for-curl-headers.patch
--- End Message ---
--- Begin Message ---
Ondřej Surý:
> Package: release.debian.org
> Severity: normal
> User: release.debian....@packages.debian.org
> Usertags: unblock
>
> Please unblock package php-solr
>
> This update fixes the FTBFS caused by multi-arch include in curl
> header files. I have just removed the test for curl/easy.h from
> the upstream config.m4. It was not needed anyway.
>
> Diff attached.
>
> unblock php-solr/2.4.0-4
>
> [...]
Unblocked, thanks.
~Niels
--- End Message ---
