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

Evgeni Golov sargentd-guest at alioth.debian.org
Fri Mar 14 20:49:00 UTC 2008


Author: sargentd-guest
Date: 2008-03-14 20:48:59 +0000 (Fri, 14 Mar 2008)
New Revision: 6056

Added:
   packages/trunk/pokerth/debian/patches/03_use_--as-needed.dpatch
   packages/trunk/pokerth/debian/pokerth-server.docs
   packages/trunk/pokerth/debian/pokerth-server.manpages
   packages/trunk/pokerth/debian/pokerth_server.1
Removed:
   packages/trunk/pokerth/debian/config.xml
   packages/trunk/pokerth/debian/patches/03_fix_gcc43_ftbfs.dpatch
   packages/trunk/pokerth/debian/patches/04_sane_server_defaults.dpatch
   packages/trunk/pokerth/debian/patches/05_server_options_svn-r1393.dpatch
   packages/trunk/pokerth/debian/patches/06_server.pro_svn-r1397.dpatch
   packages/trunk/pokerth/debian/pokerth-server.init
   packages/trunk/pokerth/debian/pokerth-server.postinst
   packages/trunk/pokerth/debian/pokerth-server.postrm
Modified:
   packages/trunk/pokerth/debian/
   packages/trunk/pokerth/debian/changelog
   packages/trunk/pokerth/debian/copyright
   packages/trunk/pokerth/debian/patches/00list
   packages/trunk/pokerth/debian/pokerth-server.install
   packages/trunk/pokerth/debian/rules
Log:
this is pokerth 0.6.1, sorry for the huge diff


Property changes on: packages/trunk/pokerth/debian
___________________________________________________________________
Name: svn-bp:origUrl
   - http://pkg-games.alioth.debian.org/tarballs/pokerth_0.6-1.orig.tar.gz
   + http://pkg-games.alioth.debian.org/tarballs/pokerth_0.6.1.orig.tar.gz

Modified: packages/trunk/pokerth/debian/changelog
===================================================================
--- packages/trunk/pokerth/debian/changelog	2008-03-14 17:46:50 UTC (rev 6055)
+++ packages/trunk/pokerth/debian/changelog	2008-03-14 20:48:59 UTC (rev 6056)
@@ -1,12 +1,13 @@
-pokerth (0.6-1-3) UNRELEASED; urgency=low
+pokerth (0.6.1-1) unstable; urgency=low
 
+  * New upstream release
   * Remove build-dependency on qt4-dev-tools and libboost-dev (thanks Ubuntu)
   * 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
+  * Add 03_use_--as-needed.dpatch to re-enable building with --as-needed
+  * Drop 03_fix_gcc43_ftbfs.dpatch, was accepted upstream
 
- -- Evgeni Golov <sargentd at die-welt.net>  Sun, 10 Feb 2008 22:02:09 +0100
+ -- Evgeni Golov <sargentd at die-welt.net>  Fri, 14 Mar 2008 20:46:43 +0100
 
 pokerth (0.6-1-2) unstable; urgency=low
 

