diff -pruN 3.1-4/debian/Fortunate.desktop 3.1-5/debian/Fortunate.desktop
--- 3.1-4/debian/Fortunate.desktop	1970-01-01 00:00:00.000000000 +0000
+++ 3.1-5/debian/Fortunate.desktop	2025-01-21 13:14:38.000000000 +0000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Categories=Game;Amusement;
+Name=Fortunate
+Comment=GNUstep fortune cookies
+Comment[bg]=Епиграми за GNUstep
+Keywords=fortune;quotation;cookie;
+Keywords[bg]=епиграми;цитати;fortune;quotation;cookie;
+Icon=/usr/share/pixmaps/GNUstep/Fortunate.png
+Exec=Fortunate
diff -pruN 3.1-4/debian/changelog 3.1-5/debian/changelog
--- 3.1-4/debian/changelog	2024-07-04 13:35:08.000000000 +0000
+++ 3.1-5/debian/changelog	2025-01-21 13:29:56.000000000 +0000
@@ -1,3 +1,23 @@
+fortunate.app (3.1-5) unstable; urgency=medium
+
+  * Team upload.
+  * debian/control (Build-Depends): Require gnustep-make (>= 2.9.2) for
+    dh_gnustep's new features.  Add imagemagick for the icon conversion.
+  * debian/rules (d_app): Remove definition.
+    (override_dh_link): Rename as...
+    (execute_before_dh_link): ...and run dh_gnustep --app --game.
+    (override_dh_auto_build): Create a PNG icon for the .desktop file.
+  * debian/Fortunate.desktop: New file.
+  * debian/install: Likewise.
+  * debian/clean: Likewise.
+  * debian/watch: Likewise.
+  * debian/patches/info-plist: Remove template description.
+  * debian/maintscript: Delete; no longer needed.
+  * debian/dirs: Delete; dh_gnustep takes care of that now.
+  * debian/copyright: Replace MIT with NTP.  Update copyright years.
+
+ -- Yavor Doganov <yavor@gnu.org>  Tue, 21 Jan 2025 15:29:56 +0200
+
 fortunate.app (3.1-4) unstable; urgency=medium
 
   * Bump standards version to 4.7.0.
diff -pruN 3.1-4/debian/clean 3.1-5/debian/clean
--- 3.1-4/debian/clean	1970-01-01 00:00:00.000000000 +0000
+++ 3.1-5/debian/clean	2025-01-21 13:02:08.000000000 +0000
@@ -0,0 +1 @@
+*.png
diff -pruN 3.1-4/debian/control 3.1-5/debian/control
--- 3.1-4/debian/control	2024-07-04 13:35:06.000000000 +0000
+++ 3.1-5/debian/control	2025-01-21 13:23:22.000000000 +0000
@@ -6,6 +6,8 @@ Uploaders:
  Alex Myczko <tar@debian.org>,
 Build-Depends:
  debhelper-compat (= 13),
+ gnustep-make (>= 2.9.2-2),
+ imagemagick,
  libgnustep-gui-dev,
 Homepage: http://aiei.ch/gnustep/fortunate/
 Rules-Requires-Root: no
