r12206 - packages/trunk/pokerth/debian/patches

[Evgeni Golov]

Author: evgeni
Date: 2011-05-05 11:41:05 +0000 (Thu, 05 May 2011)
New Revision: 12206

Modified:
   packages/trunk/pokerth/debian/patches/08_use_debian_libircclient.patch
Log:
don't add /usr/include/libircclient to inlcudedirs

but include libircclient/libircclient.h directly


Modified: packages/trunk/pokerth/debian/patches/08_use_debian_libircclient.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/08_use_debian_libircclient.patch	2011-05-05 11:38:53 UTC (rev 12205)
+++ packages/trunk/pokerth/debian/patches/08_use_debian_libircclient.patch	2011-05-05 11:41:05 UTC (rev 12206)
@@ -1,6 +1,7 @@
-diff -Nrwu pokerth-0.8.3/pokerth_game.pro pokerth-0.8.3-ircclient/pokerth_game.pro
---- pokerth-0.8.3/pokerth_game.pro	2011-05-05 13:06:44.000000000 +0200
-+++ pokerth-0.8.3-ircclient/pokerth_game.pro	2011-05-05 13:05:01.262936665 +0200
+Index: pokerth-0.8.3/pokerth_game.pro
+===================================================================
+--- pokerth-0.8.3.orig/pokerth_game.pro	2011-05-05 13:38:57.388671115 +0200
++++ pokerth-0.8.3/pokerth_game.pro	2011-05-05 13:39:04.771691128 +0200
 @@ -297,7 +297,8 @@
  LIBS += -lpokerth_lib \
  	-lpokerth_db \
@@ -11,9 +12,10 @@
  
  win32 { 
  	DEFINES += CURL_STATICLIB
-diff -Nrwu pokerth-0.8.3/pokerth_lib.pro pokerth-0.8.3-ircclient/pokerth_lib.pro
---- pokerth-0.8.3/pokerth_lib.pro	2011-05-05 13:06:44.000000000 +0200
-+++ pokerth-0.8.3-ircclient/pokerth_lib.pro	2011-05-05 13:04:00.271032437 +0200
+Index: pokerth-0.8.3/pokerth_lib.pro
+===================================================================
+--- pokerth-0.8.3.orig/pokerth_lib.pro	2011-05-05 13:38:57.388671115 +0200
++++ pokerth-0.8.3/pokerth_lib.pro	2011-05-05 13:39:55.628940582 +0200
 @@ -18,6 +18,8 @@
  #QMAKE_CXXFLAGS += -std=gnu++0x
  #PRECOMPILED_HEADER = src/pch_lib.h
@@ -23,16 +25,15 @@
  INCLUDEPATH += . \
  		src \
  		src/engine \
-@@ -29,7 +31,7 @@
+@@ -29,7 +31,6 @@
  		src/engine/network_engine \
  		src/config \
  		src/third_party/tinyxml \
 -		src/third_party/libircclient/include \
-+		/usr/include/libircclient \
  		src/third_party/asn1 \
  		src/core
  
-@@ -44,9 +46,6 @@
+@@ -44,9 +45,6 @@
  		src/net \
  		src/core/common \
  		src/third_party/tinyxml \
@@ -42,7 +43,7 @@
  		src/engine/local_engine \
  		src/engine/network_engine \
  		src/net/common \
-@@ -111,8 +110,6 @@
+@@ -111,8 +109,6 @@
  		src/net/internalchatcleanerpacket.h \
  		src/third_party/tinyxml/tinystr.h \
  		src/third_party/tinyxml/tinyxml.h \
@@ -51,7 +52,7 @@
  		src/engine/local_engine/cardsvalue.h \
  		src/engine/local_engine/localboard.h \
  		src/engine/local_engine/localenginefactory.h \
-@@ -160,7 +157,6 @@
+@@ -160,7 +156,6 @@
  		src/third_party/tinyxml/tinyxml.cpp \
  		src/third_party/tinyxml/tinyxmlerror.cpp \
  		src/third_party/tinyxml/tinyxmlparser.cpp \
@@ -59,9 +60,10 @@
  		src/engine/local_engine/cardsvalue.cpp \
  		src/engine/local_engine/localboard.cpp \
  		src/engine/local_engine/localenginefactory.cpp \
-diff -Nrwu pokerth-0.8.3/pokerth_server.pro pokerth-0.8.3-ircclient/pokerth_server.pro
---- pokerth-0.8.3/pokerth_server.pro	2011-05-05 13:06:44.000000000 +0200
-+++ pokerth-0.8.3-ircclient/pokerth_server.pro	2011-05-05 13:05:21.948191004 +0200
+Index: pokerth-0.8.3/pokerth_server.pro
+===================================================================
+--- pokerth-0.8.3.orig/pokerth_server.pro	2011-05-05 13:38:57.388671115 +0200
++++ pokerth-0.8.3/pokerth_server.pro	2011-05-05 13:39:04.779690067 +0200
 @@ -115,7 +115,8 @@
  LIBS += -lpokerth_lib \
  	-lpokerth_db \
@@ -72,3 +74,16 @@
  
  win32 {
  	DEFINES += CURL_STATICLIB
+Index: pokerth-0.8.3/src/net/common/ircthread.cpp
+===================================================================
+--- pokerth-0.8.3.orig/src/net/common/ircthread.cpp	2011-05-05 13:39:22.157383436 +0200
++++ pokerth-0.8.3/src/net/common/ircthread.cpp	2011-05-05 13:39:40.966886754 +0200
+@@ -20,7 +20,7 @@
+ #include <net/socket_helper.h>
+ #include <net/ircthread.h>
+ #include <net/socket_msg.h>
+-#include <libircclient.h>
++#include <libircclient/libircclient.h>
+ #include <boost/algorithm/string/predicate.hpp>
+ #include <queue>
+ #include <sstream>