r7470 - in /general/libsockets/trunk/debian: changelog control patches/00list patches/01_libsockets-dev-2.2.5_ssloff.dpatch patches/02_gcc43.dpatch patches/libsockets-dev-2.2.5_ssloff.patch rules

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Sat Nov 15 18:42:20 UTC 2008 

Author: tiber-guest
Date: Sat Nov 15 18:42:20 2008
New Revision: 7470

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7470
Log:
* Replaced cdbs patch system by dpatch
* Added 02_gcc43.dpatch to fix gcc 4.3 compilation issues
* Bumped Standards-Version to 3.8.0

Added:
    general/libsockets/trunk/debian/patches/00list
    general/libsockets/trunk/debian/patches/01_libsockets-dev-2.2.5_ssloff.dpatch
    general/libsockets/trunk/debian/patches/02_gcc43.dpatch
Removed:
    general/libsockets/trunk/debian/patches/libsockets-dev-2.2.5_ssloff.patch
Modified:
    general/libsockets/trunk/debian/changelog
    general/libsockets/trunk/debian/control
    general/libsockets/trunk/debian/rules

Modified: general/libsockets/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/general/libsockets/trunk/debian/changelog?rev=7470&op=diff
==============================================================================
--- general/libsockets/trunk/debian/changelog (original)
+++ general/libsockets/trunk/debian/changelog Sat Nov 15 18:42:20 2008
@@ -1,3 +1,11 @@
+libsockets (2.2.5-3) experimental; urgency=low
+
+  * Replaced cdbs patch system by dpatch
+  * Added 02_gcc43.dpatch to fix gcc 4.3 compilation issues
+  * Bumped Standards-Version to 3.8.0
+
+ -- Tobias Grimm <etobi at debian.org>  Sat, 15 Nov 2008 19:40:34 +0100
+
 libsockets (2.2.5-2) experimental; urgency=low
 
   * Compile with -fPIC

Modified: general/libsockets/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/general/libsockets/trunk/debian/control?rev=7470&op=diff
==============================================================================
--- general/libsockets/trunk/debian/control (original)
+++ general/libsockets/trunk/debian/control Sat Nov 15 18:42:20 2008
@@ -1,9 +1,10 @@
 Source: libsockets
 Section: libdevel
 Priority: extra
-Maintainer: Sebastian Dellit <sebo at aritamba.de>
-Build-Depends: cdbs, debhelper (>= 5)
-Standards-Version: 3.7.2
+Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
+Uploaders: Tobias Grimm <etobi at debian.org>
+Build-Depends: cdbs, dpatch, debhelper (>= 5)
+Standards-Version: 3.8.0
 
 Package: libsockets-dev
 Architecture: any

Added: general/libsockets/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/general/libsockets/trunk/debian/patches/00list?rev=7470&op=file
==============================================================================
--- general/libsockets/trunk/debian/patches/00list (added)
+++ general/libsockets/trunk/debian/patches/00list Sat Nov 15 18:42:20 2008
@@ -1,0 +1,2 @@
+01_libsockets-dev-2.2.5_ssloff
+02_gcc43

Added: general/libsockets/trunk/debian/patches/01_libsockets-dev-2.2.5_ssloff.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/general/libsockets/trunk/debian/patches/01_libsockets-dev-2.2.5_ssloff.dpatch?rev=7470&op=file
==============================================================================
--- general/libsockets/trunk/debian/patches/01_libsockets-dev-2.2.5_ssloff.dpatch (added)
+++ general/libsockets/trunk/debian/patches/01_libsockets-dev-2.2.5_ssloff.dpatch Sat Nov 15 18:42:20 2008
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_libsockets-dev-2.2.5_ssloff.dpatch by Tobias Grimm <etobi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Disable OpenSSL support
+
+ at DPATCH@
+diff -urNad libsockets-2.2.5~/sockets-config.h libsockets-2.2.5/sockets-config.h
+--- libsockets-2.2.5~/sockets-config.h	2007-11-04 12:46:02.000000000 +0100
++++ libsockets-2.2.5/sockets-config.h	2008-11-15 18:14:07.000000000 +0100
+@@ -40,7 +40,7 @@
+ 
+ 
+ /* OpenSSL support. */
+-#define HAVE_OPENSSL
++//#define HAVE_OPENSSL
+ 
+ 
+ /* Ipv6 support. */