diff -pruN 3.1-4/debian/copyright 3.1-5/debian/copyright
--- 3.1-4/debian/copyright	2024-07-04 13:34:35.000000000 +0000
+++ 3.1-5/debian/copyright	2025-01-21 13:29:02.000000000 +0000
@@ -23,7 +23,7 @@ License: LGPL-2.1+
 
 Files: fortune/*
 Copyright: 1986,1993 The Regents of the University of California.  All rights reserved.
-License: BSD-4-clause
+License: BSD-4-clause-UC
  This code is derived from software contributed to Berkeley by
  Ken Arnold.
  .
@@ -57,7 +57,7 @@ License: BSD-4-clause
 
 Files: fortune/regexpr.*
 Copyright: 1991 Tatu Ylonen <ylo@ngs.fi>
-License: MIT
+License: NTP
  Permission to use, copy, modify, distribute, and sell this software
  and its documentation is hereby granted without fee, provided that the
  above copyright notice appears in all source code copies, the name of
@@ -68,7 +68,7 @@ License: MIT
  This software is provided "as is" without express or implied warranty.
 
 Files: debian/*
-Copyright: 2004-2024 Alex Myczko <tar@debian.org>
+Copyright: 2004-2025 Alex Myczko <tar@debian.org>
 License: LGPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff -pruN 3.1-4/debian/dirs 3.1-5/debian/dirs
--- 3.1-4/debian/dirs	2019-11-21 17:44:13.000000000 +0000
+++ 3.1-5/debian/dirs	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/games
diff -pruN 3.1-4/debian/install 3.1-5/debian/install
--- 3.1-4/debian/install	1970-01-01 00:00:00.000000000 +0000
+++ 3.1-5/debian/install	2025-01-21 13:02:40.000000000 +0000
@@ -0,0 +1,2 @@
+debian/Fortunate.desktop        usr/share/applications
+Fortunate.png                   usr/share/pixmaps/GNUstep
diff -pruN 3.1-4/debian/maintscript 3.1-5/debian/maintscript
--- 3.1-4/debian/maintscript	2019-11-21 17:44:13.000000000 +0000
+++ 3.1-5/debian/maintscript	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-dir_to_symlink /usr/lib/GNUstep/Applications/Fortunate.app/Resources /usr/share/GNUstep/Fortunate.app 3.1-3~
diff -pruN 3.1-4/debian/patches/info-plist 3.1-5/debian/patches/info-plist
--- 3.1-4/debian/patches/info-plist	2019-11-21 17:44:13.000000000 +0000
+++ 3.1-5/debian/patches/info-plist	2025-01-21 13:25:56.000000000 +0000
@@ -1,29 +1,9 @@
 Description: update version and URL
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- fortunate.app (3.1-1) unstable; urgency=low
- .
-   * Initial Release. (Closes: #290791)
-   * Add lintian override to prevent squawking over images in /usr/lib
 Author: Gürkan Myczko <gurkan@phys.ethz.ch>
 Bug-Debian: https://bugs.debian.org/290791
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: https://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
+Forwarded: no
 Last-Update: 2017-05-02
+---
 
 --- fortunate.app-3.1.orig/FortunateInfo.plist
 +++ fortunate.app-3.1/FortunateInfo.plist
diff -pruN 3.1-4/debian/rules 3.1-5/debian/rules
--- 3.1-4/debian/rules	2019-11-21 17:44:13.000000000 +0000
+++ 3.1-5/debian/rules	2025-01-21 13:01:18.000000000 +0000
@@ -3,8 +3,7 @@
 #export DH_VERBOSE=1
 
 include /usr/share/GNUstep/debian/config.mk
-d_app := $(CURDIR)/debian/fortunate.app
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh $@
@@ -12,13 +11,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening
 override_dh_auto_build:
 	dh_auto_build -- $(optim) $(verbose) \
 	  $(shell dpkg-buildflags --export=cmdline)
+	convert Fortunate.tiff -resize 64x64 Fortunate.png
 
-override_dh_link:
-	mv $(d_app)/usr/bin/Fortunate $(d_app)/usr/games
-	rmdir $(d_app)/usr/bin
-	dh_installdirs usr/share/GNUstep
-	rm $(d_app)$(GNUSTEP_SYSTEM_APPS)/*.app/Resources/*.desktop
-	mv $(d_app)$(GNUSTEP_SYSTEM_APPS)/Fortunate.app/Resources \
-	  $(d_app)/usr/share/GNUstep/Fortunate.app
-	dh_link /usr/share/GNUstep/Fortunate.app \
-	  $(GNUSTEP_SYSTEM_APPS)/Fortunate.app/Resources
+execute_before_dh_link:
+	gsdh_gnustep --app --game
diff -pruN 3.1-4/debian/watch 3.1-5/debian/watch
--- 3.1-4/debian/watch	1970-01-01 00:00:00.000000000 +0000
+++ 3.1-5/debian/watch	2025-01-21 13:21:47.000000000 +0000
@@ -0,0 +1,2 @@
+version=4
+https://aiei.ch/gnustep/fortunate/fortunate-@ANY_VERSION@@ARCHIVE_EXT@
