Author: sargentd-guest
Date: 2008-07-02 21:46:38 +0000 (Wed, 02 Jul 2008)
New Revision: 7670
Added:
packages/trunk/pokerth/debian/README.source
packages/trunk/pokerth/debian/patches/01_clean_libpokerth.patch
packages/trunk/pokerth/debian/patches/02_use_dejavu_fonts.patch
packages/trunk/pokerth/debian/patches/03_use_--as-needed.patch
packages/trunk/pokerth/debian/patches/04_fix_no_logging.patch
packages/trunk/pokerth/debian/patches/series
Removed:
packages/trunk/pokerth/debian/patches/00list
packages/trunk/pokerth/debian/patches/01_clean_libpokerth.dpatch
packages/trunk/pokerth/debian/patches/02_use_dejavu_fonts.dpatch
packages/trunk/pokerth/debian/patches/03_use_--as-needed.dpatch
packages/trunk/pokerth/debian/patches/04_fix_no_logging.dpatch
Modified:
packages/trunk/pokerth/debian/changelog
packages/trunk/pokerth/debian/control
packages/trunk/pokerth/debian/rules
Log:
huge one: switch to quilt
Added: packages/trunk/pokerth/debian/README.source
===================================================================
--- packages/trunk/pokerth/debian/README.source (rev 0)
+++ packages/trunk/pokerth/debian/README.source 2008-07-02 21:46:38 UTC (rev
7670)
@@ -0,0 +1,2 @@
+This package uses quilt for patch management, for more information see
+the file /usr/share/doc/quilt/README.source in the quilt package.
Modified: packages/trunk/pokerth/debian/changelog
===================================================================
--- packages/trunk/pokerth/debian/changelog 2008-07-02 12:04:56 UTC (rev
7669)
+++ packages/trunk/pokerth/debian/changelog 2008-07-02 21:46:38 UTC (rev
7670)
@@ -1,18 +1,24 @@
pokerth (0.6.2-2) UNRELEASED; urgency=low
* debian/pokerth.menu:
- + Set title to "PokerTH", not "Texas Hold'em". (Closes: #488058)
+ + Expand title to "PokerTH (Texas Hold'em)". (Closes: #488058)
+ Add an icon file.
* debian/pokerth.xpm:
- + Added (converted from pokerth.png)
+ + Added (converted from pokerth.png).
* debian/pokerth.install:
+ Install debian/pokerth.xpm to /usr/share/pixmaps
* debian/patches/04_fix_no_logging.dpatch:
+ Added new patch by upstream.
+ Checks if logging is enabled, before writing the log.
(Closes: #488197)
+ * debian/control, debian/rules, debian/patches:
+ + Switch from dpatch to quilt.
+ * debian/README.source:
+ + Add a hint how to use quilt.
+ * debian/control:
+ + Bump to Standards-Version 3.8.0, README.source was added.
- -- Evgeni Golov <[EMAIL PROTECTED]> Sun, 29 Jun 2008 23:20:42 +0200
+ -- Evgeni Golov <[EMAIL PROTECTED]> Wed, 02 Jul 2008 23:29:14 +0200
pokerth (0.6.2-1) unstable; urgency=low
Modified: packages/trunk/pokerth/debian/control
===================================================================
--- packages/trunk/pokerth/debian/control 2008-07-02 12:04:56 UTC (rev
7669)
+++ packages/trunk/pokerth/debian/control 2008-07-02 21:46:38 UTC (rev
7670)
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian Games Team <[EMAIL PROTECTED]>
Uploaders: Mario Iseli <[EMAIL PROTECTED]>, Evgeni Golov <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0), dpatch, libqt4-dev, libboost-thread-dev,
libboost-date-time-dev, libsdl-mixer1.2-dev, libmikmod2-dev,
libboost-filesystem-dev, libboost-program-options-dev, libboost-iostreams-dev,
libcurl4-gnutls-dev, libgnutls-dev
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 5.0.0), quilt (>= 0.40), libqt4-dev,
libboost-thread-dev, libboost-date-time-dev, libsdl-mixer1.2-dev,
libmikmod2-dev, libboost-filesystem-dev, libboost-program-options-dev,
libboost-iostreams-dev, libcurl4-gnutls-dev, libgnutls-dev
+Standards-Version: 3.8.0
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/pokerth/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/pokerth/
Homepage: http://www.pokerth.net/
Deleted: packages/trunk/pokerth/debian/patches/00list
===================================================================
--- packages/trunk/pokerth/debian/patches/00list 2008-07-02 12:04:56 UTC
(rev 7669)
+++ packages/trunk/pokerth/debian/patches/00list 2008-07-02 21:46:38 UTC
(rev 7670)
@@ -1,4 +0,0 @@
-01_clean_libpokerth
-02_use_dejavu_fonts
-03_use_--as-needed
-04_fix_no_logging
Deleted: packages/trunk/pokerth/debian/patches/01_clean_libpokerth.dpatch
===================================================================
--- packages/trunk/pokerth/debian/patches/01_clean_libpokerth.dpatch
2008-07-02 12:04:56 UTC (rev 7669)
+++ packages/trunk/pokerth/debian/patches/01_clean_libpokerth.dpatch
2008-07-02 21:46:38 UTC (rev 7670)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_clean_libpokerth.dpatch by Evgeni Golov <[EMAIL PROTECTED]>
-##
-## DP: Adds a quirk to correctly clean libpokerth
-
[EMAIL PROTECTED]@
-
-Index: pokerth_lib.pro
-===================================================================
---- pokerth.orig/pokerth_lib.pro (Revision 1380)
-+++ pokerth/pokerth_lib.pro (Arbeitskopie)
-@@ -8,6 +8,7 @@
-
- UI_DIR = uics
- TARGET = lib/pokerth_lib
-+QMAKE_CLEAN += ./lib/libpokerth_lib.a
- MOC_DIR = mocs
- OBJECTS_DIR = obj
- DEFINES += ENABLE_IPV6
Added: packages/trunk/pokerth/debian/patches/01_clean_libpokerth.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/01_clean_libpokerth.patch
(rev 0)
+++ packages/trunk/pokerth/debian/patches/01_clean_libpokerth.patch
2008-07-02 21:46:38 UTC (rev 7670)
@@ -0,0 +1,12 @@
+Author: Evgeni Golov <[EMAIL PROTECTED]>
+Description: Adds a quirk to correctly clean libpokerth
+--- pokerth-0.6.2.orig/pokerth_lib.pro
++++ pokerth-0.6.2/pokerth_lib.pro
+@@ -8,6 +8,7 @@
+
+ UI_DIR = uics
+ TARGET = lib/pokerth_lib
++QMAKE_CLEAN += ./lib/libpokerth_lib.a
+ MOC_DIR = mocs
+ OBJECTS_DIR = obj
+ DEFINES += ENABLE_IPV6
Deleted: packages/trunk/pokerth/debian/patches/02_use_dejavu_fonts.dpatch
===================================================================
--- packages/trunk/pokerth/debian/patches/02_use_dejavu_fonts.dpatch
2008-07-02 12:04:56 UTC (rev 7669)
+++ packages/trunk/pokerth/debian/patches/02_use_dejavu_fonts.dpatch
2008-07-02 21:46:38 UTC (rev 7670)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_use_dejavu_fonts.dpatch by Evgeni Golov <[EMAIL PROTECTED]>
-##
-## DP: Use DejaVu Sans instead of Bitstream Vera Sans
-
-Index: src/gui/qt/gametable/gametableimpl.cpp
-===================================================================
---- old/src/gui/qt/gametable/gametableimpl.cpp (revision 1513)
-+++ new/src/gui/qt/gametable/gametableimpl.cpp (working copy)
-@@ -322,7 +322,7 @@
- font2String = "font-family: \"Lucida Grande\";";
- #else
- font1String = "font-family: \"Nimbus Sans L\";";
-- font2String = "font-family: \"Bitstream Vera Sans\";";
-+ font2String = "font-family: \"DejaVu Sans\";";
- #endif
- QString textBrowserFontsize= "10";
- QString cashFontSize = "10";
Added: packages/trunk/pokerth/debian/patches/02_use_dejavu_fonts.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/02_use_dejavu_fonts.patch
(rev 0)
+++ packages/trunk/pokerth/debian/patches/02_use_dejavu_fonts.patch
2008-07-02 21:46:38 UTC (rev 7670)
@@ -0,0 +1,13 @@
+Author: Evgeni Golov <[EMAIL PROTECTED]>
+Description: Use DejaVu Sans instead of Bitstream Vera Sans
+--- pokerth-0.6.2.orig/src/gui/qt/gametable/gametableimpl.cpp
++++ pokerth-0.6.2/src/gui/qt/gametable/gametableimpl.cpp
+@@ -322,7 +322,7 @@
+ font2String = "font-family: \"Lucida Grande\";";
+ #else
+ font1String = "font-family: \"Nimbus Sans L\";";
+- font2String = "font-family: \"Bitstream Vera Sans\";";
++ font2String = "font-family: \"DejaVu Sans\";";
+ #endif
+ QString textBrowserFontsize= "10";
+ QString cashFontSize = "10";
Deleted: packages/trunk/pokerth/debian/patches/03_use_--as-needed.dpatch
===================================================================
--- packages/trunk/pokerth/debian/patches/03_use_--as-needed.dpatch
2008-07-02 12:04:56 UTC (rev 7669)
+++ packages/trunk/pokerth/debian/patches/03_use_--as-needed.dpatch
2008-07-02 21:46:38 UTC (rev 7670)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_use_--as-needed.dpatch by Evgeni Golov <[EMAIL PROTECTED]>
-##
-## DP: Re-enable --as-needed for pokerth, after it was removed as defult
-## DP: from the libqt4-dev package.
-
-Index: pokerth_game.pro
-===================================================================
---- old/pokerth_game.pro (revision 1513)
-+++ new/pokerth_game.pro (working copy)
-@@ -20,6 +20,8 @@
- DEFINES += PREFIX=\"$${PREFIX}\"
- TARGET = pokerth
-
-+QMAKE_LFLAGS += -Wl,--as-needed
-+
- INCLUDEPATH += . \
- src \
- src/engine \
Added: packages/trunk/pokerth/debian/patches/03_use_--as-needed.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/03_use_--as-needed.patch
(rev 0)
+++ packages/trunk/pokerth/debian/patches/03_use_--as-needed.patch
2008-07-02 21:46:38 UTC (rev 7670)
@@ -0,0 +1,14 @@
+Author: Evgeni Golov <[EMAIL PROTECTED]>
+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 \
Deleted: packages/trunk/pokerth/debian/patches/04_fix_no_logging.dpatch
===================================================================
--- packages/trunk/pokerth/debian/patches/04_fix_no_logging.dpatch
2008-07-02 12:04:56 UTC (rev 7669)
+++ packages/trunk/pokerth/debian/patches/04_fix_no_logging.dpatch
2008-07-02 21:46:38 UTC (rev 7670)
@@ -1,46 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_fix_no_logging.dpatch by Felix Hammer <[EMAIL PROTECTED]>
-##
-## DP: Upstream's patch for #488197
-## DP: Check if logging is enabled, before writing to the log.
-
[EMAIL PROTECTED]@
-
-Index: pokerth/src/gui/qt/gametable/log/log.cpp
-===================================================================
---- pokerth/src/gui/qt/gametable/log/log.cpp (Revision 1522)
-+++ pokerth/src/gui/qt/gametable/log/log.cpp (Arbeitskopie)
-@@ -1651,18 +1651,23 @@
-
- void Log::flushLogAtHand() {
-
-- if(myConfig->readConfigInt("LogInterval") < 2) {
--// write for log after every action and after every hand
-- writeLogFileStream(logFileStreamString);
-- logFileStreamString = "";
-+ if(myConfig->readConfigInt("LogOnOff")) {
-+ if(myConfig->readConfigInt("LogInterval") < 2) {
-+ // write for log after every action and after every hand
-+ writeLogFileStream(logFileStreamString);
-+ logFileStreamString = "";
-+ }
- }
- }
-
--void Log::flushLogAtGame(int gameID) {
--// write for log after every game
-- if(gameID > lastGameID) {
-- writeLogFileStream(logFileStreamString);
-- logFileStreamString = "";
-- lastGameID = gameID;
-+void Log::flushLogAtGame(int gameID) {
-+
-+ if(myConfig->readConfigInt("LogOnOff")) {
-+ // write for log after every game
-+ if(gameID > lastGameID) {
-+ writeLogFileStream(logFileStreamString);
-+ logFileStreamString = "";
-+ lastGameID = gameID;
-+ }
- }
- }
Added: packages/trunk/pokerth/debian/patches/04_fix_no_logging.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/04_fix_no_logging.patch
(rev 0)
+++ packages/trunk/pokerth/debian/patches/04_fix_no_logging.patch
2008-07-02 21:46:38 UTC (rev 7670)
@@ -0,0 +1,39 @@
+Author: Felix Hammer <[EMAIL PROTECTED]>
+Description: Upstream's patch for #488197
+Check if logging is enabled, before writing to the log.
+--- pokerth-0.6.2.orig/src/gui/qt/gametable/log/log.cpp
++++ pokerth-0.6.2/src/gui/qt/gametable/log/log.cpp
+@@ -1651,18 +1651,23 @@
+
+ void Log::flushLogAtHand() {
+
+- if(myConfig->readConfigInt("LogInterval") < 2) {
+-// write for log after every action and after every hand
+- writeLogFileStream(logFileStreamString);
+- logFileStreamString = "";
++ if(myConfig->readConfigInt("LogOnOff")) {
++ if(myConfig->readConfigInt("LogInterval") < 2) {
++ // write for log after every action and after every hand
++ writeLogFileStream(logFileStreamString);
++ logFileStreamString = "";
++ }
+ }
+ }
+
+-void Log::flushLogAtGame(int gameID) {
+-// write for log after every game
+- if(gameID > lastGameID) {
+- writeLogFileStream(logFileStreamString);
+- logFileStreamString = "";
+- lastGameID = gameID;
++void Log::flushLogAtGame(int gameID) {
++
++ if(myConfig->readConfigInt("LogOnOff")) {
++ // write for log after every game
++ if(gameID > lastGameID) {
++ writeLogFileStream(logFileStreamString);
++ logFileStreamString = "";
++ lastGameID = gameID;
++ }
+ }
+ }
Added: packages/trunk/pokerth/debian/patches/series
===================================================================
--- packages/trunk/pokerth/debian/patches/series
(rev 0)
+++ packages/trunk/pokerth/debian/patches/series 2008-07-02 21:46:38 UTC
(rev 7670)
@@ -0,0 +1,4 @@
+01_clean_libpokerth.patch
+02_use_dejavu_fonts.patch
+03_use_--as-needed.patch
+04_fix_no_logging.patch
Modified: packages/trunk/pokerth/debian/rules
===================================================================
--- packages/trunk/pokerth/debian/rules 2008-07-02 12:04:56 UTC (rev 7669)
+++ packages/trunk/pokerth/debian/rules 2008-07-02 21:46:38 UTC (rev 7670)
@@ -2,7 +2,7 @@
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
configure: configure-stamp
configure-stamp: patch
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
