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

[Mark Purcell]

Author: msp
Date: 2007-02-17 13:11:45 +0100 (Sat, 17 Feb 2007)
New Revision: 3154

Modified:
   libcommoncpp2/trunk/debian/changelog
   libcommoncpp2/trunk/debian/patches/gnutls.dpatch
Log:
* Cleanup gnutls.dpatch for new upstream version

Modified: libcommoncpp2/trunk/debian/changelog
===================================================================
--- libcommoncpp2/trunk/debian/changelog	2007-02-14 14:26:07 UTC (rev 3153)
+++ libcommoncpp2/trunk/debian/changelog	2007-02-17 12:11:45 UTC (rev 3154)
@@ -1,11 +1,13 @@
 libcommoncpp2 (1.5.5-1) UNRELEASED; urgency=low
 
+  [ Mark Purcell ]
   * (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
+  * Cleanup gnutls.dpatch for new upstream version
 
- -- Mark Purcell <msp at debian.org>  Wed,  7 Feb 2007 21:15:01 +0000
+ -- Mark Purcell <msp at debian.org>  Sat, 17 Feb 2007 12:10:58 +0000
 
 libcommoncpp2 (1.5.3-4) unstable; urgency=low
 

Modified: libcommoncpp2/trunk/debian/patches/gnutls.dpatch
===================================================================
--- libcommoncpp2/trunk/debian/patches/gnutls.dpatch	2007-02-14 14:26:07 UTC (rev 3153)
+++ libcommoncpp2/trunk/debian/patches/gnutls.dpatch	2007-02-17 12:11:45 UTC (rev 3154)
@@ -6,38 +6,47 @@
 ## DP: but the ssl libs don't need to be added to the pkg-config file.
 
 @DPATCH@
-diff -urNad libcommoncpp2-1.5.1~/src/Makefile.am libcommoncpp2-1.5.1/src/Makefile.am
---- libcommoncpp2-1.5.1~/src/Makefile.am	2006-09-30 18:41:53.000000000 +0200
-+++ libcommoncpp2-1.5.1/src/Makefile.am	2006-10-25 09:06:10.000000000 +0200
-@@ -45,7 +45,7 @@
- 	cidr.cpp private.h nat.h
- 
- if EXTRAS
--libccext2_la_LIBADD = @BASE_LIB@ @THREAD_LIBS@
-+libccext2_la_LIBADD = @BASE_LIB@ @SSL_LIBS@ @THREAD_LIBS@
- libccext2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
- 
- if GETOPT_LONG
-diff -urNad libcommoncpp2-1.5.1~/src/Makefile.in libcommoncpp2-1.5.1/src/Makefile.in
---- libcommoncpp2-1.5.1~/src/Makefile.in	2006-10-07 20:14:54.000000000 +0200
-+++ libcommoncpp2-1.5.1/src/Makefile.in	2006-10-25 09:06:10.000000000 +0200
-@@ -324,7 +324,7 @@
- 	nat.cpp runlist.cpp assoc.cpp pointer.cpp linked.cpp map.cpp \
- 	cidr.cpp private.h nat.h
- 
-- at EXTRAS_TRUE@libccext2_la_LIBADD = @BASE_LIB@ @THREAD_LIBS@
-+ at EXTRAS_TRUE@libccext2_la_LIBADD = @BASE_LIB@ @SSL_LIBS@ @THREAD_LIBS@
- @EXTRAS_TRUE at libccext2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
- @EXTRAS_TRUE@@GETOPT_LONG_TRUE at optincludedir = $(includedir)/cc++2
- @EXTRAS_TRUE@@GETOPT_LONG_TRUE at optinclude_HEADERS = getopt.h
-diff -urNad libcommoncpp2-1.5.1~/src/libccext2.pc.in libcommoncpp2-1.5.1/src/libccext2.pc.in
---- libcommoncpp2-1.5.1~/src/libccext2.pc.in	2006-10-01 15:01:41.000000000 +0200
-+++ libcommoncpp2-1.5.1/src/libccext2.pc.in	2006-10-25 09:06:10.000000000 +0200
-@@ -8,6 +8,6 @@
+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
+@@ -320,7 +320,7 @@
+ aclocal_DATA = ost_check2.m4
+ scriptdir = $(bindir)
+ script_DATA = ccgnu2-config
+-libccgnu2_la_LIBADD = @THREAD_LIBS@
++libccgnu2_la_LIBADD = @THREAD_LIBS@ @SSL_LIBS@
+ libccgnu2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
+ noinst_DATA = @STAGE2@
+ 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
+@@ -7,6 +7,6 @@
  Description: GNU Common C++ Extension library
  Version: @VERSION@
  Requires: libccgnu2 = @VERSION@
--Libs: -lccext2 @GETOPT_LIBS@ @SSL_LIBS@
-+Libs: -lccext2 @GETOPT_LIBS@
+-Libs: -lccext2 @GETOPT_LIBS@ @SSL_LIBS@ @ZSTREAM_LIBS@
++Libs: -lccext2 @GETOPT_LIBS@ @ZSTREAM_LIBS@