[Pkg-voip-commits] r3123 - in libcommoncpp2/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2007-02-07 22:16:20 +0100 (Wed, 07 Feb 2007)
New Revision: 3123

Added:
   libcommoncpp2/trunk/debian/patches/kFreeBSD.dpatch
Modified:
   libcommoncpp2/trunk/debian/changelog
   libcommoncpp2/trunk/debian/patches/01_debian.dpatch
Log:
* (NOT RELEASED YET) New upstream release
* Patch from Peter Salinger (Closes: #403719: libcommoncpp2: FTBFS on
  GNU/kFreeBSD
* Remove ccgnu2-config.8 from debian/patches/01_debian.dpatch

Modified: libcommoncpp2/trunk/debian/changelog
===================================================================
--- libcommoncpp2/trunk/debian/changelog	2007-02-07 21:14:49 UTC (rev 3122)
+++ libcommoncpp2/trunk/debian/changelog	2007-02-07 21:16:20 UTC (rev 3123)
@@ -1,8 +1,11 @@
-libcommoncpp2 (1.5.3-5) UNRELEASED; urgency=low
+libcommoncpp2 (1.5.5-1) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * (NOT RELEASED YET) New upstream release
+  * Patch from Peter Salinger (Closes: #403719: libcommoncpp2: FTBFS on
+    GNU/kFreeBSD
+  * Remove ccgnu2-config.8 from debian/patches/01_debian.dpatch
 
- -- Kilian Krause <kilian at debian.org>  Fri, 19 Jan 2007 11:20:00 +0100
+ -- Mark Purcell <msp at debian.org>  Wed,  7 Feb 2007 21:15:01 +0000
 
 libcommoncpp2 (1.5.3-4) unstable; urgency=low
 

Modified: libcommoncpp2/trunk/debian/patches/01_debian.dpatch
===================================================================
--- libcommoncpp2/trunk/debian/patches/01_debian.dpatch	2007-02-07 21:14:49 UTC (rev 3122)
+++ libcommoncpp2/trunk/debian/patches/01_debian.dpatch	2007-02-07 21:16:20 UTC (rev 3123)
@@ -5,29 +5,6 @@
 ## DP: New patch generated from libcommoncpp2 1.3.25-3 diff.gz
 
 @DPATCH@
-diff -urNad libcommoncpp2-1.3.26~/ccgnu2-config.8 libcommoncpp2-1.3.26/ccgnu2-config.8
---- libcommoncpp2-1.3.26~/ccgnu2-config.8	1970-01-01 01:00:00.000000000 +0100
-+++ libcommoncpp2-1.3.26/ccgnu2-config.8	2006-04-12 19:19:25.000000000 +0100
-@@ -0,0 +1,19 @@
-+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-+.TH CCGNU2-CONFIG "1" "March 2006" "Debian GNU/Linux" "User Commands"
-+.SH NAME
-+ccgnu2-config \- manual page for ccgnu2-config 1.3.25
-+.SH SYNOPSIS
-+.B ccgnu2-config
-+[\fIOPTIONS\fR]
-+.SH OPTIONS
-+.IP
-+[\-\-prefix]
-+[\-\-version]
-+[\-\-flags]
-+[\-\-libs]
-+[\-\-gnulibs]
-+[\-\-iolibs]
-+[\-\-extlibs]
-+[\-\-stdlibs]
-+[\-\-includes]
-+[\-\-module]
 diff -urNad libcommoncpp2-1.3.26~/doc/Doxyfile.in libcommoncpp2-1.3.26/doc/Doxyfile.in
 --- libcommoncpp2-1.3.26~/doc/Doxyfile.in	2005-04-23 23:08:04.000000000 +0100
 +++ libcommoncpp2-1.3.26/doc/Doxyfile.in	2006-04-12 19:19:24.000000000 +0100

Added: libcommoncpp2/trunk/debian/patches/kFreeBSD.dpatch
===================================================================
--- libcommoncpp2/trunk/debian/patches/kFreeBSD.dpatch	2007-02-07 21:14:49 UTC (rev 3122)
+++ libcommoncpp2/trunk/debian/patches/kFreeBSD.dpatch	2007-02-07 21:16:20 UTC (rev 3123)
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## kFreeBSD.dpatch by  <msp at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch from Peter Salinger (http://bugs.debian.org/403719)
+
+ at DPATCH@
+diff -urNad libcommoncpp2-1.5.3~/src/socket.cpp libcommoncpp2-1.5.3/src/socket.cpp
+--- libcommoncpp2-1.5.3~/src/socket.cpp	2006-11-21 14:42:16.000000000 +0000
++++ libcommoncpp2-1.5.3/src/socket.cpp	2007-01-31 19:26:31.000000000 +0000
+@@ -1616,7 +1616,7 @@
+ 	int retval = setsockopt(so, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char *)&group, sizeof(group));
+ 	return errSuccess;
+ 
+-#elif defined(IP_ADD_MEMBERSHIP) && defined(SIOCGIFINDEX) && !defined(__FreeBSD__) && !defined(_OSF_SOURCE) && !defined(__hpux) && !defined(__GNU__)
++#elif defined(IP_ADD_MEMBERSHIP) && defined(SIOCGIFINDEX) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(_OSF_SOURCE) && !defined(__hpux) && !defined(__GNU__)
+         
+ 		struct ip_mreqn      group;
+         struct sockaddr_in   myaddr;
+@@ -1656,7 +1656,7 @@
+ Socket::Error UDPSocket::getInterfaceIndex(const char *DeviceName,int& InterfaceIndex)
+ {
+ #ifndef WIN32
+-#if defined(IP_ADD_MEMBERSHIP) && defined(SIOCGIFINDEX) && !defined(__FreeBSD__) && !defined(_OSF_SOURCE) && !defined(__hpux) && !defined(__GNU__)
++#if defined(IP_ADD_MEMBERSHIP) && defined(SIOCGIFINDEX) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(_OSF_SOURCE) && !defined(__hpux) && !defined(__GNU__)
+ 
+   struct ip_mreqn  mreqn;
+   struct ifreq     m_ifreq;


Property changes on: libcommoncpp2/trunk/debian/patches/kFreeBSD.dpatch
___________________________________________________________________
Name: svn:executable
   + *