Author: evgeni
Date: 2011-05-05 11:35:49 +0000 (Thu, 05 May 2011)
New Revision: 12204
Added:
packages/trunk/pokerth/debian/patches/08_use_debian_libircclient.patch
packages/trunk/pokerth/debian/patches/09_use_debian_libtinyxml.patch
Modified:
packages/trunk/pokerth/debian/changelog
packages/trunk/pokerth/debian/control
packages/trunk/pokerth/debian/patches/series
Log:
Don't use the internal copy of libtinyxml and libircclient.
Adds two patches:
- 08_use_debian_libircclient.patch
- 09_use_debian_libtinyxml.patch
And Build-depends on libtinyxml-dev and libircclient-dev.
Modified: packages/trunk/pokerth/debian/changelog
===================================================================
--- packages/trunk/pokerth/debian/changelog 2011-05-05 10:42:43 UTC (rev
12203)
+++ packages/trunk/pokerth/debian/changelog 2011-05-05 11:35:49 UTC (rev
12204)
@@ -7,9 +7,15 @@
* Fix FTBFS with boost1.46 by forcing the v2 filesystem API.
Patch by upstream (07_boost146_ftbfs_upstream.patch).
Closes: #625022
+ * Don't use the internal copy of libtinyxml and libircclient.
+ Adds two patches:
+ - 08_use_debian_libircclient.patch
+ - 09_use_debian_libtinyxml.patch
+ And Build-depends on libtinyxml-dev and libircclient-dev.
- -- Evgeni Golov <[email protected]> Thu, 05 May 2011 11:24:37 +0200
+ -- Evgeni Golov <[email protected]> Thu, 05 May 2011 13:31:45 +0200
+
pokerth (0.8.3-2) unstable; urgency=low
* Upload to unstable.
Modified: packages/trunk/pokerth/debian/control
===================================================================
--- packages/trunk/pokerth/debian/control 2011-05-05 10:42:43 UTC (rev
12203)
+++ packages/trunk/pokerth/debian/control 2011-05-05 11:35:49 UTC (rev
12204)
@@ -7,7 +7,8 @@
libsdl-mixer1.2-dev, libcurl4-gnutls-dev, libgnutls-dev, libsqlite3-dev,
libboost-filesystem-dev (>= 1.36.0), libboost-thread-dev (>= 1.36.0),
libboost-iostreams-dev (>= 1.36.0), libboost-system-dev (>= 1.36.0),
- libboost-program-options-dev (>= 1.36.0)
+ libboost-program-options-dev (>= 1.36.0),
+ libircclient-dev, libtinyxml-dev
Standards-Version: 3.9.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/pokerth/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/pokerth/
Added: packages/trunk/pokerth/debian/patches/08_use_debian_libircclient.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/08_use_debian_libircclient.patch
(rev 0)
+++ packages/trunk/pokerth/debian/patches/08_use_debian_libircclient.patch
2011-05-05 11:35:49 UTC (rev 12204)
@@ -0,0 +1,74 @@
+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
+@@ -297,7 +297,8 @@
+ LIBS += -lpokerth_lib \
+ -lpokerth_db \
+ -lpokerth_protocol \
+- -lcurl
++ -lcurl \
++ -lircclient
+
+ 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
+@@ -18,6 +18,8 @@
+ #QMAKE_CXXFLAGS += -std=gnu++0x
+ #PRECOMPILED_HEADER = src/pch_lib.h
+
++LIBS += -lircclient
++
+ INCLUDEPATH += . \
+ src \
+ src/engine \
+@@ -29,7 +31,7 @@
+ 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 @@
+ src/net \
+ src/core/common \
+ src/third_party/tinyxml \
+- src/third_party/libircclient \
+- src/third_party/libircclient/src \
+- src/third_party/libircclient/include \
+ src/engine/local_engine \
+ src/engine/network_engine \
+ src/net/common \
+@@ -111,8 +110,6 @@
+ src/net/internalchatcleanerpacket.h \
+ src/third_party/tinyxml/tinystr.h \
+ src/third_party/tinyxml/tinyxml.h \
+- src/third_party/libircclient/include/libircclient.h \
+- src/third_party/libircclient/include/config.h \
+ src/engine/local_engine/cardsvalue.h \
+ src/engine/local_engine/localboard.h \
+ src/engine/local_engine/localenginefactory.h \
+@@ -160,7 +157,6 @@
+ src/third_party/tinyxml/tinyxml.cpp \
+ src/third_party/tinyxml/tinyxmlerror.cpp \
+ src/third_party/tinyxml/tinyxmlparser.cpp \
+- src/third_party/libircclient/src/libircclient.c \
+ 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
+@@ -115,7 +115,8 @@
+ LIBS += -lpokerth_lib \
+ -lpokerth_db \
+ -lpokerth_protocol \
+- -lcurl
++ -lcurl \
++ -lircclient
+
+ win32 {
+ DEFINES += CURL_STATICLIB
Added: packages/trunk/pokerth/debian/patches/09_use_debian_libtinyxml.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/09_use_debian_libtinyxml.patch
(rev 0)
+++ packages/trunk/pokerth/debian/patches/09_use_debian_libtinyxml.patch
2011-05-05 11:35:49 UTC (rev 12204)
@@ -0,0 +1,169 @@
+diff -Nrwu pokerth-0.8.3-ircclient/chatcleaner.pro
pokerth-0.8.3-tinyxml/chatcleaner.pro
+--- pokerth-0.8.3-ircclient/chatcleaner.pro 2011-05-05 12:45:25.000000000
+0200
++++ pokerth-0.8.3-tinyxml/chatcleaner.pro 2011-05-05 13:12:11.249862268
+0200
+@@ -12,12 +12,10 @@
+ OBJECTS_DIR = obj
+ TEMPLATE = app
+ INCLUDEPATH += src/ \
+- src/third_party/tinyxml \
+ src/chatcleaner/ \
+ src/third_party/asn1/ \
+ src/net/
+ DEPENDPATH += src/ \
+- src/third_party/tinyxml \
+ src/chatcleaner/ \
+ src/third_party/asn1/ \
+ src/net/
+@@ -27,10 +25,6 @@
+ badwordcheck.cpp \
+ textfloodcheck.cpp \
+ cleanerconfig.cpp \
+- tinystr.cpp \
+- tinyxml.cpp \
+- tinyxmlerror.cpp \
+- tinyxmlparser.cpp \
+ capsfloodcheck.cpp \
+ letterrepeatingcheck.cpp \
+ urlcheck.cpp
+@@ -39,14 +33,13 @@
+ badwordcheck.h \
+ textfloodcheck.h \
+ cleanerconfig.h \
+- tinyxml.h \
+- tinystr.h \
+ capsfloodcheck.h \
+ letterrepeatingcheck.h \
+ urlcheck.h
+ LIBPATH += lib
+ LIBS += -lpokerth_lib \
+- -lpokerth_protocol
++ -lpokerth_protocol \
++ -ltinyxml
+ win32 {
+ LIBPATH += ../boost/stage/lib
+ INCLUDEPATH += ../boost/
+diff -Nrwu pokerth-0.8.3-ircclient/pokerth_game.pro
pokerth-0.8.3-tinyxml/pokerth_game.pro
+--- pokerth-0.8.3-ircclient/pokerth_game.pro 2011-05-05 13:05:01.262936665
+0200
++++ pokerth-0.8.3-tinyxml/pokerth_game.pro 2011-05-05 13:12:37.422388252
+0200
+@@ -33,7 +33,6 @@
+ src/engine/local_engine \
+ src/engine/network_engine \
+ src/config \
+- src/third_party/tinyxml \
+ src/third_party/asn1 \
+ src/gui/qt \
+ src/gui/qt/connecttoserverdialog \
+@@ -71,7 +70,6 @@
+ src/gui \
+ src/net \
+ src/core/common \
+- src/third_party/tinyxml \
+ src/engine/local_engine \
+ src/engine/network_engine \
+ src/gui/qt \
+@@ -131,8 +129,6 @@
+ src/net/socket_msg.h \
+ src/net/socket_startup.h \
+ src/net/net_helper.h \
+- src/third_party/tinyxml/tinystr.h \
+- src/third_party/tinyxml/tinyxml.h \
+ src/engine/local_engine/cardsvalue.h \
+ src/engine/local_engine/localboard.h \
+ src/engine/local_engine/localenginefactory.h \
+@@ -298,7 +294,8 @@
+ -lpokerth_db \
+ -lpokerth_protocol \
+ -lcurl \
+- -lircclient
++ -lircclient \
++ -ltinyxml
+
+ win32 {
+ DEFINES += CURL_STATICLIB
+diff -Nrwu pokerth-0.8.3-ircclient/pokerth_lib.pro
pokerth-0.8.3-tinyxml/pokerth_lib.pro
+--- pokerth-0.8.3-ircclient/pokerth_lib.pro 2011-05-05 13:04:00.271032437
+0200
++++ pokerth-0.8.3-tinyxml/pokerth_lib.pro 2011-05-05 13:13:01.447199314
+0200
+@@ -18,7 +18,8 @@
+ #QMAKE_CXXFLAGS += -std=gnu++0x
+ #PRECOMPILED_HEADER = src/pch_lib.h
+
+-LIBS += -lircclient
++LIBS += -lircclient \
++ -ltinyxml
+
+ INCLUDEPATH += . \
+ src \
+@@ -30,7 +31,6 @@
+ src/engine/local_engine \
+ src/engine/network_engine \
+ src/config \
+- src/third_party/tinyxml \
+ /usr/include/libircclient \
+ src/third_party/asn1 \
+ src/core
+@@ -45,7 +45,6 @@
+ src/gui/generic \
+ src/net \
+ src/core/common \
+- src/third_party/tinyxml \
+ src/engine/local_engine \
+ src/engine/network_engine \
+ src/net/common \
+@@ -108,8 +107,6 @@
+ src/net/downloadhelper.h \
+ src/net/encodedpacket.h \
+ src/net/internalchatcleanerpacket.h \
+- src/third_party/tinyxml/tinystr.h \
+- src/third_party/tinyxml/tinyxml.h \
+ src/engine/local_engine/cardsvalue.h \
+ src/engine/local_engine/localboard.h \
+ src/engine/local_engine/localenginefactory.h \
+@@ -153,10 +150,6 @@
+ src/core/common/crypthelper.cpp \
+ src/core/common/avatarmanager.cpp \
+ src/core/common/pokerthexception.cpp \
+- src/third_party/tinyxml/tinystr.cpp \
+- src/third_party/tinyxml/tinyxml.cpp \
+- src/third_party/tinyxml/tinyxmlerror.cpp \
+- src/third_party/tinyxml/tinyxmlparser.cpp \
+ src/engine/local_engine/cardsvalue.cpp \
+ src/engine/local_engine/localboard.cpp \
+ src/engine/local_engine/localenginefactory.cpp \
+diff -Nrwu pokerth-0.8.3-ircclient/pokerth_server.pro
pokerth-0.8.3-tinyxml/pokerth_server.pro
+--- pokerth-0.8.3-ircclient/pokerth_server.pro 2011-05-05 13:05:21.948191004
+0200
++++ pokerth-0.8.3-tinyxml/pokerth_server.pro 2011-05-05 13:13:23.932214759
+0200
+@@ -31,7 +31,6 @@
+ src/engine/local_engine \
+ src/engine/network_engine \
+ src/config \
+- src/third_party/tinyxml \
+ src/third_party/asn1 \
+ src/core \
+
+@@ -45,7 +44,6 @@
+ src/gui/generic \
+ src/net \
+ src/core/common \
+- src/third_party/tinyxml \
+ src/engine/local_engine \
+ src/engine/network_engine \
+ src/net/common \
+@@ -78,8 +76,6 @@
+ src/net/socket_msg.h \
+ src/net/socket_startup.h \
+ src/net/net_helper.h \
+- src/third_party/tinyxml/tinystr.h \
+- src/third_party/tinyxml/tinyxml.h \
+ src/core/pokerthexception.h \
+ src/core/convhelper.h \
+ src/core/loghelper.h \
+@@ -116,7 +112,8 @@
+ -lpokerth_db \
+ -lpokerth_protocol \
+ -lcurl \
+- -lircclient
++ -lircclient \
++ -ltinyxml
+
+ win32 {
+ DEFINES += CURL_STATICLIB
Modified: packages/trunk/pokerth/debian/patches/series
===================================================================
--- packages/trunk/pokerth/debian/patches/series 2011-05-05 10:42:43 UTC
(rev 12203)
+++ packages/trunk/pokerth/debian/patches/series 2011-05-05 11:35:49 UTC
(rev 12204)
@@ -4,4 +4,5 @@
05_disable_gnu++0x.patch
06_fix_gcc46_ftbfs.patch
07_boost146_ftbfs_upstream.patch
-
+08_use_debian_libircclient.patch
+09_use_debian_libtinyxml.patch
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
