r9593 - packages/trunk/pokerth/debian/patches

[Evgeni Golov]

Author: sargentd-guest
Date: 2009-04-16 08:13:13 +0000 (Thu, 16 Apr 2009)
New Revision: 9593

Removed:
   packages/trunk/pokerth/debian/patches/04_link-gnutls-on-kfreebsd.patch
Log:
kill patch, aplied upstream before I could upload


Deleted: packages/trunk/pokerth/debian/patches/04_link-gnutls-on-kfreebsd.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/04_link-gnutls-on-kfreebsd.patch	2009-04-15 15:56:41 UTC (rev 9592)
+++ packages/trunk/pokerth/debian/patches/04_link-gnutls-on-kfreebsd.patch	2009-04-16 08:13:13 UTC (rev 9593)
@@ -1,45 +0,0 @@
-From: Evgeni Golov <sargentd at die-welt.net>
-Date: 2009-04-09 00:32
-Subject: Fix building on Debian/kFreeBSD
-
-For some reason, upstream links with OpenSSL instead of GnuTLS on *BSD.
-That's IMHO wrong and leads to an FTBFS on Debian/kFreeBSD as libssl-dev
-is not installed. So add an exception and link with GnuTLS on
-Debian/kFreeBSD.
-
-Index: pokerth-0.6.4/pokerth_game.pro
-===================================================================
---- pokerth-0.6.4.orig/pokerth_game.pro	2009-04-09 00:32:08.000000000 +0200
-+++ pokerth-0.6.4/pokerth_game.pro	2009-04-09 00:36:49.000000000 +0200
-@@ -368,11 +368,12 @@
- 
-         UNAME = $$system(uname -s)
-         BSD = $$find(UNAME, "BSD")
-+        kFreeBSD = $$find(UNAME, "kFreeBSD")
- 
-         LIBS += -lpokerth_lib
-         LIBS += $$BOOST_LIBS
-         LIBS += -lSDL_mixer -lcurl
--        !isEmpty( BSD ){
-+        !isEmpty( BSD ) && isEmpty( kFreeBSD ){
-             LIBS += -lcrypto
-         }        else {
-             LIBS += -lgnutls-openssl -lgcrypt
-Index: pokerth-0.6.4/pokerth_server.pro
-===================================================================
---- pokerth-0.6.4.orig/pokerth_server.pro	2009-04-09 00:37:16.000000000 +0200
-+++ pokerth-0.6.4/pokerth_server.pro	2009-04-09 00:38:35.000000000 +0200
-@@ -214,11 +214,12 @@
- 
-         UNAME = $$system(uname -s)
-         BSD = $$find(UNAME, "BSD")
-+        kFreeBSD = $$find(UNAME, "kFreeBSD")
- 
-         LIBS += -lpokerth_lib
-         LIBS += $$BOOST_LIBS
-         LIBS += -lcurl
--        !isEmpty( BSD ){
-+        !isEmpty( BSD ) && isEmpty( kFreeBSD ){
-             LIBS += -lcrypto -liconv
-         }        else {
-             LIBS += -lgnutls-openssl -lgcrypt