From d2c5bfae7a6d9a952da81f98c8755a88e700a3be Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Fri, 18 Mar 2005 18:04:22 +0100 Subject: [PATCH] Imported Debian patch 0.52-3 --- debian/README.Debian | 8 ++++---- debian/changelog | 9 +++++++++ debian/control | 2 +- debian/copyright | 38 +++++++++++++++++--------------------- debian/menu | 2 +- game.c | 3 ++- 6 files changed, 34 insertions(+), 28 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index e07eb0a..3dd13af 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -2,12 +2,12 @@ netris for Debian ----------------- I did apply the "new game" patch from Tomas Berndtsson . -This patch is really nice for it multiplayer games, you don't have to exit and -can press 'n' (or whatever key you bound the function to) to start a new game. -For the keybinding stuff I had to patch the patch myself ,-) +This patch is really nice because in multiplayer games, you don't have to exit +and can press 'n' (or whatever key you bound the function to) to start a new +game. For the keybinding stuff I had to patch the patch myself ,-) I have contacted the upstream maintainer about this patch in June but haven't -heard from him since then. Last contact I had with Mark was in march. If you +heard from him since then. Last contact I had with Mark was in March. If you have any information about him feel free to contact me. Ah, and I have another patch sent in by Rob Hensley diff --git a/debian/changelog b/debian/changelog index 7a4f992..c55d771 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +netris (0.52-3) unstable; urgency=low + + * Quote all entries in the menu file. + * Fix -s setting, patch from Piotr Krukowiecki, thanks (closes: #300125) + * Fixed short description to not include an upercased article at the start. + * Slightly reformated copyright file a bit. + + -- Gerfried Fuchs Fri, 18 Mar 2005 18:04:22 +0100 + netris (0.52-2) unstable; urgency=low * Applied patch from Per von Zweigbergk for staircase effect (closes: #83039) diff --git a/debian/control b/debian/control index ee5b88d..8df77ff 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.6.1 Package: netris Architecture: any Depends: ${shlibs:Depends} -Description: A free, networked version of T*tris +Description: free, networked version of T*tris Netris is a free, networked variant of Tetris. . One-player mode is a tad boring at the moment because it never diff --git a/debian/copyright b/debian/copyright index f61f2a1..d677c00 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,28 +1,24 @@ -This package was debianized by Gergely Madarasz on +This package was first debianized by Gergely Madarasz on Wed, 6 Aug 1997 22:10:42 +0200. It was downloaded from ftp://ftp.netris.org/pub/netris/ -Changes: - * added Debian GNU/Linux package maintenance system files - * modified Configure script for use with ncurses - -Copyright (C) 1994,1995,1996 Mark H. Weaver - -This program is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 2, or (at your option) any -later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. + Copyright (C) 1994,1995,1996 Mark H. Weaver + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. On Debian GNU/Linux systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. diff --git a/debian/menu b/debian/menu index 18c9524..604f852 100644 --- a/debian/menu +++ b/debian/menu @@ -1,2 +1,2 @@ -?package(netris):needs=text section=Games/Tetris-like title="Netris" \ +?package(netris):needs="text" section="Games/Tetris-like" title="Netris" \ command="/usr/games/netris" longtitle="Networked Tetris" diff --git a/game.c b/game.c index 0c98b74..ad188cf 100644 --- a/game.c +++ b/game.c @@ -435,7 +435,8 @@ ExtFunc int main(int argc, char **argv) if (robotEnable) InitRobot(robotProg); InitNet(); - SRandom(time(0)); + if (!initSeed) + SRandom(time(0)); if (initConn || waitConn) { game = GT_classicTwo; if(gameState != STATE_STARTING) { -- 2.39.5