tag 442792 patch pending tag 424103 patch pending thanks Martin Zobel-Helas <[EMAIL PROTECTED]> (15/05/2007): > Package: xmlrpc++ > Severity: important > Version: 0.7+cvs20040713-2 > User: [EMAIL PROTECTED] > Usertags: qa-doublebuild
Hi, please find attached the diff for my NMU, uploaded to DELAYED/5 (or even /7, it's not appeared on djpig's pages and I left the final choice to my sponsor). Cheers, -- Cyril Brulebois
diff -u xmlrpc++-0.7+cvs20040713/debian/libxmlrpc++-dev.install
xmlrpc++-0.7+cvs20040713/debian/libxmlrpc++-dev.install
--- xmlrpc++-0.7+cvs20040713/debian/libxmlrpc++-dev.install
+++ xmlrpc++-0.7+cvs20040713/debian/libxmlrpc++-dev.install
@@ -4,0 +5 @@
+doc/html usr/share/doc/libxmlrpc++-dev
diff -u xmlrpc++-0.7+cvs20040713/debian/changelog
xmlrpc++-0.7+cvs20040713/debian/changelog
--- xmlrpc++-0.7+cvs20040713/debian/changelog
+++ xmlrpc++-0.7+cvs20040713/debian/changelog
@@ -1,3 +1,27 @@
+xmlrpc++ (0.7+cvs20040713-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix double-build FTBFS (Closes: #424103, #442792):
+ - The patches are interdependent, so they need to be unapplied in the
+ reverse order.
+ - Switch from simple-patchsys.mk to patchsys-quilt.mk to achieve
+ that.
+ - Add debian/patches/series (contains the output of “ls -1” in the
+ debian/patches directory).
+ - Add a B-D on quilt accordingly.
+ - Also delete the doc/ directory, generated from doxygen, in a
+ “clean::” target.
+ * Bump Standards-Version from 3.7.2 to 3.7.3. One change needed:
+ - Replace Source-Version with binary:Version in debian/control.
+ * Bump debhelper compatibility from 4 to 5.
+ * Move the -dev package to “Section: libdevel”, thanks to lintian.
+ * Ship doxygen-generated HTML documentation in the libxmlrpc++-dev
+ package by adding a “doc/html usr/share/doc/libxmlrpc++-dev” line to
+ debian/libxmlrpc++-dev.install (Closes: #424103). Less than a single
+ megabyte doesn't really warrant adding a -doc package.
+
+ -- Cyril Brulebois <[EMAIL PROTECTED]> Wed, 27 Feb 2008 02:07:47 +0100
+
xmlrpc++ (0.7+cvs20040713-2) unstable; urgency=low
* Make libxmlrpc++-dev installable (Closes: #376856)
diff -u xmlrpc++-0.7+cvs20040713/debian/compat
xmlrpc++-0.7+cvs20040713/debian/compat
--- xmlrpc++-0.7+cvs20040713/debian/compat
+++ xmlrpc++-0.7+cvs20040713/debian/compat
@@ -1 +1 @@
-4
+5
diff -u xmlrpc++-0.7+cvs20040713/debian/control
xmlrpc++-0.7+cvs20040713/debian/control
--- xmlrpc++-0.7+cvs20040713/debian/control
+++ xmlrpc++-0.7+cvs20040713/debian/control
@@ -2,8 +2,8 @@
Section: devel
Priority: optional
Maintainer: Ondřej Surý <[EMAIL PROTECTED]>
-Build-Depends: cdbs, debhelper (>= 4.1.0), libssl-dev, doxygen
-Standards-Version: 3.7.2
+Build-Depends: cdbs, debhelper (>= 5), libssl-dev, doxygen, quilt
+Standards-Version: 3.7.3
Package: libxmlrpc++0
Architecture: any
@@ -20,7 +20,8 @@
Package: libxmlrpc++-dev
Architecture: any
-Depends: libxmlrpc++0 (= ${Source-Version}), pkg-config, libc6-dev | libc-dev
+Section: libdevel
+Depends: libxmlrpc++0 (= ${binary:Version}), pkg-config, libc6-dev | libc-dev
Description: C++ library for XML-RPC - Development files
XmlRpc++ is a C++ implementation of the XML-RPC protocol. It is based upon
Shilad Sen's excellent py-xmlrpc. The XmlRpc protocol was designed to make
diff -u xmlrpc++-0.7+cvs20040713/debian/rules
xmlrpc++-0.7+cvs20040713/debian/rules
--- xmlrpc++-0.7+cvs20040713/debian/rules
+++ xmlrpc++-0.7+cvs20040713/debian/rules
@@ -5 +5,5 @@
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+clean::
+ # Remove doxygen-generated documentation
+ rm -rf doc
only in patch2:
unchanged:
--- xmlrpc++-0.7+cvs20040713.orig/debian/patches/series
+++ xmlrpc++-0.7+cvs20040713/debian/patches/series
@@ -0,0 +1,3 @@
+001_uninitialised_XmlRpcSource_ssl_ssl.patch
+002_incorrect_XmlRpcValue_struct_tm_conversion.patch
+999_autogen.patch
signature.asc
Description: Digital signature
