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

[Mark Purcell]

Author: msp
Date: 2007-02-17 13:51:05 +0100 (Sat, 17 Feb 2007)
New Revision: 3157

Modified:
   libcommoncpp2/trunk/debian/changelog
   libcommoncpp2/trunk/debian/patches/gnutls.dpatch
   libcommoncpp2/trunk/debian/patches/kFreeBSD.dpatch
Log:
* Cleanup debian/patches again

Modified: libcommoncpp2/trunk/debian/changelog
===================================================================
--- libcommoncpp2/trunk/debian/changelog	2007-02-17 12:41:26 UTC (rev 3156)
+++ libcommoncpp2/trunk/debian/changelog	2007-02-17 12:51:05 UTC (rev 3157)
@@ -8,9 +8,9 @@
   * Cleanup gnutls.dpatch for new upstream version
   * delete debian/patches/no_udp_reuseaddr.dpatch - incorporated
     upstream
-  * Cleanup debian/patches
+  * Cleanup debian/patches again
 
- -- Mark Purcell <msp at debian.org>  Sat, 17 Feb 2007 12:41:17 +0000
+ -- Mark Purcell <msp at debian.org>  Sat, 17 Feb 2007 12:50:52 +0000
 
 libcommoncpp2 (1.5.3-4) unstable; urgency=low
 

Modified: libcommoncpp2/trunk/debian/patches/gnutls.dpatch
===================================================================
--- libcommoncpp2/trunk/debian/patches/gnutls.dpatch	2007-02-17 12:41:26 UTC (rev 3156)
+++ libcommoncpp2/trunk/debian/patches/gnutls.dpatch	2007-02-17 12:51:05 UTC (rev 3157)
@@ -6,30 +6,9 @@
 ## DP: but the ssl libs don't need to be added to the pkg-config file.
 
 @DPATCH@
-diff -urNad libcommoncpp2-1.5.5~/src/Makefile.am.rej libcommoncpp2-1.5.5/src/Makefile.am.rej
---- libcommoncpp2-1.5.5~/src/Makefile.am.rej	1970-01-01 01:00:00.000000000 +0100
-+++ libcommoncpp2-1.5.5/src/Makefile.am.rej	2007-02-17 12:09:54.000000000 +0000
-@@ -0,0 +1,17 @@
-+***************
-+*** 45,51 ****
-+  	cidr.cpp private.h nat.h
-+  
-+  if EXTRAS
-+- libccext2_la_LIBADD = @BASE_LIB@ @THREAD_LIBS@
-+  libccext2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
-+  
-+  if GETOPT_LONG
-+--- 45,51 ----
-+  	cidr.cpp private.h nat.h
-+  
-+  if EXTRAS
-++ libccext2_la_LIBADD = @BASE_LIB@ @SSL_LIBS@ @THREAD_LIBS@
-+  libccext2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
-+  
-+  if GETOPT_LONG
 diff -urNad libcommoncpp2-1.5.5~/src/Makefile.in libcommoncpp2-1.5.5/src/Makefile.in
 --- libcommoncpp2-1.5.5~/src/Makefile.in	2007-01-25 13:30:43.000000000 +0000
-+++ libcommoncpp2-1.5.5/src/Makefile.in	2007-02-17 12:09:54.000000000 +0000
++++ libcommoncpp2-1.5.5/src/Makefile.in	2007-02-17 12:48:55.000000000 +0000
 @@ -320,7 +320,7 @@
  aclocal_DATA = ost_check2.m4
  scriptdir = $(bindir)
@@ -41,7 +20,7 @@
  libccgnu2_la_SOURCES = thread.cpp mutex.cpp semaphore.cpp threadkey.cpp \
 diff -urNad libcommoncpp2-1.5.5~/src/libccext2.pc.in libcommoncpp2-1.5.5/src/libccext2.pc.in
 --- libcommoncpp2-1.5.5~/src/libccext2.pc.in	2007-01-25 13:25:55.000000000 +0000
-+++ libcommoncpp2-1.5.5/src/libccext2.pc.in	2007-02-17 12:09:54.000000000 +0000
++++ libcommoncpp2-1.5.5/src/libccext2.pc.in	2007-02-17 12:48:55.000000000 +0000
 @@ -7,6 +7,6 @@
  Description: GNU Common C++ Extension library
  Version: @VERSION@

Modified: libcommoncpp2/trunk/debian/patches/kFreeBSD.dpatch
===================================================================
--- libcommoncpp2/trunk/debian/patches/kFreeBSD.dpatch	2007-02-17 12:41:26 UTC (rev 3156)
+++ libcommoncpp2/trunk/debian/patches/kFreeBSD.dpatch	2007-02-17 12:51:05 UTC (rev 3157)
@@ -5,19 +5,19 @@
 ## DP: Patch from Peter Salinger (http://bugs.debian.org/403719)
 
 @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 @@
+diff -urNad libcommoncpp2-1.5.5~/src/socket.cpp libcommoncpp2-1.5.5/src/socket.cpp
+--- libcommoncpp2-1.5.5~/src/socket.cpp	2007-01-24 19:56:32.000000000 +0000
++++ libcommoncpp2-1.5.5/src/socket.cpp	2007-02-17 12:47:53.000000000 +0000
+@@ -1540,7 +1540,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 @@
+ 	struct sockaddr_in   myaddr;
+@@ -1580,7 +1580,7 @@
  Socket::Error UDPSocket::getInterfaceIndex(const char *DeviceName,int& InterfaceIndex)
  {
  #ifndef WIN32