Deleted: packages/trunk/pokerth/debian/config.xml
===================================================================
--- packages/trunk/pokerth/debian/config.xml	2008-03-14 17:46:50 UTC (rev 6055)
+++ packages/trunk/pokerth/debian/config.xml	2008-03-14 20:48:59 UTC (rev 6056)
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<PokerTH>
-    <Configuration>
-        <ConfigRevision value="52" />
-        <AppDataDir value="/usr/share/games/pokerth" />
-        <Language value="en" />
-        <InternetServerAddressIRCChannelUpdateDone value="1" />
-        <ShowLeftToolBox value="1" />
-        <ShowRightToolBox value="1" />
-        <ShowStatusbarMessages value="1" />
-        <ShowIntro value="1" />
-        <ShowFadeOutCardsAnimation value="1" />
-        <ShowFlipCardsAnimation value="1" />
-        <ShowBlindButtons value="1" />
-        <AntiPeekMode value="0" />
-        <AlternateFKeysUserActionMode value="0" />
-        <EnableBetInputFocusSwitch value="0" />
-        <FlipsideTux value="1" />
-        <FlipsideOwn value="0" />
-        <FlipsideOwnFile value="" />
-        <PlaySoundEffects value="1" />
-        <SoundVolume value="8" />
-        <PlayGameActions value="1" />
-        <PlayLobbyChatNotification value="1" />
-        <PlayNetworkGameNotification value="1" />
-        <NumberOfPlayers value="7" />
-        <StartCash value="3000" />
-        <FirstSmallBlind value="10" />
-        <RaiseBlindsAtHands value="1" />
-        <RaiseBlindsAtMinutes value="0" />
-        <RaiseSmallBlindEveryHands value="8" />
-        <RaiseSmallBlindEveryMinutes value="5" />
-        <AlwaysDoubleBlinds value="1" />
-        <ManualBlindsOrder value="0" />
-        <ManualBlindsList value="Blind" type="list" />
-        <AfterMBAlwaysDoubleBlinds value="1" />
-        <AfterMBAlwaysRaiseAbout value="0" />
-        <AfterMBAlwaysRaiseValue value="0" />
-        <AfterMBStayAtLastBlind value="0" />
-        <GameSpeed value="4" />
-        <PauseBetweenHands value="0" />
-        <ShowGameSettingsDialogOnNewGame value="1" />
-        <NetNumberOfPlayers value="7" />
-        <NetStartCash value="3000" />
-        <NetFirstSmallBlind value="10" />
-        <NetRaiseBlindsAtHands value="1" />
-        <NetRaiseBlindsAtMinutes value="0" />
-        <NetRaiseSmallBlindEveryHands value="8" />
-        <NetRaiseSmallBlindEveryMinutes value="5" />
-        <NetAlwaysDoubleBlinds value="1" />
-        <NetManualBlindsOrder value="0" />
-        <NetManualBlindsList value="NetBlind" type="list" />
-        <NetAfterMBAlwaysDoubleBlinds value="1" />
-        <NetAfterMBAlwaysRaiseAbout value="0" />
-        <NetAfterMBAlwaysRaiseValue value="0" />
-        <NetAfterMBStayAtLastBlind value="0" />
-        <NetGameSpeed value="4" />
-        <NetTimeOutPlayerAction value="20" />
-        <ServerPassword value="" />
-        <ServerUseIpv6 value="0" />
-        <ServerUseSctp value="0" />
-        <ServerPort value="7234" />
-        <InternetServerAddress value="localhost" />
-        <InternetServerPort value="7234" />
-        <InternetServerPassword value="" />
-        <InternetServerUseIpv6 value="0" />
-        <InternetServerUseSctp value="0" />
-        <UseInternetGamePassword value="0" />
-        <InternetGamePassword value="" />
-        <UseIRCLobbyChat value="1" />
-        <IRCServerAddress value="chat.freenode.net" />
-        <IRCServerPort value="6667" />
-        <IRCChannel value="#pokerth-lobby" />
-        <IRCChannelPassword value="" />
-        <IRCServerUseIpv6 value="0" />
-        <UseAdminIRC value="0" />
-        <AdminIRCServerAddress value="chat.freenode.net" />
-        <AdminIRCServerPort value="6667" />
-        <AdminIRCChannel value="#test" />
-        <AdminIRCChannelPassword value="" />
-        <AdminIRCServerUseIpv6 value="0" />
-        <AdminIRCServerNick value="PokerTH" />
-        <MyName value="Human Player" />
-        <MyAvatar value="" />
-        <Opponent1Name value="Player 1" />
-        <Opponent1Avatar value="" />
-        <Opponent2Name value="Player 2" />
-        <Opponent2Avatar value="" />
-        <Opponent3Name value="Player 3" />
-        <Opponent3Avatar value="" />
-        <Opponent4Name value="Player 4" />
-        <Opponent4Avatar value="" />
-        <Opponent5Name value="Player 5" />
-        <Opponent5Avatar value="" />
-        <Opponent6Name value="Player 6" />
-        <Opponent6Avatar value="" />
-        <LogOnOff value="1" />
-        <LogDir value="/var/lib/pokerth/log-files/" />
-        <LogStoreDuration value="2" />
-        <LogInterval value="0" />
-        <UserDataDir value="/var/lib/pokerth/data/" />
-        <CacheDir value="/var/lib/pokerth/cache/" />
-        <CLA_NoWriteAccess value="0" />
-        <DisableBackToLobbyWarning value="0" />
-    </Configuration>
-</PokerTH>

