On 2011-05-08 Andreas Metzler <ametz...@downhill.at.eu.org> wrote:
[...]
> On 2011-05-08 Stefan Lesicnik <ste...@lsd.co.za> wrote:
> > Package: libccrtp
> > Version: 1.8.0-1.1
> > Severity: normal
[...]
> > * Fix FTBFS (LP: #770928)
> > - debian/patches/ftbs-gcc46.diff
> thanks for forwarding the fix. This fixes the build failure of
> libzrtpcpp, too.
> Dear libccrtp maintainers: I am going to NMU this bug with the
> provided patch, unless you tell me to do otherwise.
Hello,
I have just uploaded a NMU to delayed/2. NMU diff attached.
cu andreas
--
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'
diff -u libccrtp-1.8.0/debian/changelog libccrtp-1.8.0/debian/changelog
--- libccrtp-1.8.0/debian/changelog
+++ libccrtp-1.8.0/debian/changelog
@@ -1,3 +1,13 @@
+libccrtp (1.8.0-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * [10_ftbfsgcc4.6.diff] Fix FTBFS with gcc-4.6. Patch provided and forwarded
+ from Ubuntu. (Thanks, Stefan Lesicnik) Closes: #626065
+ * Fix from previous NMU: Package uses simple-patchsys, move fix for
+ #615740 to debian/patches/05_ftbfs_no-add-needed.diff.
+
+ -- Andreas Metzler <ametz...@debian.org> Sun, 08 May 2011 18:12:27 +0200
+
libccrtp (1.8.0-1.1) unstable; urgency=low
* Non-maintainer upload.
reverted:
--- libccrtp-1.8.0/demo/Makefile.am
+++ libccrtp-1.8.0.orig/demo/Makefile.am
@@ -31,7 +31,6 @@
noinst_PROGRAMS = rtpsend rtplisten rtphello rtpduphello audiorx audiotx \
ccrtptest $(srtp_src)
-LDADD = $(GNULIBS)
rtpsend_SOURCES = rtpsend.cpp
rtpsend_LDFLAGS = ../src/libccrtp1.la
reverted:
--- libccrtp-1.8.0/demo/Makefile.in
+++ libccrtp-1.8.0.orig/demo/Makefile.in
@@ -301,7 +301,6 @@
@SRTP_OPENSSL_TRUE@ccsrtptest_SOURCES = ccsrtptest.cpp
@SRTP_GCRYPT_TRUE@ccsrtptest_LDFLAGS = ../src/libccrtp1.la
@SRTP_OPENSSL_TRUE@ccsrtptest_LDFLAGS = ../src/libccrtp1.la
-LDADD = $(GNULIBS)
rtpsend_SOURCES = rtpsend.cpp
rtpsend_LDFLAGS = ../src/libccrtp1.la
rtplisten_SOURCES = rtplisten.cpp
only in patch2:
unchanged:
--- libccrtp-1.8.0.orig/debian/patches/10_ftbfsgcc4.6.diff
+++ libccrtp-1.8.0/debian/patches/10_ftbfsgcc4.6.diff
@@ -0,0 +1,11 @@
+diff -Nur -x '*.orig' -x '*~' oneiric//src/ccrtp/sources.h oneiric.new//src/ccrtp/sources.h
+--- oneiric//src/ccrtp/sources.h 2011-05-08 15:31:20.775179975 +0200
++++ oneiric.new//src/ccrtp/sources.h 2011-05-08 15:34:46.975482407 +0200
+@@ -46,6 +46,7 @@
+
+ #include <string>
+ #include <ccrtp/rtcppkt.h>
++#include <cstddef>
+
+ #ifdef CCXX_NAMESPACES
+ namespace ost {
only in patch2:
unchanged:
--- libccrtp-1.8.0.orig/debian/patches/05_ftbfs_no-add-needed.diff
+++ libccrtp-1.8.0/debian/patches/05_ftbfs_no-add-needed.diff
@@ -0,0 +1,20 @@
+--- libccrtp-1.8.0.orig/demo/Makefile.am
++++ libccrtp-1.8.0/demo/Makefile.am
+@@ -31,6 +31,7 @@
+ noinst_PROGRAMS = rtpsend rtplisten rtphello rtpduphello audiorx audiotx \
+ ccrtptest $(srtp_src)
+
++LDADD = $(GNULIBS)
+ rtpsend_SOURCES = rtpsend.cpp
+ rtpsend_LDFLAGS = ../src/libccrtp1.la
+
+--- libccrtp-1.8.0.orig/demo/Makefile.in
++++ libccrtp-1.8.0/demo/Makefile.in
+@@ -301,6 +301,7 @@
+ @SRTP_OPENSSL_TRUE@ccsrtptest_SOURCES = ccsrtptest.cpp
+ @SRTP_GCRYPT_TRUE@ccsrtptest_LDFLAGS = ../src/libccrtp1.la
+ @SRTP_OPENSSL_TRUE@ccsrtptest_LDFLAGS = ../src/libccrtp1.la
++LDADD = $(GNULIBS)
+ rtpsend_SOURCES = rtpsend.cpp
+ rtpsend_LDFLAGS = ../src/libccrtp1.la
+ rtplisten_SOURCES = rtplisten.cpp
