Dear maintainer,

I'm going to upload a NMU to fix this RC bug. I'm going to upload in
DELAYED/3-days. I attached the patch that I applied.

If you have any objections or would you like to make the changes
yourself please let me know.

-- 
cheers,
        Emmanuel Arias

 ⢀⣴⠾⠻⢶⣦⠀
 ⣾⠁⢠⠒⠀⣿⡁  eam...@debian.org
 ⢿⡄⠘⠷⠚⠋⠀  OpenPGP: 13796755BBC72BB8ABE2AEB5 FA9DEC5DE11C63F1                    
 
 ⠈⠳⣄
diff -Nru cappuccino-0.5.1/debian/changelog cappuccino-0.5.1/debian/changelog
--- cappuccino-0.5.1/debian/changelog	2023-10-02 17:40:34.000000000 -0300
+++ cappuccino-0.5.1/debian/changelog	2024-07-10 20:52:28.000000000 -0300
@@ -1,3 +1,15 @@
+cappuccino (0.5.1-10.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * d/patches/remove_distutils.patch: Remove use of distutils in favor
+    of setuptools.
+  * d/control: Remove python3-distutils from Build Dependency. Add
+    python3-setuptools instead (Closes: #1065837).
+  * d/rules: Copy extra data files to installation directory to run
+    polygen.
+
+ -- Emmanuel Arias <eam...@debian.org>  Wed, 10 Jul 2024 20:52:28 -0300
+
 cappuccino (0.5.1-10.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru cappuccino-0.5.1/debian/control cappuccino-0.5.1/debian/control
--- cappuccino-0.5.1/debian/control	2023-10-02 17:37:55.000000000 -0300
+++ cappuccino-0.5.1/debian/control	2024-07-10 20:52:28.000000000 -0300
@@ -4,7 +4,7 @@
 Homepage: https://labs.truelite.it/projects/cappuccino
 Maintainer: Breno Leitao <lei...@debian.org>
 Standards-Version: 4.1.0
-Build-Depends: debhelper (>> 5.0.0), python3, python3-distutils, python3-gi, polygen
+Build-Depends: debhelper (>> 5.0.0), python3, python3-setuptools, python3-gi, polygen
 
 Package: cappuccino
 Architecture: all
diff -Nru cappuccino-0.5.1/debian/patches/remove_distutils.patch cappuccino-0.5.1/debian/patches/remove_distutils.patch
--- cappuccino-0.5.1/debian/patches/remove_distutils.patch	1969-12-31 21:00:00.000000000 -0300
+++ cappuccino-0.5.1/debian/patches/remove_distutils.patch	2024-07-10 20:52:28.000000000 -0300
@@ -0,0 +1,29 @@
+Description: Remove distutils from package
+ This patch remove the use of distutils.core setup in favor of setuptools.setup.
+Author: Emmanuel Arias <eam...@debian.org>
+Bug: <URL to the upstream bug report if any, implies patch has been forwarded, optional>
+Bug-Debian: https://bugs.debian.org/1065837
+Forwarded: no
+Last-Update: 2024-07-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/setup.py
++++ b/setup.py
+@@ -1,6 +1,6 @@
+ # -*- python -*-
+ 
+-from distutils.core import setup
++from setuptools import setup
+ 
+ setup(
+ 	name='cappuccino',
+@@ -9,6 +9,7 @@
+ 	author="Christopher R. Gabriel",
+ 	author_email="cgabr...@cgabriel.org",
+ 	url="http://www.cgabriel.org/software/wiki/Cappuccino";,
+-	scripts=['cappuccino'],
+-	data_files=[('share/cappuccino', ['cappuccino.grm','compileline.grm','cappuccino.jpg'])],
++    scripts=['cappuccino'],
++    include_package_data=True,
++    package_data={'.': ['cappuccino.grm','compileline.grm','cappuccino.jpg']},
+ )
diff -Nru cappuccino-0.5.1/debian/patches/series cappuccino-0.5.1/debian/patches/series
--- cappuccino-0.5.1/debian/patches/series	2023-10-02 17:40:34.000000000 -0300
+++ cappuccino-0.5.1/debian/patches/series	2024-07-10 16:06:32.000000000 -0300
@@ -1 +1,2 @@
 debian.patch
+remove_distutils.patch
diff -Nru cappuccino-0.5.1/debian/rules cappuccino-0.5.1/debian/rules
--- cappuccino-0.5.1/debian/rules	2023-10-02 17:37:55.000000000 -0300
+++ cappuccino-0.5.1/debian/rules	2024-07-10 16:16:32.000000000 -0300
@@ -41,6 +41,12 @@
 	#$(MAKE) install prefix=$(CURDIR)/debian/cappuccino/usr
 	#$(MAKE) install DESTDIR=$(CURDIR)/debian/cappuccino
 	python3 setup.py install --prefix=$(CURDIR)/debian/cappuccino/usr --install-layout=deb
+
+	mkdir -p $(CURDIR)/debian/cappuccino/usr/share/cappuccino/
+	cp $(CURDIR)/cappuccino.grm $(CURDIR)/debian/cappuccino/usr/share/cappuccino/
+	cp $(CURDIR)/compileline.grm $(CURDIR)/debian/cappuccino/usr/share/cappuccino/
+	cp $(CURDIR)/cappuccino.jpg $(CURDIR)/debian/cappuccino/usr/share/cappuccino/
+
 	polygen -seed 0 $(CURDIR)/debian/cappuccino/usr/share/cappuccino/cappuccino.grm > /dev/null
 	polygen -seed 0 $(CURDIR)/debian/cappuccino/usr/share/cappuccino/compileline.grm > /dev/null
 

Attachment: signature.asc
Description: PGP signature

Reply via email to