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

Evgeni Golov evgeni at moszumanska.debian.org
Sun Nov 24 12:51:23 UTC 2013 

Author: evgeni
Date: 2013-11-24 12:51:23 +0000 (Sun, 24 Nov 2013)
New Revision: 14666

Added:
   packages/trunk/pokerth/debian/patches/01_look_in_multiarch_dirs.patch
Modified:
   packages/trunk/pokerth/debian/
   packages/trunk/pokerth/debian/changelog
   packages/trunk/pokerth/debian/control
   packages/trunk/pokerth/debian/patches/series
Log:
  * New upstream beta release.
  * Explicitly build-depend on qtchooser for older Ubuntu releases.
  * Look for LIBS in `qmake -query QT_INSTALL_LIBS`.




Property changes on: packages/trunk/pokerth/debian
___________________________________________________________________
Modified: svn-bp:origUrl
   - http://pkg-games.alioth.debian.org/tarballs/pokerth_1.1.0~beta2.orig.tar.bz2
   + http://pkg-games.alioth.debian.org/tarballs/pokerth_1.1.0~beta3.orig.tar.bz2

Modified: packages/trunk/pokerth/debian/changelog
===================================================================
--- packages/trunk/pokerth/debian/changelog	2013-11-22 11:15:49 UTC (rev 14665)
+++ packages/trunk/pokerth/debian/changelog	2013-11-24 12:51:23 UTC (rev 14666)
@@ -1,3 +1,11 @@
+pokerth (1.1.0~beta3-1) experimental; urgency=low
+
+  * New upstream beta release.
+  * Explicitly build-depend on qtchooser for older Ubuntu releases.
+  * Look for LIBS in `qmake -query QT_INSTALL_LIBS`.
+
+ -- Evgeni Golov <evgeni at debian.org>  Fri, 15 Nov 2013 07:26:23 +0100
+
 pokerth (1.1.0~beta2-1) experimental; urgency=low
 
   * New upstream beta release.

Modified: packages/trunk/pokerth/debian/control
===================================================================
--- packages/trunk/pokerth/debian/control	2013-11-22 11:15:49 UTC (rev 14665)
+++ packages/trunk/pokerth/debian/control	2013-11-24 12:51:23 UTC (rev 14666)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Evgeni Golov <evgeni at debian.org>
-Build-Depends: debhelper (>= 9), qtbase5-dev, libgsasl7-dev, libsdl1.2-dev,
+Build-Depends: debhelper (>= 9), qtbase5-dev, qtchooser, libgsasl7-dev, libsdl1.2-dev,
  libsdl-mixer1.2-dev, libcurl4-gnutls-dev, libgnutls-dev, libsqlite3-dev,
  libboost-filesystem-dev (>= 1.42.0), libboost-thread-dev (>= 1.42.0),
  libboost-iostreams-dev (>= 1.42.0), libboost-system-dev (>= 1.42.0),

