Package: cclive
Version: 0.9.3
Severity: normal
The attached patch includes the changes needed to build against libquvi-0.9.
-- System Information:
Debian Release: stretch/sid
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.3.0-5-generic (SMP w/4 CPU cores)
Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru cclive-0.7.16/debian/changelog cclive-0.9.3/debian/changelog
--- cclive-0.7.16/debian/changelog 2015-07-09 18:51:00.000000000 +1000
+++ cclive-0.9.3/debian/changelog 2016-01-14 18:05:06.000000000 +1100
@@ -1,3 +1,13 @@
+cclive (0.9.3-1) UNRELEASED; urgency=medium
+
+ * New upstream release for libquvi-0.9 support
+ * debian/control.in:
+ - Add build-deps on libglib2.0-dev and libglibmm-2.4-dev
+ - Bump build-deps on libquvi-0.9-dev and libboost
+ * d/p/fix-FTBFS-missing-includes.patch: fix build failure due to missing includes
+
+ -- Tim Lunn <t...@feathertop.org> Thu, 14 Jan 2016 15:18:18 +1100
+
cclive (0.7.16-2.1) unstable; urgency=medium
* Non maintainer upload.
diff -Nru cclive-0.7.16/debian/control cclive-0.9.3/debian/control
--- cclive-0.7.16/debian/control 2014-05-12 07:21:51.000000000 +1000
+++ cclive-0.9.3/debian/control 2016-01-14 15:47:00.000000000 +1100
@@ -6,12 +6,14 @@
Build-Depends: debhelper (>= 9),
dh-autoreconf,
libcurl4-gnutls-dev,
+ libglib2.0-dev,
+ libglibmm-2.4-dev,
libpcre3-dev,
- libquvi-dev (>= 0.2.16.1),
- libboost-filesystem-dev,
- libboost-iostreams-dev,
- libboost-program-options-dev,
- libboost-date-time-dev,
+ libquvi-0.9-dev,
+ libboost-filesystem-dev (>= 1.49),
+ libboost-iostreams-dev (>= 1.49),
+ libboost-program-options-dev (>= 1.49),
+ libboost-date-time-dev (>= 1.49),
asciidoc,
pkg-config
Standards-Version: 3.9.5
diff -Nru cclive-0.7.16/debian/patches/fix-FTBFS-missing-includes.patch cclive-0.9.3/debian/patches/fix-FTBFS-missing-includes.patch
--- cclive-0.7.16/debian/patches/fix-FTBFS-missing-includes.patch 1970-01-01 10:00:00.000000000 +1000
+++ cclive-0.9.3/debian/patches/fix-FTBFS-missing-includes.patch 2016-01-14 16:53:16.000000000 +1100
@@ -0,0 +1,48 @@
+Index: cclive-0.9.3/src/cc/error.h
+===================================================================
+--- cclive-0.9.3.orig/src/cc/error.h
++++ cclive-0.9.3/src/cc/error.h
+@@ -29,6 +29,7 @@
+ #include <boost/exception/errinfo_errno.hpp>
+ #include <boost/tuple/tuple.hpp>
+ #include <cerrno>
++#include <iostream>
+
+ namespace cc
+ {
+Index: cclive-0.9.3/src/cc/options.h
+===================================================================
+--- cclive-0.9.3.orig/src/cc/options.h
++++ cclive-0.9.3/src/cc/options.h
+@@ -38,6 +38,7 @@
+ #include <boost/foreach.hpp>
+ #include <boost/format.hpp>
+ #include <fstream>
++#include <iostream>
+
+ #include <ccerror>
+ #include <ccre>
+Index: cclive-0.9.3/src/cc/sig.h
+===================================================================
+--- cclive-0.9.3.orig/src/cc/sig.h
++++ cclive-0.9.3/src/cc/sig.h
+@@ -28,6 +28,7 @@
+ #include <unistd.h>
+ #include <csignal>
+ #include <cstdio>
++#include <iostream>
+
+ namespace cc
+ {
+Index: cclive-0.9.3/src/cc/error.cpp
+===================================================================
+--- cclive-0.9.3.orig/src/cc/error.cpp
++++ cclive-0.9.3/src/cc/error.cpp
+@@ -20,7 +20,6 @@
+
+ #include <ccinternal>
+
+-#include <iostream>
+ #include <climits>
+ #include <cstring>
+ #include <cerrno>
diff -Nru cclive-0.7.16/debian/patches/fix-rpath.diff cclive-0.9.3/debian/patches/fix-rpath.diff
--- cclive-0.7.16/debian/patches/fix-rpath.diff 2014-05-12 07:21:51.000000000 +1000
+++ cclive-0.9.3/debian/patches/fix-rpath.diff 2016-01-14 15:21:22.000000000 +1100
@@ -6,11 +6,13 @@
Do not set rpath for Boost libraries. While at it, also disable silent rules
to make finding problems easier.
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,8 +17,8 @@
- AC_DEFINE_UNQUOTED([CANONICAL_TARGET], "$target", [...])
- AC_DEFINE_UNQUOTED([CANONICAL_HOST], "$host", [...])
+Index: cclive-0.9.3/configure.ac
+===================================================================
+--- cclive-0.9.3.orig/configure.ac
++++ cclive-0.9.3/configure.ac
+@@ -17,8 +17,8 @@ AC_USE_SYSTEM_EXTENSIONS
+ AC_DEFINE_UNQUOTED([CANONICAL_TARGET], "$target",
+ [Define to canonical target])
-AM_INIT_AUTOMAKE([1.11.1 -Wall -Werror dist-xz no-dist-gzip tar-ustar])
-AM_SILENT_RULES([yes])
@@ -19,9 +21,11 @@
# GNU Automake 1.12 requires this macro. Earlier versions do not
# recognize this macro. Work around this.
---- a/m4/boost.m4
-+++ b/m4/boost.m4
-@@ -421,7 +421,7 @@
+Index: cclive-0.9.3/m4/boost.m4
+===================================================================
+--- cclive-0.9.3.orig/m4/boost.m4
++++ cclive-0.9.3/m4/boost.m4
+@@ -421,7 +421,7 @@ dnl generated only once above (before we
LDFLAGS=$boost_save_LDFLAGS
LIBS=$boost_save_LIBS
])
diff -Nru cclive-0.7.16/debian/patches/series cclive-0.9.3/debian/patches/series
--- cclive-0.7.16/debian/patches/series 2015-07-09 18:48:07.000000000 +1000
+++ cclive-0.9.3/debian/patches/series 2016-01-14 16:54:51.000000000 +1100
@@ -1,2 +1,3 @@
fix-rpath.diff
gcc5.diff
+fix-FTBFS-missing-includes.patch