Modified: packages/trunk/pokerth/debian/copyright
===================================================================
--- packages/trunk/pokerth/debian/copyright	2008-03-14 17:46:50 UTC (rev 6055)
+++ packages/trunk/pokerth/debian/copyright	2008-03-14 20:48:59 UTC (rev 6056)
@@ -8,8 +8,8 @@
 		  Lothar May <lotodore at pokerth.net>
 
 Files: *
-Copyright: © 2006-2007 Felix Hammer <f.hammer at web.de>, Florian Thauer <f.thauer at web.de>
- 2007 Lothar May <lotodore at pokerth.net>
+Copyright: © 2006-2008 Felix Hammer <f.hammer at web.de>, Florian Thauer <f.thauer at web.de>
+ 2007-2008 Lothar May <lotodore at pokerth.net>
 License: GPL-2+
 
 Files: src/core/libircclient/*
@@ -175,7 +175,7 @@
 
 Files: debian/*
 Copyright: © 2006-2007 Mario Iseli <admin at marioiseli.com>,
- 2007 Evgeni Golov <sargentd at die-welt.net>
+ 2007-2008 Evgeni Golov <sargentd at die-welt.net>
 Licence: GPL-any
 
 On Debian systems, the complete text of the GNU General

Modified: packages/trunk/pokerth/debian/patches/00list
===================================================================
--- packages/trunk/pokerth/debian/patches/00list	2008-03-14 17:46:50 UTC (rev 6055)
+++ packages/trunk/pokerth/debian/patches/00list	2008-03-14 20:48:59 UTC (rev 6056)
@@ -1,6 +1,7 @@
 01_clean_libpokerth
 02_use_dejavu_fonts
-03_fix_gcc43_ftbfs
-04_sane_server_defaults
-05_server_options_svn-r1393
-06_server.pro_svn-r1397
+03_use_--as-needed
+#03_fix_gcc43_ftbfs
+#04_sane_server_defaults
+#05_server_options_svn-r1393
+#06_server.pro_svn-r1397

Deleted: packages/trunk/pokerth/debian/patches/03_fix_gcc43_ftbfs.dpatch
===================================================================
--- packages/trunk/pokerth/debian/patches/03_fix_gcc43_ftbfs.dpatch	2008-03-14 17:46:50 UTC (rev 6055)
+++ packages/trunk/pokerth/debian/patches/03_fix_gcc43_ftbfs.dpatch	2008-03-14 20:48:59 UTC (rev 6056)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_fix_gcc43_ftbfs.dpatch by Evgeni Golov <sargentd at die-welt.net>
-##
-## DP: Add '#include <cstring>' to convhelper.cpp to stop gcc 4.3 FTBFS
-
- at DPATCH@
-
-Index: src/core/linux/convhelper.cpp
-===================================================================
---- pokerth.orig/src/core/linux/convhelper.cpp	(revision 1390)
-+++ pokerth/src/core/linux/convhelper.cpp	(working copy)
-@@ -25,6 +25,7 @@
- #endif
- 
- #include <string>
-+#include <cstring>
- 
- #include <iconv.h>
- #include <errno.h>

Added: packages/trunk/pokerth/debian/patches/03_use_--as-needed.dpatch
===================================================================
--- packages/trunk/pokerth/debian/patches/03_use_--as-needed.dpatch	                        (rev 0)
+++ packages/trunk/pokerth/debian/patches/03_use_--as-needed.dpatch	2008-03-14 20:48:59 UTC (rev 6056)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_use_--as-needed.dpatch by Evgeni Golov <sargentd at die-welt.net>
+##
+## DP: Re-enable --as-needed for pokerth, after it was removed as defult
+## DP: from the libqt4-dev package.
+
+ at DPATCH@
+
+--- old/pokerth_game.pro	2008-03-13 23:43:06.000000000 +0100
++++ new/pokerth_game.pro	2008-03-13 23:44:23.000000000 +0100
+@@ -10,6 +10,8 @@
+ CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on release
+ #CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on debug
+ 
++QMAKE_LFLAGS += -Wl,--as-needed
++
+ #Uncomment this for RELEASE
+ #QTPLUGIN += qjpeg qgif
+ 


Property changes on: packages/trunk/pokerth/debian/patches/03_use_--as-needed.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Deleted: packages/trunk/pokerth/debian/patches/04_sane_server_defaults.dpatch
===================================================================
--- packages/trunk/pokerth/debian/patches/04_sane_server_defaults.dpatch	2008-03-14 17:46:50 UTC (rev 6055)
+++ packages/trunk/pokerth/debian/patches/04_sane_server_defaults.dpatch	2008-03-14 20:48:59 UTC (rev 6056)
@@ -1,48 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_sane_server_defaults.dpatch by Evgeni Golov <sargentd at die-welt.net>
-##
-## DP: the server should use some different paths as default for it's files
-## DP: additionally it should only listen on localhost by default
-
- at DPATCH@
-
-Index: pokerth/src/config/configfile.cpp
-===================================================================
---- pokerth.orig/src/config/configfile.cpp	(revision 1392)
-+++ pokerth/src/config/configfile.cpp	(working copy)
-@@ -112,7 +112,7 @@
- 		const char *homePath = getenv("HOME");
- 		if(homePath) {
- 			configFileName = homePath;
--			configFileName += "/.pokerth/";
-+			configFileName += "/";
- 			////define log-dir
- 			logDir = configFileName;
- 			logDir += "log-files/";
-@@ -122,6 +122,8 @@
- 			////define cache-dir
- 			cacheDir = configFileName;
- 			cacheDir += "cache/";
-+			// reset configFileName to /etc/pokerth
-+			configFileName = "/etc/pokerth/";
- 			//create directories on first start of app
- 			mkdir(configFileName.c_str(), MODUS) ;
- 			mkdir(logDir.c_str(), MODUS);
-@@ -143,7 +145,7 @@
- 	ostringstream tempIntToString;
- 	tempIntToString << configRev;
- 	configList.push_back(ConfigInfo("ConfigRevision", CONFIG_TYPE_INT, tempIntToString.str()));
--	configList.push_back(ConfigInfo("AppDataDir", CONFIG_TYPE_STRING, myQtToolsInterface->getDataPathStdString(argv[0])));
-+	configList.push_back(ConfigInfo("AppDataDir", CONFIG_TYPE_STRING, "/usr/share/games/pokerth"));
- 	configList.push_back(ConfigInfo("Language", CONFIG_TYPE_INT, myQtToolsInterface->getDefaultLanguage()));
- 	configList.push_back(ConfigInfo("InternetServerAddressIRCChannelUpdateDone", CONFIG_TYPE_INT, "1")); //HACK
- 	configList.push_back(ConfigInfo("ShowLeftToolBox", CONFIG_TYPE_INT, "1"));
-@@ -201,7 +203,7 @@
- 	configList.push_back(ConfigInfo("ServerUseIpv6", CONFIG_TYPE_INT, "0"));
- 	configList.push_back(ConfigInfo("ServerUseSctp", CONFIG_TYPE_INT, "0"));
- 	configList.push_back(ConfigInfo("ServerPort", CONFIG_TYPE_INT, "7234"));
--	configList.push_back(ConfigInfo("InternetServerAddress", CONFIG_TYPE_STRING, "pokerth.6dns.org"));
-+	configList.push_back(ConfigInfo("InternetServerAddress", CONFIG_TYPE_STRING, "localhost"));
- 	configList.push_back(ConfigInfo("InternetServerPort", CONFIG_TYPE_INT, "7234"));
- 	configList.push_back(ConfigInfo("InternetServerPassword", CONFIG_TYPE_STRING, ""));
- 	configList.push_back(ConfigInfo("InternetServerUseIpv6", CONFIG_TYPE_INT, "0"));

Deleted: packages/trunk/pokerth/debian/patches/05_server_options_svn-r1393.dpatch
===================================================================
--- packages/trunk/pokerth/debian/patches/05_server_options_svn-r1393.dpatch	2008-03-14 17:46:50 UTC (rev 6055)
+++ packages/trunk/pokerth/debian/patches/05_server_options_svn-r1393.dpatch	2008-03-14 20:48:59 UTC (rev 6056)
@@ -1,108 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_server_options_svn-r1393.dpatch by Evgeni Golov <sargentd at die-welt.net>
-##
-## DP: Add some commandline options and pid-file handling to the server
-## DP: imported from the upstream svn at r1393
-
- at DPATCH@
-
-Index: pokerth/src/pokerth_server.cpp
-===================================================================
---- pokerth.orig/src/pokerth_server.cpp	(revision 1392)
-+++ pokerth/src/pokerth_server.cpp	(working copy)
-@@ -24,9 +24,13 @@
- #include <qttoolsinterface.h>
- #include <gui/generic/serverguiwrapper.h>
- #include <net/socket_startup.h>
-+#include <net/netpacket.h>
- #include <core/loghelper.h>
- #include <core/thread.h>
-+#include <boost/program_options.hpp>
-+#include <boost/filesystem.hpp>
- 
-+#include <fstream>
- #include <memory>
- #include <csignal>
- 
-@@ -49,6 +53,8 @@
- #endif
- 
- using namespace std;
-+namespace po = boost::program_options;
-+using namespace boost::filesystem;
- 
- volatile int g_pokerthTerminate = 0;
- 
-@@ -59,7 +65,9 @@
- }
- 
- // TODO: Hack
--#ifndef _WIN32
-+#ifdef _WIN32
-+	#include <process.h>
-+#else
- 	#include <unistd.h>
- 	#ifndef daemon
- 		int daemon(int, int);
-@@ -73,6 +81,39 @@
- 
- //	_CrtSetBreakAlloc(4772);
- 
-+	bool readonlyConfig = false;
-+	string pidFile;
-+	{
-+		// Check command line options.
-+		po::options_description desc("Allowed options");
-+		desc.add_options()
-+			("help,h", "produce help message")
-+			("version,v", "print version string")
-+			("pid-file,p", po::value<string>(), "create pid-file in different location")
-+			("readonly-config", "treat config file as read-only")
-+			;
-+
-+		po::variables_map vm;
-+		po::store(po::parse_command_line(argc, argv, desc), vm);
-+		po::notify(vm);
-+
-+		if (vm.count("help"))
-+		{
-+			cout << desc << endl;
-+			return 1;
-+		}
-+		if (vm.count("version"))
-+		{
-+			cout << "PokerTH server version   " << POKERTH_BETA_RELEASE_STRING << endl
-+				 << "Network protocol version " << NET_VERSION_MAJOR << "." << NET_VERSION_MINOR << endl;
-+			return 1;
-+		}
-+		if (vm.count("pid-file"))
-+			pidFile = vm["pid-file"].as<string>();
-+		if (vm.count("readonly-config"))
-+			readonlyConfig = true;
-+	}
-+
- 	auto_ptr<QtToolsInterface> myQtToolsInterface(CreateQtToolsWrapper());
- 	//create defaultconfig
- 	ConfigFile *myConfig = new ConfigFile(argc, argv);
-@@ -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() << ".");
- 
-+	// Store pid in file.
-+	if (pidFile.empty())
-+	{
-+		path tmpPidPath(myConfig->readConfigString("LogDir"));
-+		tmpPidPath /= "pokerth.pid";
-+		pidFile = tmpPidPath.directory_string();
-+	}
-+	{
-+		ofstream pidStream(pidFile.c_str(), ios_base::out | ios_base::trunc);
-+		if (!pidStream.fail())
-+			pidStream << getpid();
-+		else
-+			LOG_ERROR("Could not create process id file \"" << pidFile << "\"!");
-+	}
-+
- 	// Create pseudo Gui Wrapper for the server.
- 	boost::shared_ptr<GuiInterface> myServerGuiInterface(new ServerGuiWrapper(myConfig, NULL, NULL, NULL));
- 	boost::shared_ptr<Session> session(new Session(myServerGuiInterface.get(), myConfig));

Deleted: packages/trunk/pokerth/debian/patches/06_server.pro_svn-r1397.dpatch
===================================================================
--- packages/trunk/pokerth/debian/patches/06_server.pro_svn-r1397.dpatch	2008-03-14 17:46:50 UTC (rev 6055)
+++ packages/trunk/pokerth/debian/patches/06_server.pro_svn-r1397.dpatch	2008-03-14 20:48:59 UTC (rev 6056)
@@ -1,58 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_server.pro_svn-r1397.dpatch by Evgeni Golov <sargentd at die-welt.net>
-##
-## DP: Add boost_program_options to LIBS
-## DP: Adopted from upstream svn r1397
-
- at DPATCH@
-
-Index: pokerth_server.pro
-===================================================================
---- pokerth.orig/pokerth_server.pro	(revision 1392)
-+++ pokerth/pokerth_server.pro	(working copy)
-@@ -133,6 +133,7 @@
- 		LIBS += -lssl
- 		LIBS += -lboost_thread-mgw34-mt-1_34_1
- 		LIBS += -lboost_filesystem-mgw34-mt-1_34_1
-+		LIBS += -lboost_program_options-mgw34-mt-1_34_1
- 	}
- 
-     LIBS += -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lole32 -luuid -luser32 -lmsimg32 -lshell32 -lkernel32 -lws2_32 -ladvapi32
-@@ -189,7 +190,28 @@
- 			LIBS += -lboost_filesystem
- 		}
- 	}
--	
-+
-+	exists( /usr/lib/libboost_program_options-mt.so ){
-+		message("Found libboost_program_options-mt")
-+		LIBS += -lboost_program_options-mt
-+	}
-+	exists( /usr/lib64/libboost_program_options-mt.so ){
-+		message("Found libboost_program_options-mt")
-+		LIBS += -lboost_program_options-mt
-+	}
-+	!exists( /usr/lib/libboost_program_options-mt.so ){
-+		exists( /usr/lib/libboost_program_options.so ){
-+			message("Found libboost_program_options")
-+			LIBS += -lboost_program_options
-+		}
-+	}
-+	!exists( /usr/lib64/liblibboost_program_options-mt.so ){
-+		exists( /usr/lib64/libboost_program_options.so ){
-+			message("Found libboost_program_options")
-+			LIBS += -lboost_program_options
-+		}
-+	}
-+
- 	LIBS += -lcrypto
- 	TARGETDEPS += ./lib/libpokerth_lib.a
- 
-@@ -213,6 +235,7 @@
- 	# make sure you have a universal version of boost
- 	LIBS += /usr/local/lib/libboost_thread-mt-1_34_1.a
- 	LIBS += /usr/local/lib/libboost_filesystem-mt-1_34_1.a
-+	LIBS += /usr/local/lib/libboost_program_options-mt-1_34_1.a
- 	# libraries installed on every mac
- 	LIBS += -lcrypto -liconv
- 	# set the application icon

Added: packages/trunk/pokerth/debian/pokerth-server.docs
===================================================================
--- packages/trunk/pokerth/debian/pokerth-server.docs	                        (rev 0)
+++ packages/trunk/pokerth/debian/pokerth-server.docs	2008-03-14 20:48:59 UTC (rev 6056)
@@ -0,0 +1 @@
+docs/server_setup_howto.txt

Deleted: packages/trunk/pokerth/debian/pokerth-server.init
===================================================================
--- packages/trunk/pokerth/debian/pokerth-server.init	2008-03-14 17:46:50 UTC (rev 6055)
+++ packages/trunk/pokerth/debian/pokerth-server.init	2008-03-14 20:48:59 UTC (rev 6056)
@@ -1,159 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          pokerth
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: PokerTH server initscript
-# Description:       This file starts pokerth-server
-### END INIT INFO
-
-# Author: Evgeni Golov <sargentd at die-welt.net>
-
-# Do NOT "set -e"
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/games
-DESC="PokerTH server"
-NAME=pokerth_server
-PIDDIR=/var/run/pokerth
-PIDFILE=$PIDDIR/$NAME.pid
-DAEMON=/usr/games/$NAME
-DAEMON_ARGS="-p $PIDFILE"
-SCRIPTNAME=/etc/init.d/pokerth-server
-STARTAS_USER=pokerth
-STARTAS_GRP=pokerth
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-
-	# create $PIDDIR if needed, so $STARTAS_USER can write to it
-	if [ ! -d $PIDDIR ]; then
-	  mkdir -p $PIDDIR
-	  chown $STARTAS_USER:$STARTAS_USER $PIDDIR
-	fi
-
-	# Return
-	#   0 if daemon has been started
-	#   1 if daemon was already running
-	#   2 if daemon could not be started
-	start-stop-daemon --start --chuid $STARTAS_USER:$STARTAS_GRP --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --chuid $STARTAS_USER:$STARTAS_GRP --quiet --pidfile $PIDFILE --exec $DAEMON -- \
-		$DAEMON_ARGS \
-		|| return 2
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-	# Return
-	#   0 if daemon has been stopped
-	#   1 if daemon was already stopped
-	#   2 if daemon could not be stopped
-	#   other if a failure occurred
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
-	RETVAL="$?"
-	[ "$RETVAL" = 2 ] && return 2
-	# Wait for children to finish too if this is a daemon that forks
-	# and if the daemon is only ever run from this initscript.
-	# If the above conditions are not satisfied then add some other code
-	# that waits for the process to drop all resources that could be
-	# needed by services started subsequently.  A last resort is to
-	# sleep for some time.
-	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-	[ "$?" = 2 ] && return 2
-	# Many daemons don't delete their pidfiles when they exit.
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
-	#
-	# If the daemon can reload its configuration without
-	# restarting (for example, when it is sent a SIGHUP),
-	# then implement that here.
-	#
-	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
-	return 0
-}
-
-case "$1" in
-  start)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-	do_start
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  stop)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  #reload|force-reload)
-	#
-	# If do_reload() is not implemented then leave this commented out
-	# and leave 'force-reload' as an alias for 'restart'.
-	#
-	#log_daemon_msg "Reloading $DESC" "$NAME"
-	#do_reload
-	#log_end_msg $?
-	#;;
-  restart|force-reload)
-	#
-	# If the "reload" option is implemented then remove the
-	# 'force-reload' alias
-	#
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-	  	# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:
-

Modified: packages/trunk/pokerth/debian/pokerth-server.install
===================================================================
--- packages/trunk/pokerth/debian/pokerth-server.install	2008-03-14 17:46:50 UTC (rev 6055)
+++ packages/trunk/pokerth/debian/pokerth-server.install	2008-03-14 20:48:59 UTC (rev 6056)
@@ -1,2 +1 @@
 bin/pokerth_server usr/games/
-debian/config.xml etc/pokerth/

Added: packages/trunk/pokerth/debian/pokerth-server.manpages
===================================================================
--- packages/trunk/pokerth/debian/pokerth-server.manpages	                        (rev 0)
+++ packages/trunk/pokerth/debian/pokerth-server.manpages	2008-03-14 20:48:59 UTC (rev 6056)
@@ -0,0 +1 @@
+debian/pokerth_server.1

Deleted: packages/trunk/pokerth/debian/pokerth-server.postinst
===================================================================
--- packages/trunk/pokerth/debian/pokerth-server.postinst	2008-03-14 17:46:50 UTC (rev 6055)
+++ packages/trunk/pokerth/debian/pokerth-server.postinst	2008-03-14 20:48:59 UTC (rev 6056)
@@ -1,30 +0,0 @@
-#!/bin/sh
-# postinst script for pokerth-server
-
-set -e
-
-case "$1" in
-  configure)
-  # Set up the pokerth user on new install
-  if [ -z "$2" ]; then
-    if ! getent passwd pokerth >/dev/null; then
-	 adduser --system --group --home /var/lib/pokerth pokerth
-    fi
-    chown pokerth:pokerth /var/run/pokerth
-  fi
-  ;;
-  abort-upgrade|abort-remove|abort-deconfigure)
-  ;;
-  *)
-  echo "postinst called with unknown argument \`$1'" >&2
-  exit 1
-  ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-

Deleted: packages/trunk/pokerth/debian/pokerth-server.postrm
===================================================================
--- packages/trunk/pokerth/debian/pokerth-server.postrm	2008-03-14 17:46:50 UTC (rev 6055)
+++ packages/trunk/pokerth/debian/pokerth-server.postrm	2008-03-14 20:48:59 UTC (rev 6056)
@@ -1,25 +0,0 @@
-#! /bin/sh
-# postrm script for pokerth-server
-
-set -e
-
-case "$1" in
-  purge)
-  if [ -x "/usr/sbin/deluser" ]; then
-    deluser --system pokerth || true
-    deluser --group pokerth || true
-  fi
-  ;;
-  remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-  ;;
-  *)
-  echo "postrm called with unknown argument \`$1'" >&2
-  exit 1
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

Added: packages/trunk/pokerth/debian/pokerth_server.1
===================================================================
--- packages/trunk/pokerth/debian/pokerth_server.1	                        (rev 0)
+++ packages/trunk/pokerth/debian/pokerth_server.1	2008-03-14 20:48:59 UTC (rev 6056)
@@ -0,0 +1,27 @@
+.TH POKERTH "1" "March 2008" "PokerTH server 0.6.1" "User Commands"
+.SH NAME
+pokerth_server \- multiplayer and multigame server for PokerTH
+.SH SYNOPSIS
+.B pokerth_server \fR[ \fB\-h\fR | \fB\-\-help\fR ] [ \fB\-v\fR | \fB\-\-version\fR ]
+[ \fB\-p\fR | \fB\-\-pid\-file\fR\fI pid-file \fR] [ \fB\-\-readonly\-config\fR ]
+.SH DESCRIPTION
+This is the PokerTH server, which is needed for hosting own multiplayer games.
+Network protocol version 4.1
+.SH OPTIONS
+.TP
+\fB\-h\fR [ \fB\-\-help\fR ]
+produce help message
+.TP
+\fB\-v\fR [ \fB\-\-version\fR ]
+print version string
+.TP
+\fB\-p\fR [ \fB\-\-pid\-file\fR ] \fIpid-file\fR
+create pid\-file in different location
+.TP
+\fB\-\-readonly\-config\fR
+treat config file as read\-only
+.SH AUTHOR
+pokerth and pokerth_server were written by Felix Hammer, Florian Thauer and Lothar May.
+.PP
+This manual page was written by Evgeni Golov <sargentd at die-welt.net>,
+for the Debian project (but may be used by others).

Modified: packages/trunk/pokerth/debian/rules
===================================================================
--- packages/trunk/pokerth/debian/rules	2008-03-14 17:46:50 UTC (rev 6055)
+++ packages/trunk/pokerth/debian/rules	2008-03-14 20:48:59 UTC (rev 6056)
@@ -26,7 +26,9 @@
 	make
 	touch $@
 
-clean: unpatch
+clean: clean-patched unpatch
+
+clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp




More information about the Pkg-games-commits mailing list