r13118 - in packages/trunk/pokerth/debian: . patches

Sat Jan 14 08:39:36 UTC 2012

Author: softcoder-guest
Date: 2012-01-14 08:39:35 +0000 (Sat, 14 Jan 2012)
New Revision: 13118

Modified:
   packages/trunk/pokerth/debian/changelog
   packages/trunk/pokerth/debian/copyright
   packages/trunk/pokerth/debian/patches/03_use_--as-needed.patch
   packages/trunk/pokerth/debian/patches/08_use_debian_libircclient.patch
   packages/trunk/pokerth/debian/patches/series
Log:
updated to correct some patches and copyrights

Modified: packages/trunk/pokerth/debian/changelog
===================================================================

--- packages/trunk/pokerth/debian/changelog	2012-01-14 02:38:11 UTC (rev 13117)
+++ packages/trunk/pokerth/debian/changelog	2012-01-14 08:39:35 UTC (rev 13118)
@@ -1,13 +1,12 @@
 pokerth (0.9.1-1) UNRELEASED; urgency=low
 
-  * NOT YET READY TO UPLOAD:
-    - patches need updating
-
   * Team upload.
 
   [ Mark Vejvoda ]
   * New upstream release (Closes: #653466)
     - Works with the official servers (Closes: #654578)
+    - Updated patches that apply to new release
+    - updated copyrights
 
   [ Paul Wise ]
   * Drop README.source, no longer needed

Modified: packages/trunk/pokerth/debian/copyright
===================================================================
--- packages/trunk/pokerth/debian/copyright	2012-01-14 02:38:11 UTC (rev 13117)
+++ packages/trunk/pokerth/debian/copyright	2012-01-14 08:39:35 UTC (rev 13118)
@@ -98,6 +98,26 @@
 Copyright: © 2004, 2005 M. Tuexen tuexen at fh-muenster.de
 Licence: BSD-3
 
+Files: tests/src/de/rtner/security/auth/spi/*.java
+Copyright: © 2007 Matthias Gärtner
+Licence: LGPL+2.1
+
+Files: tests/src/pokerth_test/*.java
+Copyright: © 2010 Lothar May
+Licence: AGPL+3
+
+Files: src/third_party/qt*
+Copyright: © 2009 Nokia Corporation and/or its subsidiary(-ies)
+Licence: LGPL+2.1
+
+Files: src/third_party/asn1/*
+Copyright: © 2003, 2007 Lev Walkin <vlm at lionet.info>
+Licence: BSD
+
+Files: src/third_party/boost/*
+Copyright: © Vaucher Philippe 2007
+Licence: BSL-1
+
 Files: data/fonts/VeraBd.ttf
 Copyright: © 2003 Bitstream, Inc.
 License: other

Modified: packages/trunk/pokerth/debian/patches/03_use_--as-needed.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/03_use_--as-needed.patch	2012-01-14 02:38:11 UTC (rev 13117)
+++ packages/trunk/pokerth/debian/patches/03_use_--as-needed.patch	2012-01-14 08:39:35 UTC (rev 13118)
@@ -1,14 +1,14 @@
 Author: Evgeni Golov <sargentd at die-welt.net>
-Description: Re-enable --as-needed for pokerth, after it was removed as defult
-from the libqt4-dev package.
---- pokerth-0.6.2.orig/pokerth_game.pro
-+++ pokerth-0.6.2/pokerth_game.pro
-@@ -20,6 +20,8 @@
- DEFINES += PREFIX=\"$${PREFIX}\"
- TARGET = pokerth
- 
-+QMAKE_LFLAGS += -Wl,--as-needed
-+
- INCLUDEPATH += . \
- 		src \
- 		src/engine \
+Description: Re-enable --as-needed for pokerth, after it was removed as default
+from the libqt4-dev package. *NOTE: updated for 0.9.1 upstream release
+--- PokerTH-0.9.1-src-orig/pokerth_game.pro
++++ PokerTH-0.9.1-src/pokerth_game.pro
+@@ -23,6 +23,8 @@
+ DEFINES += PREFIX=\"$${PREFIX}\"
+ TARGET = pokerth
+ 
++QMAKE_LFLAGS += -Wl,--as-needed
++
+ # PRECOMPILED_HEADER = src/pch_game.h
+ RESOURCES = src/gui/qt/resources/pokerth.qrc
+ INCLUDEPATH += . \

Modified: packages/trunk/pokerth/debian/patches/08_use_debian_libircclient.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/08_use_debian_libircclient.patch	2012-01-14 02:38:11 UTC (rev 13117)
+++ packages/trunk/pokerth/debian/patches/08_use_debian_libircclient.patch	2012-01-14 08:39:35 UTC (rev 13118)
@@ -2,11 +2,11 @@
 Subject: stop using src/third_party/libircclient
  Use libircclient from the system, not the one shipped in the tarball.
 
-Index: pokerth-0.8.3/pokerth_game.pro
+Index: PokerTH-0.9.1-src/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 @@
+--- PokerTH-0.9.1-src-orig/pokerth_game.pro	2012-01-09 13:06:38.000000000 -0800
++++ PokerTH-0.9.1-src/pokerth_game.pro	2012-01-13 20:01:20.734402187 -0800
+@@ -303,7 +305,8 @@
  LIBS += -lpokerth_lib \
  	-lpokerth_db \
  	-lpokerth_protocol \
@@ -16,78 +16,3 @@
  
  win32 { 
  	DEFINES += CURL_STATICLIB
-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
- 
-+LIBS += -lircclient
-+
- INCLUDEPATH += . \
- 		src \
- 		src/engine \
-@@ -29,7 +31,6 @@
- 		src/engine/network_engine \
- 		src/config \
- 		src/third_party/tinyxml \
--		src/third_party/libircclient/include \
- 		src/third_party/asn1 \
- 		src/core
- 
-@@ -44,9 +45,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 +109,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 +156,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 \
-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 \
- 	-lpokerth_protocol \
--	-lcurl
-+	-lcurl \
-+	-lircclient
- 
- 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>

Modified: packages/trunk/pokerth/debian/patches/series
===================================================================
--- packages/trunk/pokerth/debian/patches/series	2012-01-14 02:38:11 UTC (rev 13117)
+++ packages/trunk/pokerth/debian/patches/series	2012-01-14 08:39:35 UTC (rev 13118)
@@ -1,8 +1,8 @@
 #01_clean_libpokerth.patch
 #02_use_dejavu_fonts.patch
-#03_use_--as-needed.patch
+03_use_--as-needed.patch
 #05_disable_gnu++0x.patch
 #06_fix_gcc46_ftbfs.patch
 #07_boost146_ftbfs_upstream.patch
-#08_use_debian_libircclient.patch
+08_use_debian_libircclient.patch
 #09_use_debian_libtinyxml.patch


