Debian release 2.17-32

debian/changelog

@@ -1,3 +1,38 @@
+bsdgames (2.17-32) unstable; urgency=medium
+
+  * Remove phantasia files from pre- and postinst. Closes: #1068243
+
+ -- Dr. Tobias Quathamer <toddy@debian.org>  Tue, 02 Apr 2024 17:53:12 +0200
+
+bsdgames (2.17-31) unstable; urgency=medium
+
+  * Disable building of some games, in order to prepare for a new
+    upstream version found at https://sourceforge.net/projects/bsd-games/
+    - Update list of included games
+    - Update d/rules for removed games
+    - Update d/dirs for removed games
+    - Remove obsolete .desktop files
+  * List of games which have been removed:
+    - bcd
+    - boggle
+    - countmail
+    - hunt (This currently FTBFS. Closes: #1066266)
+    - mille
+    - monop
+    - morse
+    - number
+    - phantasia
+    - pig
+    - pom
+    - ppt
+    - quiz
+    - rain
+    - random
+    - wargames
+    - worms
+
+ -- Dr. Tobias Quathamer <toddy@debian.org>  Mon, 01 Apr 2024 18:10:52 +0200
+
 bsdgames (2.17-30) unstable; urgency=medium
 
   * Change gbp.conf for DEP-14 branch layout

debian/control

@@ -26,7 +26,5 @@ Description: collection of classic textual unix games
  have been enjoyed for decades on unix systems.
  .
  It includes these programs: adventure, arithmetic, atc, backgammon,
- battlestar, bcd, boggle, caesar, canfield, countmail, cribbage, dab,
- go-fish, gomoku, hack, hangman, hunt, mille, monop, morse, number,
- pig, phantasia, pom, ppt, primes, quiz, random, rain, robots, rot13,
- sail, snake, tetris, trek, wargames, worm, worms, wump, wtf
+ battlestar, caesar, canfield, cribbage, dab, go-fish, gomoku, hack, hangman,
+ primes, robots, sail, snake, tetris, trek, worm, wtf, wump

debian/desktop-files/bcd.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.5
-Name=BCD
-Exec=bcd
-Icon=bsdgames.svg
-Terminal=True
-Categories=Game;ConsoleOnly

debian/desktop-files/boggle.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.5
-Name=Boggle
-Exec=boggle
-Icon=bsdgames.svg
-Terminal=True
-Categories=Game;LogicGame;ConsoleOnly

debian/desktop-files/countmail.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.5
-Name=Countmail
-Exec=countmail
-Icon=bsdgames.svg
-Terminal=True
-Categories=Game;ConsoleOnly

debian/desktop-files/hunt.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.5
-Name=Hunt
-Exec=hunt
-Icon=bsdgames.svg
-Terminal=True
-Categories=Game;StrategyGame;ActionGame;ConsoleOnly

debian/desktop-files/mille.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.5
-Name=Mille Bornes
-Exec=mille
-Icon=bsdgames.svg
-Terminal=True
-Categories=Game;CardGame;ConsoleOnly

debian/desktop-files/monop.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.5
-Name=Monopoly
-Exec=monop
-Icon=bsdgames.svg
-Terminal=True
-Categories=Game;BoardGame

debian/desktop-files/morse.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.5
-Name=Pig
-Exec=pig
-Icon=bsdgames.svg
-Terminal=True
-Categories=Game;KidsGame;ConsoleOnly

debian/desktop-files/number.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.5
-Name=Number
-Exec=number
-Icon=bsdgames.svg
-Terminal=True
-Categories=Game;ConsoleOnly

debian/desktop-files/phantasia.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.5
-Name=Phantasia
-Exec=phantasia
-Icon=bsdgames.svg
-Terminal=True
-Categories=Game;AdventureGame;ConsoleOnly

debian/desktop-files/pig.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.5
-Name=PIG
-Exec=pig
-Icon=bsdgames.svg
-Terminal=True
-Categories=Game;KidsGame;ConsoleOnly

debian/desktop-files/pom.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.5
-Name=Phase of the Moon
-Exec=pom
-Icon=bsdgames.svg
-Terminal=True
-Categories=Game;ConsoleOnly

debian/desktop-files/ppt.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.5
-Name=PPT
-Exec=ppt
-Icon=bsdgames.svg
-Terminal=True
-Categories=Game;ConsoleOnly

debian/desktop-files/quiz.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.5
-Name=Quiz
-Exec=quiz
-Icon=bsdgames.svg
-Terminal=True
-Categories=Game;ConsoleOnly

debian/desktop-files/rain.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.5
-Name=Rain
-Exec=rain
-Icon=bsdgames.svg
-Terminal=True
-Categories=Game;ConsoleOnly

debian/desktop-files/random.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.5
-Name=Random
-Exec=random
-Icon=bsdgames.svg
-Terminal=True
-Categories=Game;ConsoleOnly

debian/desktop-files/wargames.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.5
-Name=Wargames
-Exec=wargames
-Icon=bsdgames.svg
-Terminal=True
-Categories=Game;ConsoleOnly

debian/desktop-files/worms.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.5
-Name=Worms
-Exec=worms
-Icon=bsdgames.svg
-Terminal=True
-Categories=Game;ActionGame;ConsoleOnly

debian/dirs

@@ -1,3 +1,2 @@
 usr/share/doc/bsdgames
-usr/share/games/bsdgames/phantasia
 var/games/bsdgames/hack/save

debian/patches/0006-Custom-configuration-of-Debian-package-build.patch

@@ -23,7 +23,7 @@ index 0000000..97d45fb
 +bsd_games_cfg_install_prefix=`pwd`/debian/bsdgames
 +
 +# Do not build or install these games:
-+bsd_games_cfg_no_build_dirs="dm banner fortune factor"
++bsd_games_cfg_no_build_dirs="banner bcd boggle countmail dm factor fortune hunt mille monop morse number phantasia pig pom ppt quiz rain random wargames worms"
 +
 +# Keep huntd in /usr/sbin as it was in the past. I may
 +# change this later.

debian/postinst

@@ -28,14 +28,6 @@ SCOREFILES="
 	/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
 	/var/games/bsdgames/hack/perm
 	/var/games/bsdgames/hack/record"
 
@@ -53,24 +45,10 @@ if [ -d /var/games/bsdgames-nonfree ]; then
 	rmdir -p /var/games/bsdgames-nonfree/hack/save 2>/dev/null || true
 fi
 	
-# These files cannot just be zero-byte files:
-if [ ! -e /var/games/bsdgames/phantasia/void ]; then
-	cp /usr/share/games/bsdgames/phantasia/void \
-		/var/games/bsdgames/phantasia/void
-fi
-if [ ! -e /var/games/bsdgames/phantasia/monsters ] ; then
-	cp /usr/share/games/bsdgames/phantasia/monsters \
-		/var/games/bsdgames/phantasia/monsters
-fi
-
 touch $SCOREFILES
 chown root:games $SCOREFILES
 chmod 664 $SCOREFILES
 
-# These files may not be world-readable as they have passwords
-# in them.
-chmod 660 /var/games/bsdgames/phantasia/characs
-
 ADVENTURE_PRIORITY=50
 
 case "$action" in

debian/preinst

@@ -23,15 +23,7 @@ SCOREFILES="
 	/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"
+	/var/games/bsdgames/tetris-bsd.scores"
 
 # We used to keep score files in /var/lib/games, and if files are there,
 # move them into the new location.
@@ -40,10 +32,8 @@ if [ -d /var/lib/games ]; then
 	# Have to set up directory hierarchy, since this is running as a
 	# preinst.
 	mkdir -p /var/games/bsdgames/phantasia
-	chown root:games /var/games/bsdgames \
-		/var/games/bsdgames/phantasia
-	chmod g+rws /var/games/bsdgames \
-		/var/games/bsdgames/phantasia
+	chown root:games /var/games/bsdgames
+	chmod g+rws /var/games/bsdgames
 
 	for file in $SCOREFILES; do
 		oldfile=`echo $file | sed s:/var/games/:/var/lib/games/:`

debian/rules

@@ -23,16 +23,8 @@ override_dh_auto_build:
 override_dh_installdocs:
 	dh_installdocs
 	cp atc/BUGS debian/bsdgames/usr/share/doc/bsdgames/BUGS.atc
-	cp hunt/README debian/bsdgames/usr/share/doc/bsdgames/README.hunt
-	cp phantasia/README debian/bsdgames/usr/share/doc/bsdgames/README.phantasia
-	cp boggle/README debian/bsdgames/usr/share/doc/bsdgames/README.boggle
 	cp hack/Original_READ_ME debian/bsdgames/usr/share/doc/bsdgames/Original_READ_ME.hack
 	cp hack/READ_ME debian/bsdgames/usr/share/doc/bsdgames/READ_ME.hack
-	# Move phantasia's binary state files into /usr, they are copied
-	# back to /var in the postinst.
-	mv debian/bsdgames/var/games/bsdgames/phantasia/monsters \
-	   debian/bsdgames/var/games/bsdgames/phantasia/void \
-	   debian/bsdgames/usr/share/games/bsdgames/phantasia/
 	cat COPYING >> debian/bsdgames/usr/share/doc/bsdgames/copyright
 
 override_dh_install:
@@ -56,7 +48,6 @@ override_dh_fixperms:
 		debian/bsdgames/usr/games/robots \
 		debian/bsdgames/usr/games/snake \
 		debian/bsdgames/usr/games/tetris-bsd \
-		debian/bsdgames/usr/games/phantasia \
 		debian/bsdgames/usr/games/sail \
 		debian/bsdgames/usr/games/hack
 	chmod g+s debian/bsdgames/usr/games/atc \
@@ -66,19 +57,16 @@ override_dh_fixperms:
 		debian/bsdgames/usr/games/robots \
 		debian/bsdgames/usr/games/snake \
 		debian/bsdgames/usr/games/tetris-bsd \
-		debian/bsdgames/usr/games/phantasia \
 		debian/bsdgames/usr/games/sail \
 		debian/bsdgames/usr/games/hack
 	# The game directories need to be sgid too, and let's
 	# remove all the zero byte score files in them.
 	chown root:games debian/bsdgames/var/games/bsdgames/ \
 		debian/bsdgames/var/games/bsdgames/sail \
-		debian/bsdgames/var/games/bsdgames/phantasia \
 		debian/bsdgames/var/games/bsdgames/hack \
 		debian/bsdgames/var/games/bsdgames/hack/save
 	chmod g+rws debian/bsdgames/var/games/bsdgames/ \
 		debian/bsdgames/var/games/bsdgames/sail \
-		debian/bsdgames/var/games/bsdgames/phantasia \
 		debian/bsdgames/var/games/bsdgames/hack \
 		debian/bsdgames/var/games/bsdgames/hack/save
 	find debian/bsdgames/var/games/bsdgames -size 0 -exec rm {} \;