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

[Evgeni Golov]

Author: sargentd-guest
Date: 2008-02-10 21:03:16 +0000 (Sun, 10 Feb 2008)
New Revision: 5706

Modified:
   packages/trunk/pokerth/debian/changelog
   packages/trunk/pokerth/debian/control
   packages/trunk/pokerth/debian/patches/05_server_options_svn-r1393.dpatch
   packages/trunk/pokerth/debian/pokerth-server.postrm
Log:
update the patch, postrm


Modified: packages/trunk/pokerth/debian/changelog
===================================================================
--- packages/trunk/pokerth/debian/changelog	2008-02-10 20:15:17 UTC (rev 5705)
+++ packages/trunk/pokerth/debian/changelog	2008-02-10 21:03:16 UTC (rev 5706)
@@ -4,8 +4,9 @@
   * Add pokerth-server binary package, shipping the multiplayer server
   * Add 05_server_options_svn-r1393.dpatch, imported from upstream svn r1393.
     This adds some commandline options to the server, including pidfile.
+  * Add a build-dependency on libboost-program-options-dev
 
- -- Evgeni Golov <sargentd at die-welt.net>  Sun, 10 Feb 2008 21:13:18 +0100
+ -- Evgeni Golov <sargentd at die-welt.net>  Sun, 10 Feb 2008 22:02:09 +0100
 
 pokerth (0.6-1-2) unstable; urgency=low
 

Modified: packages/trunk/pokerth/debian/control
===================================================================
--- packages/trunk/pokerth/debian/control	2008-02-10 20:15:17 UTC (rev 5705)
+++ packages/trunk/pokerth/debian/control	2008-02-10 21:03:16 UTC (rev 5706)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Mario Iseli <admin at marioiseli.com>, Evgeni Golov <sargentd at die-welt.net>
-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
+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
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/pokerth/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/pokerth/

Modified: packages/trunk/pokerth/debian/patches/05_server_options_svn-r1393.dpatch
===================================================================
--- packages/trunk/pokerth/debian/patches/05_server_options_svn-r1393.dpatch	2008-02-10 20:15:17 UTC (rev 5705)
+++ packages/trunk/pokerth/debian/patches/05_server_options_svn-r1393.dpatch	2008-02-10 21:03:16 UTC (rev 5706)
@@ -10,7 +10,7 @@
 ===================================================================
 --- pokerth.orig/src/pokerth_server.cpp	(revision 1392)
 +++ pokerth/src/pokerth_server.cpp	(working copy)
-@@ -24,8 +24,11 @@
+@@ -24,9 +24,13 @@
  #include <qttoolsinterface.h>
  #include <gui/generic/serverguiwrapper.h>
  #include <net/socket_startup.h>
@@ -20,9 +20,11 @@
 +#include <boost/program_options.hpp>
 +#include <boost/filesystem.hpp>
  
++#include <fstream>
  #include <memory>
  #include <csignal>
-@@ -49,6 +52,8 @@
+ 
+@@ -49,6 +53,8 @@
  #endif
  
  using namespace std;
@@ -31,7 +33,7 @@
  
  volatile int g_pokerthTerminate = 0;
  
-@@ -59,7 +64,9 @@
+@@ -59,7 +65,9 @@
  }
  
  // TODO: Hack
@@ -42,7 +44,7 @@
  	#include <unistd.h>
  	#ifndef daemon
  		int daemon(int, int);
-@@ -73,6 +80,39 @@
+@@ -73,6 +81,39 @@
  
  //	_CrtSetBreakAlloc(4772);
  
@@ -82,7 +84,7 @@
  	auto_ptr<QtToolsInterface> myQtToolsInterface(CreateQtToolsWrapper());
  	//create defaultconfig
  	ConfigFile *myConfig = new ConfigFile(argc, argv);
-@@ -91,6 +131,21 @@
+@@ -91,6 +132,21 @@
  	LOG_MSG("Starting PokerTH dedicated server. Availability: IPv6 "
  		<< socket_has_ipv6() << ", SCTP " << socket_has_sctp() << ", Dual Stack " << socket_has_dual_stack() << ".");
  

Modified: packages/trunk/pokerth/debian/pokerth-server.postrm
===================================================================
--- packages/trunk/pokerth/debian/pokerth-server.postrm	2008-02-10 20:15:17 UTC (rev 5705)
+++ packages/trunk/pokerth/debian/pokerth-server.postrm	2008-02-10 21:03:16 UTC (rev 5706)
@@ -6,7 +6,7 @@
 case "$1" in
   purge)
   if [ -x "/usr/sbin/deluser" ]; then
-    deluser --system --remove-all-files pokerth || true
+    deluser --system pokerth || true
     deluser --group pokerth || true
   fi
   ;;