[Pkg-privacy-maintainers] Bug#1038140: bookworm-pu: package onionshare/2.6-5

[Hefee]

Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian.org at packages.debian.org
Usertags: pu
X-Debbugs-Cc: onionshare at packages.debian.org, pkg-privacy-maintainers at alioth-lists.debian.net, hefee at debian.org
Control: affects -1 + src:onionshare

[ Reason ]
The version 2.6-4 does not install icons, desktop file and appstream metadata file at the
correct place (Closes: #1036691).  So users can only run onionshare via commandline.

[ Tests ]
Autopkgtests make sure, that the main parts of the package are still
functioning. Manual tests, that onionshare is listed in desktop menu and
that it has the correct icon. Same version is installed in sid.

[ Risks ]
No real risks, as it is only installing some files to correct places.

[ Checklist ]
  [x] *all* changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in (old)stable
  [x] the issue is verified as fixed in unstable


Do I need to do update the version with a stable extension ~deb12u1 as there won't be any diff?
-------------- next part --------------
diff -Nru onionshare-2.6/debian/changelog onionshare-2.6/debian/changelog
--- onionshare-2.6/debian/changelog	2023-05-05 14:41:35.000000000 +0200
+++ onionshare-2.6/debian/changelog	2023-06-13 12:23:22.000000000 +0200
@@ -1,3 +1,10 @@
+onionshare (2.6-5) unstable; urgency=medium
+
+  * Install desktp/appmetadata at expected places. (Closes: #1036691)
+  * Install icons under usr/share/icons.
+
+ -- Sandro Knau? <hefee at debian.org>  Tue, 13 Jun 2023 12:23:22 +0200
+
 onionshare (2.6-4) unstable; urgency=medium
 
   * Mark chat-server test as flaky, as it fails on i386 also randomly.
diff -Nru onionshare-2.6/debian/rules onionshare-2.6/debian/rules
--- onionshare-2.6/debian/rules	2022-12-22 14:32:13.000000000 +0100
+++ onionshare-2.6/debian/rules	2023-06-06 21:21:03.000000000 +0200
@@ -4,6 +4,8 @@
 %:
 	dh $@ --buildsystem=pybuild
 
+SIZES = 16 32 64 128 256 512
+
 override_dh_auto_build:
 	PYBUILD_NAME=onionshare-cli dh_auto_build --buildsystem=pybuild --sourcedirectory cli --\
 	    --after-build "CURDIR=$(CURDIR) BUILD_DIR={build_dir} $(CURDIR)/debian/missing-sources/uglifyjs.sh"
@@ -24,8 +26,22 @@
 	rm debian/onionshare/usr/bin/onionshare-cli
 
 execute_after_dh_auto_install:
-	mkdir -p debian/onionshare/usr/share
+	mkdir -p debian/onionshare/usr/share/metainfo
+	cp desktop/org.onionshare.OnionShare.appdata.xml debian/onionshare/usr/share/metainfo/
+	mkdir -p debian/onionshare/usr/share/applications
+	cp desktop/org.onionshare.OnionShare.desktop debian/onionshare/usr/share/applications/
+	
 	mv debian/onionshare/usr/lib/python3*/dist-packages/onionshare/resources debian/onionshare/usr/share/onionshare
+	
+	# Move icons to the places where they are searched
+	mkdir -p debian/onionshare/usr/share/icons/hicolor/scalable/apps
+	cp desktop/org.onionshare.OnionShare.svg debian/onionshare/usr/share/icons/hicolor/scalable/apps/
+	$(foreach size,$(SIZES), \
+	    mkdir debian/onionshare/usr/share/icons/hicolor/$(size)x$(size); \
+	    mv debian/onionshare/usr/share/onionshare/onionshare-$(size).png debian/onionshare/usr/share/icons/hicolor/$(size)x$(size)/org.onionshare.OnionShare.png; \
+	    ln -s /usr/share/icons/hicolor/$(size)x$(size)/org.onionshare.OnionShare.png debian/onionshare/usr/share/onionshare/onionshare-$(size).png; \
+	    ) true
+	
 	mkdir -p debian/onionshare-cli/usr/share
 	mv debian/onionshare-cli/usr/lib/python3*/dist-packages/onionshare_cli/resources debian/onionshare-cli/usr/share/onionshare-cli