diff --git a/config.params b/config.params index 497efe9..a5aac69 100644 --- a/config.params +++ b/config.params @@ -11,16 +11,11 @@ bsd_games_cfg_no_build_dirs="dm banner fortune factor" # change this later. bsd_games_cfg_sbindir=/usr/sbin -# Use /usr/man still. Debian doesn't use this part of FHS yet. -bsd_games_cfg_man8dir=/usr/man/man8 -bsd_games_cfg_man6dir=/usr/man/man6 -bsd_games_cfg_man5dir=/usr/man/man5 - # Debian doesn't like cluttering up the /usr/*/games/ dirs too much, # use a subdir. /var too. bsd_games_cfg_usrlibdir=/usr/lib/games/bsdgames bsd_games_cfg_sharedir=/usr/share/games/bsdgames -bsd_games_cfg_varlibdir=/var/lib/games/bsdgames +bsd_games_cfg_varlibdir=/var/games/bsdgames # Do not do chown now, we arn't running as root. bsd_games_cfg_do_chown=n diff --git a/debian/changelog b/debian/changelog index cb27281..42a9fef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +bsdgames (2.7-3) unstable; urgency=low + + * FHS. This involves moving to /var/games for all game data. Score files + are moved to there in the postinst now. + * Removed bashisms in debian/rules + + -- Joey Hess Wed, 8 Sep 1999 17:02:12 -0700 + bsdgames (2.7-2) unstable; urgency=low * Removed 2 patches I made that are no longer necessary. diff --git a/debian/control b/debian/control index f3586ff..8476f9a 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: bsdgames Section: games Priority: optional Maintainer: Joey Hess -Standards-Version: 2.5.0.0 +Standards-Version: 3.0.1.1 Package: bsdgames Architecture: any diff --git a/debian/copyright b/debian/copyright index ef0fd99..702449f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,7 +5,7 @@ sources from: ftp://sunsite.unc.edu/pub/Linux/Incoming/bsd-games-2.5.tar.gz Most programs in this package have the standard BSD copyright. See -/usr/doc/copyrigght/BSD for the text of this copyright. There are some +/usr/share/common-licenses/BSD for the text of this copyright. There are some exceptions, as follows: atc: diff --git a/debian/postinst b/debian/postinst index 699472c..c512f9e 100644 --- a/debian/postinst +++ b/debian/postinst @@ -1,32 +1,32 @@ #!/bin/sh -e SCOREFILES=" - /var/lib/games/bsdgames/atc_score - /var/lib/games/bsdgames/battlestar.log - /var/lib/games/bsdgames/cfscores - /var/lib/games/bsdgames/criblog - /var/lib/games/bsdgames/robots_roll - /var/lib/games/bsdgames/saillog - /var/lib/games/bsdgames/snake.log - /var/lib/games/bsdgames/snakerawscores - /var/lib/games/bsdgames/tetris-bsd.scores - /var/lib/games/bsdgames/phantasia/characs - /var/lib/games/bsdgames/phantasia/gold - /var/lib/games/bsdgames/phantasia/lastdead - /var/lib/games/bsdgames/phantasia/mess - /var/lib/games/bsdgames/phantasia/motd - /var/lib/games/bsdgames/phantasia/scoreboard - /var/lib/games/bsdgames/phantasia/void - /var/lib/games/bsdgames/phantasia/monsters" + /var/games/bsdgames/atc_score + /var/games/bsdgames/battlestar.log + /var/games/bsdgames/cfscores + /var/games/bsdgames/criblog + /var/games/bsdgames/robots_roll + /var/games/bsdgames/saillog + /var/games/bsdgames/snake.log + /var/games/bsdgames/snakerawscores + /var/games/bsdgames/tetris-bsd.scores + /var/games/bsdgames/phantasia/characs + /var/games/bsdgames/phantasia/gold + /var/games/bsdgames/phantasia/lastdead + /var/games/bsdgames/phantasia/mess + /var/games/bsdgames/phantasia/motd + /var/games/bsdgames/phantasia/scoreboard + /var/games/bsdgames/phantasia/void + /var/games/bsdgames/phantasia/monsters" # These files cannot just be zero-byte files: -if [ ! -e /var/lib/games/bsdgames/phantasia/void ]; then +if [ ! -e /var/games/bsdgames/phantasia/void ]; then cp /usr/share/games/bsdgames/phantasia/void \ - /var/lib/games/bsdgames/phantasia/void + /var/games/bsdgames/phantasia/void fi -if [ ! -e /var/lib/games/bsdgames/phantasia/monsters ] ; then +if [ ! -e /var/games/bsdgames/phantasia/monsters ] ; then cp /usr/share/games/bsdgames/phantasia/monsters \ - /var/lib/games/bsdgames/phantasia/monsters + /var/games/bsdgames/phantasia/monsters fi touch $SCOREFILES diff --git a/debian/postrm b/debian/postrm index 5ac1140..afeb105 100644 --- a/debian/postrm +++ b/debian/postrm @@ -1,30 +1,30 @@ #!/bin/sh -e SCOREFILES=" - /var/lib/games/bsdgames/atc_score - /var/lib/games/bsdgames/battlestar.log - /var/lib/games/bsdgames/cfscores - /var/lib/games/bsdgames/criblog - /var/lib/games/bsdgames/robots_roll - /var/lib/games/bsdgames/saillog - /var/lib/games/bsdgames/snake.log - /var/lib/games/bsdgames/snakerawscores - /var/lib/games/bsdgames/tetris-bsd.scores - /var/lib/games/bsdgames/phantasia/characs - /var/lib/games/bsdgames/phantasia/gold - /var/lib/games/bsdgames/phantasia/lastdead - /var/lib/games/bsdgames/phantasia/mess - /var/lib/games/bsdgames/phantasia/motd - /var/lib/games/bsdgames/phantasia/scoreboard - /var/lib/games/bsdgames/phantasia/void - /var/lib/games/bsdgames/phantasia/monsters" + /var/games/bsdgames/atc_score + /var/games/bsdgames/battlestar.log + /var/games/bsdgames/cfscores + /var/games/bsdgames/criblog + /var/games/bsdgames/robots_roll + /var/games/bsdgames/saillog + /var/games/bsdgames/snake.log + /var/games/bsdgames/snakerawscores + /var/games/bsdgames/tetris-bsd.scores + /var/games/bsdgames/phantasia/characs + /var/games/bsdgames/phantasia/gold + /var/games/bsdgames/phantasia/lastdead + /var/games/bsdgames/phantasia/mess + /var/games/bsdgames/phantasia/motd + /var/games/bsdgames/phantasia/scoreboard + /var/games/bsdgames/phantasia/void + /var/games/bsdgames/phantasia/monsters" # Remove high score files on purge. if [ "$1" = "purge" ]; then rm -f $SCOREFILES fi -rmdir /var/lib/games/bsdgames/phantasia /var/lib/games/bsdgames \ - /var/lib/games 2>/dev/null || true +rmdir /var/games/bsdgames/phantasia /var/games/bsdgames/sail /var/games/bsdgames \ + /var/games 2>/dev/null || true #DEBHELPER# diff --git a/debian/rules b/debian/rules index 248ce72..3c27e7e 100755 --- a/debian/rules +++ b/debian/rules @@ -27,24 +27,26 @@ binary-arch: build dh_testdir dh_testroot dh_clean - dh_installdirs usr/doc/bsdgames usr/share/games/bsdgames/phantasia + dh_installdirs usr/share/doc/bsdgames \ + usr/share/games/bsdgames/phantasia $(MAKE) install - cp atc/BUGS debian/tmp/usr/doc/bsdgames/BUGS.atc - cp hunt/README debian/tmp/usr/doc/bsdgames/README.hunt - cp hunt/README.linux debian/tmp/usr/doc/bsdgames/README.linux.hunt - cp phantasia/README debian/tmp/usr/doc/bsdgames/README.phantasia - cp boggle/README debian/tmp/usr/doc/bsdgames/README.boggle - cp boggle/README.linux debian/tmp/usr/doc/bsdgames/README.linux.boggle + cp atc/BUGS debian/tmp/usr/share/doc/bsdgames/BUGS.atc + cp hunt/README debian/tmp/usr/share/doc/bsdgames/README.hunt + cp hunt/README.linux debian/tmp/usr/share/doc/bsdgames/README.linux.hunt + cp phantasia/README debian/tmp/usr/share/doc/bsdgames/README.phantasia + cp boggle/README debian/tmp/usr/share/doc/bsdgames/README.boggle + cp boggle/README.linux debian/tmp/usr/share/doc/bsdgames/README.linux.boggle # Since factor is not installed, and primes.6 is a symlink to # factor.6, I need to change that to the actual man page. - -rm -f debian/tmp/usr/man/man6/factor.6.gz \ - debian/tmp/usr/man/man6/primes.6 - cp factor/factor.6 debian/tmp/usr/man/man6/primes.6 + -rm -f debian/tmp/usr/share/man/man6/factor.6.gz \ + debian/tmp/usr/share/man/man6/primes.6 + cp factor/factor.6 debian/tmp/usr/share/man/man6/primes.6 # Move phantasia's binary state files into /usr, they are copied # back to /var in the postinst. - mv debian/tmp/var/lib/games/bsdgames/phantasia/{monsters,void} \ - debian/tmp/usr/share/games/bsdgames/phantasia/ + mv debian/tmp/var/games/bsdgames/phantasia/monsters \ + debian/tmp/var/games/bsdgames/phantasia/void \ + debian/tmp/usr/share/games/bsdgames/phantasia/ dh_installdocs ChangeLog ChangeLog.0 TODO README \ trek/USD.doc/trek.me SECURITY THANKS AUTHORS BUGS YEAR2000 @@ -60,13 +62,33 @@ binary-arch: build chmod -R u+rw debian/tmp/usr/ # Games with score files need to be set up sgid games. - chown root.games debian/tmp/usr/games/{atc,battlestar,canfield,cribbage,robots,snake,tetris-bsd,phantasia,sail} - chmod g+s debian/tmp/usr/games/{atc,battlestar,canfield,cribbage,robots,snake,tetris-bsd,phantasia,sail} + chown root.games debian/tmp/usr/games/atc \ + debian/tmp/usr/games/battlestar \ + debian/tmp/usr/games/canfield \ + debian/tmp/usr/games/cribbage \ + debian/tmp/usr/games/robots \ + debian/tmp/usr/games/snake \ + debian/tmp/usr/games/tetris-bsd \ + debian/tmp/usr/games/phantasia \ + debian/tmp/usr/games/sail + chmod g+s debian/tmp/usr/games/atc \ + debian/tmp/usr/games/battlestar \ + debian/tmp/usr/games/canfield \ + debian/tmp/usr/games/cribbage \ + debian/tmp/usr/games/robots \ + debian/tmp/usr/games/snake \ + debian/tmp/usr/games/tetris-bsd \ + debian/tmp/usr/games/phantasia \ + debian/tmp/usr/games/sail # The game directories need to be sgid too, and let's # remove all the zero byte score files in them. - chown root.games debian/tmp/var/lib/games/bsdgames/{,phantasia} - chmod g+rws debian/tmp/var/lib/games/bsdgames/{,phantasia} - find debian/tmp/var/lib/games/bsdgames -size 0 -exec rm {} \; + chown root.games debian/tmp/var/games/bsdgames/ \ + debian/tmp/var/games/bsdgames/sail \ + debian/tmp/var/games/bsdgames/phantasia + chmod g+rws debian/tmp/var/games/bsdgames/ \ + debian/tmp/var/games/bsdgames/sail \ + debian/tmp/var/games/bsdgames/phantasia + find debian/tmp/var/games/bsdgames -size 0 -exec rm {} \; dh_suidregister diff --git a/phantasia/oldplayer.h b/phantasia/oldplayer.h deleted file mode 100644 index 73b6f5c..0000000 --- a/phantasia/oldplayer.h +++ /dev/null @@ -1,56 +0,0 @@ -/* $NetBSD: oldplayer.h,v 1.2 1995/03/24 03:59:09 cgd Exp $ */ - -/* - * oldplayer.h - old player structure - */ - -struct oldplayer /* player statistics */ - { - char o_name[21]; /* name */ - char o_password[9]; /* password */ - char o_login[10]; /* login */ - double o_x; /* x coord */ - double o_y; /* y coord */ - double o_experience; /* experience */ - int o_level; /* level */ - short o_quickness; /* quickness */ - double o_strength; /* strength */ - double o_sin; /* sin */ - double o_mana; /* mana */ - double o_gold; /* gold */ - double o_energy; /* energy */ - double o_maxenergy; /* maximum energy */ - double o_magiclvl; /* magic level */ - double o_brains; /* brains */ - short o_crowns; /* crowns */ - struct - { - short ring_type; /* type of ring */ - short ring_duration; /* duration of ring */ - } o_ring; /* ring stuff */ - bool o_palantir; /* palantir */ - double o_poison; /* poison */ - short o_holywater; /* holy water */ - short o_amulets; /* amulets */ - bool o_blessing; /* blessing */ - short o_charms; /* charms */ - double o_gems; /* gems */ - short o_quksilver; /* quicksilver */ - double o_sword; /* sword */ - double o_shield; /* shield */ - short o_type; /* character type */ - bool o_virgin; /* virgin */ - short o_lastused; /* day of year last used */ - short o_status; /* playing, cloaked, etc. */ - short o_tampered; /* decree'd, etc. flag */ - double o_1scratch, - o_2scratch; /* variables used for decree, player battle */ - bool o_blindness; /* blindness */ - int o_notused; /* not used */ - long o_age; /* age in seconds */ - short o_degenerated; /* age/2500 last degenerated */ - short o_istat; /* used for inter-terminal battle */ -#ifdef PHANTPLUS - short o_lives; -#endif - };