[Pkg-voip-commits] r9345 - in /libccrtp/trunk/debian: changelog compat control libccrtp-dev.install libccrtp0.install patches/05_ftbfs_no-add-needed.diff patches/10_ftbfsgcc4.6.diff patches/series rules

msp at alioth.debian.org msp at alioth.debian.org
Sat Oct 29 03:11:22 UTC 2011 

Author: msp
Date: Sat Oct 29 03:11:21 2011
New Revision: 9345

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9345
Log:
* ACK NMU - Thanks Andreas
* debian/control Add package-needs-versioned-debhelper-build-depends 8
 * 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.
 * Non-maintainer upload.
 * Fix FTBFS with --no-add-needed. Closes: #615740
 * Empty dependency_libs in libtool la file. Closes: #610144
   http://wiki.debian.org/ReleaseGoals/LAFileRemoval

Added:
    libccrtp/trunk/debian/patches/05_ftbfs_no-add-needed.diff
    libccrtp/trunk/debian/patches/10_ftbfsgcc4.6.diff
Modified:
    libccrtp/trunk/debian/changelog
    libccrtp/trunk/debian/compat
    libccrtp/trunk/debian/control
    libccrtp/trunk/debian/libccrtp-dev.install
    libccrtp/trunk/debian/libccrtp0.install
    libccrtp/trunk/debian/patches/series
    libccrtp/trunk/debian/rules

