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

[Mark Purcell]

Author: msp
Date: 2007-04-12 16:29:29 +0000 (Thu, 12 Apr 2007)
New Revision: 3388

Removed:
   libcommoncpp2/trunk/debian/patches/kFreeBSD.dpatch
Modified:
   libcommoncpp2/trunk/debian/changelog
   libcommoncpp2/trunk/debian/patches/00list
   libcommoncpp2/trunk/debian/patches/soname-1.5.3.dpatch
Log:
* New upstream release
* Remove debian/patches/kFreeBSD.dpatch encorporated upstream
* Update debian/patches/soname-1.5.3.dpatch

Modified: libcommoncpp2/trunk/debian/changelog
===================================================================
--- libcommoncpp2/trunk/debian/changelog	2007-04-12 15:14:37 UTC (rev 3387)
+++ libcommoncpp2/trunk/debian/changelog	2007-04-12 16:29:29 UTC (rev 3388)
@@ -1,15 +1,11 @@
-libcommoncpp2 (1.5.6-1) UNRELEASED; urgency=low
+libcommoncpp2 (1.5.6-1) unstable; urgency=low
 
-  * (NOT RELEASED YET) New upstream release
+  * New upstream release
+  * Remove debian/patches/kFreeBSD.dpatch encorporated upstream
+  * Update debian/patches/soname-1.5.3.dpatch
 
- -- Mark Purcell <msp at debian.org>  Thu, 22 Mar 2007 07:23:15 +0000
+ -- Mark Purcell <msp at debian.org>  Thu, 12 Apr 2007 16:22:05 +0100
 
-libcommoncpp2 (1.5.5-2) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- Mark Purcell <msp at debian.org>  Sat, 17 Feb 2007 13:25:35 +0000
-
 libcommoncpp2 (1.5.5-1) unstable; urgency=low
 
   [ Mark Purcell ]

Modified: libcommoncpp2/trunk/debian/patches/00list
===================================================================
--- libcommoncpp2/trunk/debian/patches/00list	2007-04-12 15:14:37 UTC (rev 3387)
+++ libcommoncpp2/trunk/debian/patches/00list	2007-04-12 16:29:29 UTC (rev 3388)
@@ -1,4 +1,3 @@
 01_debian
 gnutls
 soname-1.5.3
-kFreeBSD

Deleted: libcommoncpp2/trunk/debian/patches/kFreeBSD.dpatch
===================================================================
--- libcommoncpp2/trunk/debian/patches/kFreeBSD.dpatch	2007-04-12 15:14:37 UTC (rev 3387)
+++ libcommoncpp2/trunk/debian/patches/kFreeBSD.dpatch	2007-04-12 16:29:29 UTC (rev 3388)
@@ -1,28 +0,0 @@
-#! /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.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;
-@@ -1580,7 +1580,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;

Modified: libcommoncpp2/trunk/debian/patches/soname-1.5.3.dpatch
===================================================================
--- libcommoncpp2/trunk/debian/patches/soname-1.5.3.dpatch	2007-04-12 15:14:37 UTC (rev 3387)
+++ libcommoncpp2/trunk/debian/patches/soname-1.5.3.dpatch	2007-04-12 16:29:29 UTC (rev 3388)
@@ -5,27 +5,27 @@
 ## DP: v1.5.3 requires an soname update
 
 @DPATCH@
-diff -urNad libcommoncpp2-1.5.5~/configure libcommoncpp2-1.5.5/configure
---- libcommoncpp2-1.5.5~/configure	2007-01-25 13:30:45.000000000 +0000
-+++ libcommoncpp2-1.5.5/configure	2007-02-17 12:38:37.000000000 +0000
+diff -urNad libcommoncpp2-1.5.6~/configure libcommoncpp2-1.5.6/configure
+--- libcommoncpp2-1.5.6~/configure	2007-02-20 08:39:30.000000000 +0000
++++ libcommoncpp2-1.5.6/configure	2007-04-12 16:15:18.000000000 +0100
 @@ -1518,7 +1518,7 @@
  
  
- VERSION="1.5.5"
+ VERSION="1.5.6"
 -LT_RELEASE="1.5"
 +LT_RELEASE="1.5.3"
- LT_VERSION="0:5"
+ LT_VERSION="0:6"
  
  ac_ext=cc
-diff -urNad libcommoncpp2-1.5.5~/configure.ac libcommoncpp2-1.5.5/configure.ac
---- libcommoncpp2-1.5.5~/configure.ac	2007-01-25 13:30:23.000000000 +0000
-+++ libcommoncpp2-1.5.5/configure.ac	2007-02-17 12:38:17.000000000 +0000
+diff -urNad libcommoncpp2-1.5.6~/configure.ac libcommoncpp2-1.5.6/configure.ac
+--- libcommoncpp2-1.5.6~/configure.ac	2007-02-20 08:35:39.000000000 +0000
++++ libcommoncpp2-1.5.6/configure.ac	2007-04-12 16:15:47.000000000 +0100
 @@ -11,7 +11,7 @@
  AC_INIT(src/thread.cpp)
  
- VERSION="1.5.5"
+ VERSION="1.5.6"
 -LT_RELEASE="1.5"
 +LT_RELEASE="1.5.3"
- LT_VERSION="0:5"
+ LT_VERSION="0:6"
  
  dnl this is a C++ library after all..