Added: packages/trunk/pokerth/debian/patches/01_look_in_multiarch_dirs.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/01_look_in_multiarch_dirs.patch	                        (rev 0)
+++ packages/trunk/pokerth/debian/patches/01_look_in_multiarch_dirs.patch	2013-11-24 12:51:23 UTC (rev 14666)
@@ -0,0 +1,109 @@
+commit 98fef472def6139a34b63a8168d43b83d4658542
+Author: Evgeni Golov <evgeni at golov.de>
+Date:   Sun Oct 20 18:47:23 2013 +0200
+
+    look for libs in $$system(qmake -query QT_INSTALL_LIBS)
+    
+    do not look for libs in $${PREFIX}/lib64 but in
+    $$system(qmake -query QT_INSTALL_LIBS)
+    that way we find libs in /usr/lib/x86_64-linux-gnu and other
+    multiarch dirs on Debian-like systems.
+
+diff --git a/connectivity.pro b/connectivity.pro
+index 5f4de82..5bd9df5 100644
+--- a/connectivity.pro
++++ b/connectivity.pro
+@@ -41,13 +41,13 @@ unix : !mac {
+ 
+ 	QMAKE_LIBDIR += lib $${PREFIX}/lib /opt/gsasl/lib
+ 	INCLUDEPATH += $${PREFIX}/include
+-	LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64
++	LIB_DIRS = $${PREFIX}/lib $$system(qmake -query QT_INSTALL_LIBS)
+ 	BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt
+ 	BOOST_SYS = boost_system boost_system-mt
+ 
+ 
+ 	#
+-	# searching in $PREFIX/lib and $PREFIX/lib64
++	# searching in $PREFIX/lib and $$system(qmake -query QT_INSTALL_LIBS)
+ 	# to override the default '/usr' pass PREFIX
+ 	# variable to qmake.
+ 	#
+diff --git a/load.pro b/load.pro
+index c2deb47..266864c 100644
+--- a/load.pro
++++ b/load.pro
+@@ -42,14 +42,14 @@ unix : !mac {
+ 
+ 	QMAKE_LIBDIR += lib $${PREFIX}/lib /opt/gsasl/lib
+ 	INCLUDEPATH += $${PREFIX}/include
+-	LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64
++	LIB_DIRS = $${PREFIX}/lib $$system(qmake -query QT_INSTALL_LIBS)
+ 	BOOST_THREAD = boost_thread boost_thread-mt
+ 	BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt
+ 	BOOST_SYS = boost_system boost_system-mt
+ 
+ 
+ 	#
+-	# searching in $PREFIX/lib and $PREFIX/lib64
++	# searching in $PREFIX/lib and $$system(qmake -query QT_INSTALL_LIBS)
+ 	# to override the default '/usr' pass PREFIX
+ 	# variable to qmake.
+ 	#
+diff --git a/pokerth_game.pro b/pokerth_game.pro
+index 294dce3..f2b24ac 100644
+--- a/pokerth_game.pro
++++ b/pokerth_game.pro
+@@ -407,7 +407,7 @@ unix:!mac {
+ 	!android{
+ 		LIBPATH += $${PREFIX}/lib /opt/gsasl/lib
+ 		LIB_DIRS = $${PREFIX}/lib \
+-			$${PREFIX}/lib64
++			$$system(qmake -query QT_INSTALL_LIBS)
+ 	}
+ 	android{
+ 		LIBPATH += $${PREFIX}/lib/armv7
+@@ -426,7 +426,7 @@ unix:!mac {
+ 	BOOST_RANDOM = boost_random \
+ 		boost_random-mt
+ 
+-	# searching in $PREFIX/lib and $PREFIX/lib64
++	# searching in $PREFIX/lib and $$system(qmake -query QT_INSTALL_LIBS)
+ 	# to override the default '/usr' pass PREFIX
+ 	# variable to qmake.
+ 	for(dir, LIB_DIRS):exists($$dir) {
+diff --git a/pokerth_server.pro b/pokerth_server.pro
+index d27a0e7..e9935c0 100644
+--- a/pokerth_server.pro
++++ b/pokerth_server.pro
+@@ -175,7 +175,7 @@ unix : !mac {
+ 
+ 	LIBPATH += lib $${PREFIX}/lib /opt/gsasl/lib
+ 	INCLUDEPATH += $${PREFIX}/include
+-	LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64
++	LIB_DIRS = $${PREFIX}/lib $$system(qmake -query QT_INSTALL_LIBS)
+ 	BOOST_FS = boost_filesystem boost_filesystem-mt
+ 	BOOST_THREAD = boost_thread boost_thread-mt
+ 	BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt
+@@ -185,7 +185,7 @@ unix : !mac {
+ 	BOOST_RANDOM = boost_random boost_random-mt
+ 
+ 	#
+-	# searching in $PREFIX/lib and $PREFIX/lib64
++	# searching in $PREFIX/lib and $$system(qmake -query QT_INSTALL_LIBS)
+ 	# to override the default '/usr' pass PREFIX
+ 	# variable to qmake.
+ 	#
+diff --git a/zlib_compress.pro b/zlib_compress.pro
+index d141ac0..6ac0437 100644
+--- a/zlib_compress.pro
++++ b/zlib_compress.pro
+@@ -48,7 +48,7 @@ unix : !mac {
+ 	#QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
+ 	#QMAKE_LFLAGS += -Wl,--gc-sections
+ 
+-	LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64
++	LIB_DIRS = $${PREFIX}/lib $$system(qmake -query QT_INSTALL_LIBS)
+ 	BOOST_FS = boost_filesystem boost_filesystem-mt
+ 	BOOST_IOSTREAMS = boost_iostreams boost_iostreams-mt
+ 	BOOST_SYSTEM = boost_system boost_system-mt

Modified: packages/trunk/pokerth/debian/patches/series
===================================================================
--- packages/trunk/pokerth/debian/patches/series	2013-11-22 11:15:49 UTC (rev 14665)
+++ packages/trunk/pokerth/debian/patches/series	2013-11-24 12:51:23 UTC (rev 14666)
@@ -1 +1,2 @@
+01_look_in_multiarch_dirs.patch
 03_use_--as-needed.patch

More information about the Pkg-games-commits mailing list