Modified: libccrtp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/libccrtp/trunk/debian/changelog?rev=9345&op=diff
==============================================================================
--- libccrtp/trunk/debian/changelog (original)
+++ libccrtp/trunk/debian/changelog Sat Oct 29 03:11:21 2011
@@ -1,16 +1,33 @@
 libccrtp (2.0.1-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * ACK NMU - Thanks Andreas
   * NEW package libccrtp0 - match-soname
   * Switch to dpkg-source 3.0 (quilt) format
     - Drop cdbs 
   * demo/ FTBFS: include debian/patches/without-demo
-  * *.install usr/lib/* -> usr/lib/*/*
-  * Added 9 package-needs-versioned-debhelper-build-depends
-  * Pre-Depend: multiarch-support - missing-pre-dependency-on-multiarch-
-    support
+  * debian/control Add package-needs-versioned-debhelper-build-depends 8
 
  -- Mark Purcell <msp at debian.org>  Sat, 29 Oct 2011 12:50:11 +1100
+
+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 <ametzler at debian.org>  Sun, 08 May 2011 18:12:27 +0200
+
+libccrtp (1.8.0-1.1) unstable; urgency=low
+
+   * Non-maintainer upload.
+   * Fix FTBFS with --no-add-needed. Closes: #615740
+   * Empty dependency_libs in libtool la file. Closes: #610144
+     http://wiki.debian.org/ReleaseGoals/LAFileRemoval
+
+ -- Andreas Metzler <ametzler at debian.org>  Sat, 09 Apr 2011 14:59:25 +0200
 
 libccrtp (1.8.0-1) unstable; urgency=low
 

Modified: libccrtp/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-voip/libccrtp/trunk/debian/compat?rev=9345&op=diff
==============================================================================
--- libccrtp/trunk/debian/compat (original)
+++ libccrtp/trunk/debian/compat Sat Oct 29 03:11:21 2011
@@ -1,1 +1,1 @@
-9
+8

Modified: libccrtp/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/libccrtp/trunk/debian/control?rev=9345&op=diff
==============================================================================
--- libccrtp/trunk/debian/control (original)
+++ libccrtp/trunk/debian/control Sat Oct 29 03:11:21 2011
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Mikael Magnusson <mikma at users.sourceforge.net>, Kilian Krause <kilian at debian.org>
-Build-Depends: debhelper (>= 9), libcommoncpp2-dev (>= 1.3.21-2), libxml2-dev, doxygen, libgcrypt11-dev | libgcrypt-dev, pkg-config, autotools-dev, dpkg-dev (>= 1.13.19)
+Build-Depends: debhelper (>= 8), libcommoncpp2-dev (>= 1.3.21-2), libxml2-dev, doxygen, libgcrypt11-dev | libgcrypt-dev, pkg-config, autotools-dev, dpkg-dev (>= 1.13.19)
 Standards-Version: 3.8.0
 Homepage: http://www.gnu.org/software/ccrtp/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/libccrtp/trunk/
@@ -56,7 +56,6 @@
 Package: libccrtp-doc
 Replaces: libccrtp-dev (<= 1.6.1-1)
 Section: doc
-Pre-Depend: multiarch-support
 Architecture: all
 Depends: ${misc:Depends}
 Description: Documentation files for  GNU ccRTPp library

Modified: libccrtp/trunk/debian/libccrtp-dev.install
URL: http://svn.debian.org/wsvn/pkg-voip/libccrtp/trunk/debian/libccrtp-dev.install?rev=9345&op=diff
==============================================================================
--- libccrtp/trunk/debian/libccrtp-dev.install (original)
+++ libccrtp/trunk/debian/libccrtp-dev.install Sat Oct 29 03:11:21 2011
@@ -1,5 +1,5 @@
 usr/include/*
-usr/lib/*/lib*.a
-usr/lib/*/lib*.so
-usr/lib/*/pkgconfig/*
-usr/lib/*/*.la
+usr/lib/lib*.a
+usr/lib/lib*.so
+usr/lib/pkgconfig/*
+usr/lib/*.la

Modified: libccrtp/trunk/debian/libccrtp0.install
URL: http://svn.debian.org/wsvn/pkg-voip/libccrtp/trunk/debian/libccrtp0.install?rev=9345&op=diff
==============================================================================
--- libccrtp/trunk/debian/libccrtp0.install (original)
+++ libccrtp/trunk/debian/libccrtp0.install Sat Oct 29 03:11:21 2011
@@ -1,1 +1,1 @@
-usr/lib/*/lib*.so.*
+usr/lib/lib*.so.*

Added: libccrtp/trunk/debian/patches/05_ftbfs_no-add-needed.diff
URL: http://svn.debian.org/wsvn/pkg-voip/libccrtp/trunk/debian/patches/05_ftbfs_no-add-needed.diff?rev=9345&op=file
==============================================================================
--- libccrtp/trunk/debian/patches/05_ftbfs_no-add-needed.diff (added)
+++ libccrtp/trunk/debian/patches/05_ftbfs_no-add-needed.diff Sat Oct 29 03:11:21 2011
@@ -1,0 +1,24 @@
+Index: libccrtp-2.0.1/demo/Makefile.am
+===================================================================
+--- libccrtp-2.0.1.orig/demo/Makefile.am	2011-07-10 22:14:02.000000000 +1000
++++ libccrtp-2.0.1/demo/Makefile.am	2011-10-29 14:00:04.000000000 +1100
+@@ -31,6 +31,7 @@
+ noinst_PROGRAMS = rtpsend rtplisten rtphello rtpduphello audiorx audiotx \
+     ccrtptest $(srtp_src)
+ 
++LDADD = $(GNULIBS)
+ rtpsend_SOURCES = rtpsend.cpp
+ rtpsend_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+ 
+Index: libccrtp-2.0.1/demo/Makefile.in
+===================================================================
+--- libccrtp-2.0.1.orig/demo/Makefile.in	2011-07-10 22:14:55.000000000 +1000
++++ libccrtp-2.0.1/demo/Makefile.in	2011-10-29 14:01:13.000000000 +1100
+@@ -67,6 +67,7 @@
+ @SRTP_GCRYPT_FALSE@@SRTP_OPENSSL_TRUE at am__EXEEXT_1 =  \
+ @SRTP_GCRYPT_FALSE@@SRTP_OPENSSL_TRUE@	ccsrtptest$(EXEEXT)
+ @SRTP_GCRYPT_TRUE at am__EXEEXT_1 = ccsrtptest$(EXEEXT)
++LDADD = $(GNULIBS)
+ PROGRAMS = $(noinst_PROGRAMS)
+ am_audiorx_OBJECTS = audiorx.$(OBJEXT)
+ audiorx_OBJECTS = $(am_audiorx_OBJECTS)

Added: libccrtp/trunk/debian/patches/10_ftbfsgcc4.6.diff
URL: http://svn.debian.org/wsvn/pkg-voip/libccrtp/trunk/debian/patches/10_ftbfsgcc4.6.diff?rev=9345&op=file
==============================================================================
--- libccrtp/trunk/debian/patches/10_ftbfsgcc4.6.diff (added)
+++ libccrtp/trunk/debian/patches/10_ftbfsgcc4.6.diff Sat Oct 29 03:11:21 2011
@@ -1,0 +1,12 @@
+Index: libccrtp-2.0.1/src/ccrtp/sources.h
+===================================================================
+--- libccrtp-2.0.1.orig/src/ccrtp/sources.h	2011-05-29 07:47:58.000000000 +1000
++++ libccrtp-2.0.1/src/ccrtp/sources.h	2011-10-29 14:02:14.000000000 +1100
+@@ -46,6 +46,7 @@
+ 
+ #include <string>
+ #include <ccrtp/rtcppkt.h>
++#include <cstddef>
+ 
+ NAMESPACE_COMMONCPP
+ 

Modified: libccrtp/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/libccrtp/trunk/debian/patches/series?rev=9345&op=diff
==============================================================================
--- libccrtp/trunk/debian/patches/series (original)
+++ libccrtp/trunk/debian/patches/series Sat Oct 29 03:11:21 2011
@@ -1,1 +1,3 @@
 without-demo
+05_ftbfs_no-add-needed.diff
+10_ftbfsgcc4.6.diff

Modified: libccrtp/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/libccrtp/trunk/debian/rules?rev=9345&op=diff
==============================================================================
--- libccrtp/trunk/debian/rules (original)
+++ libccrtp/trunk/debian/rules Sat Oct 29 03:11:21 2011
@@ -6,5 +6,14 @@
 %:
 	dh $@
 
+override_dh_install:
+	dh_install --list-missing
+	# Drop content of dependency_libs to avoid having to recompile exiv2
+	# if the path of the libs that appear there changes
+	sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
+
+get-orig-source:
+	uscan --force-download
+
 clean::
 	rm -f doc/latex/* doc/html/* doc/man/man3/* doc/doxy

More information about the Pkg-voip-commits mailing list