Author: evgeni Date: 2013-12-22 17:24:02 +0000 (Sun, 22 Dec 2013) New Revision: 14713
Removed: packages/trunk/pokerth/debian/patches/01_look_in_multiarch_dirs.patch Modified: packages/trunk/pokerth/debian/ packages/trunk/pokerth/debian/changelog Log: pokerth 1.1 Property changes on: packages/trunk/pokerth/debian ___________________________________________________________________ Modified: svn-bp:origUrl - http://pkg-games.alioth.debian.org/tarballs/pokerth_1.1.0~beta4.orig.tar.bz2 + http://pkg-games.alioth.debian.org/tarballs/pokerth_1.1.0.orig.tar.bz2 Modified: packages/trunk/pokerth/debian/changelog =================================================================== --- packages/trunk/pokerth/debian/changelog 2013-12-21 13:11:41 UTC (rev 14712) +++ packages/trunk/pokerth/debian/changelog 2013-12-22 17:24:02 UTC (rev 14713) @@ -1,3 +1,9 @@ +pokerth (1.1.0-1) unstable; urgency=medium + + * New upstream release. + + -- Evgeni Golov <[email protected]> Sun, 22 Dec 2013 18:21:48 +0100 + pokerth (1.1.0~beta4-1) experimental; urgency=medium * New upstream beta release. Deleted: packages/trunk/pokerth/debian/patches/01_look_in_multiarch_dirs.patch =================================================================== --- packages/trunk/pokerth/debian/patches/01_look_in_multiarch_dirs.patch 2013-12-21 13:11:41 UTC (rev 14712) +++ packages/trunk/pokerth/debian/patches/01_look_in_multiarch_dirs.patch 2013-12-22 17:24:02 UTC (rev 14713) @@ -1,109 +0,0 @@ -commit 98fef472def6139a34b63a8168d43b83d4658542 -Author: Evgeni Golov <[email protected]> -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 _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