Added: general/libsockets/trunk/debian/patches/02_gcc43.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/general/libsockets/trunk/debian/patches/02_gcc43.dpatch?rev=7470&op=file
==============================================================================
--- general/libsockets/trunk/debian/patches/02_gcc43.dpatch (added)
+++ general/libsockets/trunk/debian/patches/02_gcc43.dpatch Sat Nov 15 18:42:20 2008
@@ -1,0 +1,150 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_gcc43.dpatch by Tobias Grimm <etobi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes gcc 4.3 compilation issues
+
+ at DPATCH@
+diff -urNad libsockets-2.2.5~/Debug.cpp libsockets-2.2.5/Debug.cpp
+--- libsockets-2.2.5~/Debug.cpp	2007-11-04 12:46:05.000000000 +0100
++++ libsockets-2.2.5/Debug.cpp	2008-11-15 18:37:16.000000000 +0100
+@@ -1,5 +1,6 @@
+ #include "Debug.h"
+ #include <stdarg.h>
++#include <string.h>
+ 
+ 
+ #ifdef SOCKETS_NAMESPACE
+diff -urNad libsockets-2.2.5~/HTTPSocket.cpp libsockets-2.2.5/HTTPSocket.cpp
+--- libsockets-2.2.5~/HTTPSocket.cpp	2007-11-04 12:46:05.000000000 +0100
++++ libsockets-2.2.5/HTTPSocket.cpp	2008-11-15 18:37:16.000000000 +0100
+@@ -35,6 +35,7 @@
+ #include "ISocketHandler.h"
+ #include "Utility.h"
+ #include <stdarg.h>
++#include <string.h>
+ 
+ #ifdef SOCKETS_NAMESPACE
+ namespace SOCKETS_NAMESPACE {
+diff -urNad libsockets-2.2.5~/HttpResponse.cpp libsockets-2.2.5/HttpResponse.cpp
+--- libsockets-2.2.5~/HttpResponse.cpp	2007-11-04 12:46:05.000000000 +0100
++++ libsockets-2.2.5/HttpResponse.cpp	2008-11-15 18:37:16.000000000 +0100
+@@ -32,6 +32,7 @@
+ #include "File.h"
+ #include "Parse.h"
+ #include "Utility.h"
++#include <string.h>
+ 
+ #ifdef SOCKETS_NAMESPACE
+ namespace SOCKETS_NAMESPACE {
+diff -urNad libsockets-2.2.5~/HttpdForm.cpp libsockets-2.2.5/HttpdForm.cpp
+--- libsockets-2.2.5~/HttpdForm.cpp	2007-11-04 12:46:05.000000000 +0100
++++ libsockets-2.2.5/HttpdForm.cpp	2008-11-15 18:37:16.000000000 +0100
+@@ -35,6 +35,7 @@
+ #include "Parse.h"
+ #include "IFile.h"
+ #include "HttpdForm.h"
++#include <string.h>
+ 
+ #ifdef SOCKETS_NAMESPACE
+ namespace SOCKETS_NAMESPACE {
+diff -urNad libsockets-2.2.5~/Ipv4Address.cpp libsockets-2.2.5/Ipv4Address.cpp
+--- libsockets-2.2.5~/Ipv4Address.cpp	2007-11-04 12:46:05.000000000 +0100
++++ libsockets-2.2.5/Ipv4Address.cpp	2008-11-15 18:37:16.000000000 +0100
+@@ -26,6 +26,7 @@
+ #ifndef _WIN32
+ #include <netdb.h>
+ #endif
++#include <string.h>
+ 
+ 
+ #ifdef SOCKETS_NAMESPACE
+diff -urNad libsockets-2.2.5~/Ipv6Address.cpp libsockets-2.2.5/Ipv6Address.cpp
+--- libsockets-2.2.5~/Ipv6Address.cpp	2007-11-04 12:46:05.000000000 +0100
++++ libsockets-2.2.5/Ipv6Address.cpp	2008-11-15 18:37:16.000000000 +0100
+@@ -29,6 +29,7 @@
+ #include <netdb.h>
+ #endif
+ #ifdef IPPROTO_IPV6
++#include <string.h>
+ 
+ #ifdef SOCKETS_NAMESPACE
+ namespace SOCKETS_NAMESPACE {
+diff -urNad libsockets-2.2.5~/ListenSocket.h libsockets-2.2.5/ListenSocket.h
+--- libsockets-2.2.5~/ListenSocket.h	2007-11-04 12:46:02.000000000 +0100
++++ libsockets-2.2.5/ListenSocket.h	2008-11-15 18:37:16.000000000 +0100
+@@ -46,6 +46,7 @@
+ #ifdef ENABLE_EXCEPTIONS
+ #include "Exception.h"
+ #endif
++#include <string.h>
+ 
+ #ifdef SOCKETS_NAMESPACE
+ namespace SOCKETS_NAMESPACE {
+diff -urNad libsockets-2.2.5~/MemFile.cpp libsockets-2.2.5/MemFile.cpp
+--- libsockets-2.2.5~/MemFile.cpp	2007-11-04 12:46:05.000000000 +0100
++++ libsockets-2.2.5/MemFile.cpp	2008-11-15 18:37:16.000000000 +0100
+@@ -34,6 +34,7 @@
+ #include <stdarg.h>
+ 
+ #include "MemFile.h"
++#include <string.h>
+ 
+ 
+ #ifdef SOCKETS_NAMESPACE
+diff -urNad libsockets-2.2.5~/Socket.cpp libsockets-2.2.5/Socket.cpp
+--- libsockets-2.2.5~/Socket.cpp	2007-11-04 12:46:05.000000000 +0100
++++ libsockets-2.2.5/Socket.cpp	2008-11-15 18:37:16.000000000 +0100
+@@ -49,6 +49,7 @@
+ #include "Exception.h"
+ #endif
+ #include "Ipv4Address.h"
++#include <string.h>
+ 
+ #ifdef _DEBUG
+ #define DEB(x) x; fflush(stderr);
+diff -urNad libsockets-2.2.5~/TcpSocket.h libsockets-2.2.5/TcpSocket.h
+--- libsockets-2.2.5~/TcpSocket.h	2007-11-04 12:46:02.000000000 +0100
++++ libsockets-2.2.5/TcpSocket.h	2008-11-15 18:37:16.000000000 +0100
+@@ -35,7 +35,7 @@
+ #include <openssl/ssl.h>
+ #include "SSLInitializer.h"
+ #endif
+-
++#include <string.h>
+ 
+ #define TCP_BUFSIZE_READ 16400
+ #define TCP_OUTPUT_CAPACITY 1024000
+diff -urNad libsockets-2.2.5~/UdpSocket.cpp libsockets-2.2.5/UdpSocket.cpp
+--- libsockets-2.2.5~/UdpSocket.cpp	2007-11-04 12:46:05.000000000 +0100
++++ libsockets-2.2.5/UdpSocket.cpp	2008-11-15 18:37:16.000000000 +0100
+@@ -46,6 +46,7 @@
+ #endif
+ // include this to see strange sights
+ //#include <linux/in6.h>
++#include <string.h>
+ 
+ 
+ #ifdef SOCKETS_NAMESPACE
+diff -urNad libsockets-2.2.5~/Utility.cpp libsockets-2.2.5/Utility.cpp
+--- libsockets-2.2.5~/Utility.cpp	2007-11-04 12:46:05.000000000 +0100
++++ libsockets-2.2.5/Utility.cpp	2008-11-15 18:37:34.000000000 +0100
+@@ -41,6 +41,7 @@
+ #include <pthread.h>
+ #endif
+ #include <map>
++#include <string.h>
+ 
+ #ifdef SOCKETS_NAMESPACE
+ namespace SOCKETS_NAMESPACE {
+diff -urNad libsockets-2.2.5~/Utility.h libsockets-2.2.5/Utility.h
+--- libsockets-2.2.5~/Utility.h	2007-11-04 12:46:02.000000000 +0100
++++ libsockets-2.2.5/Utility.h	2008-11-15 18:37:16.000000000 +0100
+@@ -34,6 +34,7 @@
+ #include <ctype.h>
+ #include <memory>
+ #include "socket_include.h"
++#include <string>
+ 
+ #ifdef SOCKETS_NAMESPACE
+ namespace SOCKETS_NAMESPACE {

Modified: general/libsockets/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/general/libsockets/trunk/debian/rules?rev=7470&op=diff
==============================================================================
--- general/libsockets/trunk/debian/rules (original)
+++ general/libsockets/trunk/debian/rules Sat Nov 15 18:42:20 2008
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
-  
+
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 # Add here any variable or target overrides you need.
 DEB_MAKE_CLEAN_TARGET := clean

More information about the pkg-vdr-dvb-changes mailing list