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

[Evgeni Golov]

Author: evgeni
Date: 2011-01-17 10:33:39 +0000 (Mon, 17 Jan 2011)
New Revision: 11671

Removed:
   packages/trunk/pokerth/debian/patches/04_fix_build_no_add_neded.patch
Modified:
   packages/trunk/pokerth/debian/changelog
   packages/trunk/pokerth/debian/patches/series
Log:
Drop 04_fix_build_no_add_neded.patch, applied upstream

Modified: packages/trunk/pokerth/debian/changelog
===================================================================
--- packages/trunk/pokerth/debian/changelog	2011-01-17 10:29:12 UTC (rev 11670)
+++ packages/trunk/pokerth/debian/changelog	2011-01-17 10:33:39 UTC (rev 11671)
@@ -2,8 +2,9 @@
 
   * New upstream bugfix release.
   * Add 05_disable_gnu++0x.patch to fix FTBFS on Ubuntu.
+  * Drop 04_fix_build_no_add_neded.patch, applied upstream.
 
- -- Evgeni Golov <evgeni at debian.org>  Mon, 17 Jan 2011 11:27:10 +0100
+ -- Evgeni Golov <evgeni at debian.org>  Mon, 17 Jan 2011 11:33:00 +0100
 
 pokerth (0.8.2-1) experimental; urgency=low
 

Deleted: packages/trunk/pokerth/debian/patches/04_fix_build_no_add_neded.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/04_fix_build_no_add_neded.patch	2011-01-17 10:29:12 UTC (rev 11670)
+++ packages/trunk/pokerth/debian/patches/04_fix_build_no_add_neded.patch	2011-01-17 10:33:39 UTC (rev 11671)
@@ -1,14 +0,0 @@
-Author: Felix Geyer <debfx-pkg at fobos.de>
-Description: Link with SDL to prevent FTBFS with --no-add-needed
---- pokerth.orig/pokerth_game.pro	2011-01-04 18:47:55.835562613 +0100
-+++ pokerth/pokerth_game.pro	2011-01-04 18:48:00.907109863 +0100
-@@ -449,7 +449,8 @@
- 	kFreeBSD = $$find(UNAME, "kFreeBSD")
- 	LIBS += -lsqlite3
- 	LIBS += $$BOOST_LIBS
--	LIBS += -lSDL_mixer \
-+	LIBS += -lSDL \
-+		-lSDL_mixer \
- 		-lgsasl
- 	!isEmpty( BSD ):isEmpty( kFreeBSD ):LIBS += -lcrypto
- 	else:LIBS += -lgnutls-openssl \

Modified: packages/trunk/pokerth/debian/patches/series
===================================================================
--- packages/trunk/pokerth/debian/patches/series	2011-01-17 10:29:12 UTC (rev 11670)
+++ packages/trunk/pokerth/debian/patches/series	2011-01-17 10:33:39 UTC (rev 11671)
@@ -1,5 +1,4 @@
 01_clean_libpokerth.patch
 02_use_dejavu_fonts.patch
 #03_use_--as-needed.patch
-04_fix_build_no_add_neded.patch
 05_disable_gnu++0x.patch