tags 636542 + patch pending
thanks
Dear Sean,
as discussed on IRC I’ve 0-day NMU’d xmlrpc-c to get it buildable again.
I also had to fix the lintian files because it apparently is allergic to
sharing a single override file across source/binary packages, now. Then,
I also used the opportunity and fixed some of the things it pointed out.
Thanks, Aurélien, for the patch.
Please find the debdiff attached.
bye,
//mirabilos
--
FWIW, I'm quite impressed with mksh interactively. I thought it was much
*much* more bare bones. But it turns out it beats the living hell out of
ksh93 in that respect. I'd even consider it for my daily use if I hadn't
wasted half my life on my zsh setup. :-) -- Frank Terbeck in #!/bin/mksh
diff -u xmlrpc-c-1.16.33/debian/changelog xmlrpc-c-1.16.33/debian/changelog
--- xmlrpc-c-1.16.33/debian/changelog
+++ xmlrpc-c-1.16.33/debian/changelog
@@ -1,3 +1,13 @@
+xmlrpc-c (1.16.33-3.1) unstable; urgency=low
+
+ * Non-maintainer upload with OK from Maintainer.
+ * d/patches/636542_FTBFS_curl: New, stop using cURL headers that
+ were long deprecated and have been removed by now. (Closes: #636542)
+ * Fix some lintian errors and warnings.
+ * Make libxmlrpc-c3-dev arch:all, it's transitional and empty.
+
+ -- Thorsten Glaser <t...@mirbsd.de> Thu, 15 Sep 2011 18:14:38 +0000
+
xmlrpc-c (1.16.33-3) unstable; urgency=low
* Add patch to fix FTBFS on hurd-i386.
diff -u xmlrpc-c-1.16.33/debian/libxmlrpc-core-c3.install
xmlrpc-c-1.16.33/debian/libxmlrpc-core-c3.install
--- xmlrpc-c-1.16.33/debian/libxmlrpc-core-c3.install
+++ xmlrpc-c-1.16.33/debian/libxmlrpc-core-c3.install
@@ -1,3 +1,4 @@
+debian/lintian/libxmlrpc-core-c3 usr/share/lintian/overrides/
debian/tmp/usr/lib/libxmlrpc.so.3
debian/tmp/usr/lib/libxmlrpc.so.3.16
debian/tmp/usr/lib/libxmlrpc_abyss.so.3
reverted:
--- xmlrpc-c-1.16.33/debian/source.lintian-overrides
+++ xmlrpc-c-1.16.33.orig/debian/source.lintian-overrides
@@ -1,5 +0,0 @@
-# the soname is close enough...
-libxmlrpc-core-c3 binary: package-name-doesnt-match-sonames
-libxmlrpc-c++4 binary: package-name-doesnt-match-sonames
-# we don't use quilt "at the moment", but the need may arise again...
-xmlrpc-c source: quilt-build-dep-but-no-series-file
diff -u xmlrpc-c-1.16.33/debian/control xmlrpc-c-1.16.33/debian/control
--- xmlrpc-c-1.16.33/debian/control
+++ xmlrpc-c-1.16.33/debian/control
@@ -14,7 +14,7 @@
Conflicts: libxmlrpc-c3-dev (<= 1.16.07-1)
Replaces: libxmlrpc-c3-dev
Suggests: xmlrpc-api-utils
-Description: A lightweight RPC library based on XML and HTTP [C++ libraries]
+Description: lightweight RPC library based on XML and HTTP [C++ development
libraries]
XML-RPC is a quick-and-easy way to make procedure calls over the Internet.
It converts the procedure call into an XML document, sends it to a remote
server using HTTP, and gets back the response as XML.
@@ -28,7 +28,7 @@
Section: libs
Architecture: any
Depends: libxmlrpc-core-c3 (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
-Description: A lightweight RPC library based on XML and HTTP [C++ libraries]
+Description: lightweight RPC library based on XML and HTTP [C++ runtime
libraries]
XML-RPC is a quick-and-easy way to make procedure calls over the Internet.
It converts the procedure call into an XML document, sends it to a remote
server using HTTP, and gets back the response as XML.
@@ -37,9 +37,9 @@
Package: libxmlrpc-c3-dev
Section: libdevel
-Architecture: any
+Architecture: all
Depends: libxmlrpc-core-c3-dev, libxmlrpc-c++4-dev, ${misc:Depends}
-Description: A lightweight RPC library based on XML and HTTP [C libraries]
+Description: lightweight RPC library based on XML and HTTP [transitional
package]
XML-RPC is a quick-and-easy way to make procedure calls over the Internet.
It converts the procedure call into an XML document, sends it to a remote
server using HTTP, and gets back the response as XML.
@@ -55,7 +55,7 @@
Conflicts: libxmlrpc-c3-dev (<= 1.16.07-1)
Replaces: libxmlrpc-c3-dev
Suggests: xmlrpc-api-utils
-Description: A lightweight RPC library based on XML and HTTP [C libraries]
+Description: lightweight RPC library based on XML and HTTP [C development
libraries]
XML-RPC is a quick-and-easy way to make procedure calls over the Internet.
It converts the procedure call into an XML document, sends it to a remote
server using HTTP, and gets back the response as XML.
@@ -71,7 +71,7 @@
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libxmlrpc-c3 (<= 1.16.07-1)
Replaces: libxmlrpc-c3
-Description: A lightweight RPC library based on XML and HTTP [C libraries]
+Description: lightweight RPC library based on XML and HTTP [C runtime
libraries]
XML-RPC is a quick-and-easy way to make procedure calls over the Internet.
It converts the procedure call into an XML document, sends it to a remote
server using HTTP, and gets back the response as XML.
@@ -84,14 +84,14 @@
Replaces: xml-rpc-api2cpp, xml-rpc-api2txt
Architecture: any
Section: devel
-Depends: libxmlrpc-core-c3 (= ${binary:Version}), libc6-dev,
+Depends: libxmlrpc-core-c3 (= ${binary:Version}), libc6-dev,
libfrontier-rpc-perl, ${misc:Depends}
Description: Generate C++ wrapper classes for XML-RPC servers
XML-RPC is a quick-and-easy way to make procedure calls over the Internet.
It converts the procedure call into an XML document, sends it to a remote
server using HTTP, and gets back the response as XML.
.
- This package contains two programs:
+ This package contains two programs:
* xml-rpc-api2cpp, a utility for generating C++ wrapper classes based
on an XML-RPC API, obtained by interrogating an XML-RPC server.
* xml-rpc-api2txt, a utility for printing out an XML-RPC API as a
diff -u xmlrpc-c-1.16.33/debian/rules xmlrpc-c-1.16.33/debian/rules
--- xmlrpc-c-1.16.33/debian/rules
+++ xmlrpc-c-1.16.33/debian/rules
@@ -89,11 +89,6 @@
make -C examples distclean
dh_install -a --fail-missing
- # plop in our lintian override file
- mkdir -p debian/libxmlrpc-core-c3/usr/share/lintian/overrides/ \
- debian/libxmlrpc-c++4/usr/share/lintian/overrides/
- cp debian/source.lintian-overrides
debian/libxmlrpc-core-c3/usr/share/lintian/overrides/libxmlrpc-core-c3
- cp debian/source.lintian-overrides
debian/libxmlrpc-c++4/usr/share/lintian/overrides/libxmlrpc-c++4
install-indep: build-indep
dh_testdir
@@ -134,8 +129,7 @@
dh_md5sums
dh_builddeb
-#binary: binary-indep binary-arch
-binary: binary-arch
+binary: binary-indep binary-arch
# Build architecture-independent files using the common target.
binary-indep: install-indep
diff -u xmlrpc-c-1.16.33/debian/libxmlrpc-c++4.install
xmlrpc-c-1.16.33/debian/libxmlrpc-c++4.install
--- xmlrpc-c-1.16.33/debian/libxmlrpc-c++4.install
+++ xmlrpc-c-1.16.33/debian/libxmlrpc-c++4.install
@@ -1,3 +1,4 @@
+debian/lintian/libxmlrpc-c++4 usr/share/lintian/overrides/
debian/tmp/usr/lib/libxmlrpc++.so.4
debian/tmp/usr/lib/libxmlrpc++.so.4.16
debian/tmp/usr/lib/libxmlrpc_client++.so.4
diff -u xmlrpc-c-1.16.33/debian/patches/series
xmlrpc-c-1.16.33/debian/patches/series
--- xmlrpc-c-1.16.33/debian/patches/series
+++ xmlrpc-c-1.16.33/debian/patches/series
@@ -1,2 +1,3 @@
+636542_FTBFS_curl.patch
565785_kfreebsd_ftbfs.patch
614937_FTBFS_hurd-i386.patch
only in patch2:
unchanged:
--- xmlrpc-c-1.16.33.orig/debian/README.source
+++ xmlrpc-c-1.16.33/debian/README.source
@@ -0,0 +1,3 @@
+Please see /usr/share/doc/quilt/README.source for
+information on how to handle packages using quilt
+as patch system.
only in patch2:
unchanged:
--- xmlrpc-c-1.16.33.orig/debian/lintian/libxmlrpc-core-c3
+++ xmlrpc-c-1.16.33/debian/lintian/libxmlrpc-core-c3
@@ -0,0 +1,2 @@
+# the soname is close enough...
+libxmlrpc-core-c3: package-name-doesnt-match-sonames
only in patch2:
unchanged:
--- xmlrpc-c-1.16.33.orig/debian/lintian/libxmlrpc-c++4
+++ xmlrpc-c-1.16.33/debian/lintian/libxmlrpc-c++4
@@ -0,0 +1,2 @@
+# the soname is close enough...
+libxmlrpc-c++4: package-name-doesnt-match-sonames
only in patch2:
unchanged:
--- xmlrpc-c-1.16.33.orig/debian/patches/636542_FTBFS_curl.patch
+++ xmlrpc-c-1.16.33/debian/patches/636542_FTBFS_curl.patch
@@ -0,0 +1,40 @@
+Description: Stop using deprecated (now removed) cURL headers
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636542
+Author: Aurélien Jarno
+
+Index: xmlrpc-c-1.16.33/lib/curl_transport/curlmulti.c
+===================================================================
+--- xmlrpc-c-1.16.33.orig/lib/curl_transport/curlmulti.c 2011-09-15
17:34:57.000000000 +0000
++++ xmlrpc-c-1.16.33/lib/curl_transport/curlmulti.c 2011-09-15
17:35:05.000000000 +0000
+@@ -17,7 +17,6 @@
+ #endif
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include <curl/multi.h>
+
+Index: xmlrpc-c-1.16.33/lib/curl_transport/curltransaction.c
+===================================================================
+--- xmlrpc-c-1.16.33.orig/lib/curl_transport/curltransaction.c 2011-09-15
17:34:58.000000000 +0000
++++ xmlrpc-c-1.16.33/lib/curl_transport/curltransaction.c 2011-09-15
17:35:07.000000000 +0000
+@@ -15,7 +15,6 @@
+ #include "version.h"
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+
+ #include "curlversion.h"
+Index: xmlrpc-c-1.16.33/lib/curl_transport/xmlrpc_curl_transport.c
+===================================================================
+--- xmlrpc-c-1.16.33.orig/lib/curl_transport/xmlrpc_curl_transport.c
2011-09-15 17:34:57.000000000 +0000
++++ xmlrpc-c-1.16.33/lib/curl_transport/xmlrpc_curl_transport.c
2011-09-15 17:35:06.000000000 +0000
+@@ -83,7 +83,6 @@
+ #include "xmlrpc-c/time_int.h"
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include <curl/multi.h>
+
only in patch2:
unchanged:
--- xmlrpc-c-1.16.33.orig/debian/source/format
+++ xmlrpc-c-1.16.33/debian/source/format
@@ -0,0 +1 @@
+1.0
