From 287c62abdf69ed3db7628b2364513925f9af3a0b Mon Sep 17 00:00:00 2001 From: Mirko Galimberti Date: Thu, 26 Dec 2024 19:53:41 +0100 Subject: [PATCH] Update PPA build rules, use `pybuild`, update `changelog` for `2.3.1` (stable) and `3.0.0` (daily) (#132) --- linux/debian/daily/changelog | 6 -- linux/debian/daily/compat | 1 - linux/debian/daily/control | 6 +- linux/debian/daily/kivy-examples.install | 1 - linux/debian/daily/kivy-tools.install | 7 -- linux/debian/daily/python3-kivy.install | 19 ------ linux/debian/daily/rules | 66 +++++++------------ linux/debian/stable/changelog | 6 ++ linux/debian/stable/compat | 1 - linux/debian/stable/control | 6 +- linux/debian/stable/kivy-examples.install | 1 - linux/debian/stable/kivy-tools.install | 7 -- linux/debian/stable/python3-kivy-bin.install | 9 --- .../debian/stable/python3-kivy-common.install | 1 - linux/debian/stable/python3-kivy.install | 19 ------ linux/debian/stable/rules | 65 +++++++----------- 16 files changed, 66 insertions(+), 155 deletions(-) delete mode 100644 linux/debian/daily/compat delete mode 100644 linux/debian/daily/kivy-examples.install delete mode 100644 linux/debian/daily/kivy-tools.install delete mode 100644 linux/debian/daily/python3-kivy.install delete mode 100644 linux/debian/stable/compat delete mode 100644 linux/debian/stable/kivy-examples.install delete mode 100644 linux/debian/stable/kivy-tools.install delete mode 100644 linux/debian/stable/python3-kivy-bin.install delete mode 100644 linux/debian/stable/python3-kivy-common.install delete mode 100644 linux/debian/stable/python3-kivy.install diff --git a/linux/debian/daily/changelog b/linux/debian/daily/changelog index 11ce25f..a0419fd 100644 --- a/linux/debian/daily/changelog +++ b/linux/debian/daily/changelog @@ -1,9 +1,3 @@ -kivy (2.3.1-dev) UNRELEASED; urgency=medium - - * update to new release - - -- Mirko Galimberti Sat, 16 Nov 2024 16:19:00 +0100 - kivy (3.0.0-dev) UNRELEASED; urgency=medium * update to new release diff --git a/linux/debian/daily/compat b/linux/debian/daily/compat deleted file mode 100644 index ec63514..0000000 --- a/linux/debian/daily/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/linux/debian/daily/control b/linux/debian/daily/control index 3f466a4..c230918 100644 --- a/linux/debian/daily/control +++ b/linux/debian/daily/control @@ -3,7 +3,7 @@ Section: python Priority: optional Maintainer: Thomas-Karl Pietrowski Uploaders: Kivy Launchpad-Team -Build-Depends: debhelper (>= 7.0.50~), dh-python, pkg-config, git, +Build-Depends: debhelper-compat (= 13), dh-python, pkg-config, git, # Python development files - metapackages for python3 python3-deadsnakes-all-dev | python3-all-dev (>= 3.3), # Cython3 @@ -44,6 +44,8 @@ Build-Depends: debhelper (>= 7.0.50~), dh-python, pkg-config, git, texlive-latex-base, texlive-latex-recommended, texlive-latex-extra, texlive-fonts-extra, texlive-fonts-recommended, # Raises an ImportError if not installed python3-pygments, +# Raises an ImportError if not installed + python3-filetype, Standards-Version: 3.9.1 Homepage: http://kivy.org/ Vcs-Git: https://github.com/kivy/kivy.git @@ -85,6 +87,7 @@ Conflicts: kivy-doc-html, Depends: ${misc:Depends}, + ${sphinxdoc:Depends}, ${shlibs:Depends}, ${python:Depends}, Description: Kivy - Multimedia / Multitouch framework - documentation (html) @@ -155,6 +158,7 @@ Depends: ${misc:Depends}, ${python:Depends}, python3-docutils, python3-pygments, + python3-filetype, xclip | xsel, libsdl2-2.0-0, libsdl2-image-2.0-0, diff --git a/linux/debian/daily/kivy-examples.install b/linux/debian/daily/kivy-examples.install deleted file mode 100644 index 2a72bc2..0000000 --- a/linux/debian/daily/kivy-examples.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/kivy-examples diff --git a/linux/debian/daily/kivy-tools.install b/linux/debian/daily/kivy-tools.install deleted file mode 100644 index 545ac47..0000000 --- a/linux/debian/daily/kivy-tools.install +++ /dev/null @@ -1,7 +0,0 @@ -# moved to kivy-garden/garden -# usr/bin/garden - -# Tools -usr/lib/python3/dist-packages/kivy/tools -# Tests -usr/lib/python3/dist-packages/kivy/tests diff --git a/linux/debian/daily/python3-kivy.install b/linux/debian/daily/python3-kivy.install deleted file mode 100644 index 0273f87..0000000 --- a/linux/debian/daily/python3-kivy.install +++ /dev/null @@ -1,19 +0,0 @@ -usr/lib/python3/dist-packages/Kivy-*.egg-info -usr/lib/python3/dist-packages/kivy/*.* -usr/lib/python3/dist-packages/kivy/__pycache__ -usr/lib/python3/dist-packages/kivy/core -usr/lib/python3/dist-packages/kivy/data -usr/lib/python3/dist-packages/kivy/deps -usr/lib/python3/dist-packages/kivy/effects -usr/lib/python3/dist-packages/kivy/eventmanager -usr/lib/python3/dist-packages/kivy/extras -usr/lib/python3/dist-packages/kivy/garden -usr/lib/python3/dist-packages/kivy/graphics -usr/lib/python3/dist-packages/kivy/include -usr/lib/python3/dist-packages/kivy/input -usr/lib/python3/dist-packages/kivy/lang -usr/lib/python3/dist-packages/kivy/lib -usr/lib/python3/dist-packages/kivy/modules -usr/lib/python3/dist-packages/kivy/network -usr/lib/python3/dist-packages/kivy/storage -usr/lib/python3/dist-packages/kivy/uix diff --git a/linux/debian/daily/rules b/linux/debian/daily/rules index 0bdc2b1..15b915c 100755 --- a/linux/debian/daily/rules +++ b/linux/debian/daily/rules @@ -1,51 +1,35 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -# Uncomment this to turn on verbose mode. -export DH_VERBOSE=1 + +export PYBUILD_NAME=kivy export KIVY_NO_CONFIG=1 -export PYTHONPATH=$(CURDIR)/pypackages:$PYTHONPATH +export TMP_INSTALL_DIR=$(CURDIR)/tmp-debian-install + %: - dh $@ --with python3 + dh $@ --with python3 --buildsystem=pybuild override_dh_auto_build: - echo "Skipping any builds - doing them on install..." - -override_dh_installdocs: - rm -rf pypackages || true; - $(MAKE) clean; - mkdir pypackages; - python3 -m pip list; - python3 -m pip install $(CURDIR)/cython -t $(CURDIR)/pypackages --no-deps --upgrade || true; + # Build the package + dh_auto_build + + # Patch the documentation configuration to disable the sphinxcontrib-jquery extension patch doc/sources/conf.py < kivy-ppa-patches/disable-sphinxcontrib-jquery.patch; - python3 -m pip list; - $(MAKE) PYTHON=python3 force; - cd doc && PYTHONPATH=..:$PYTHONPATH make html; - dh_installdocs - -override_dh_auto_install: - echo "PYTHONPATH is $$PYTHONPATH" - patch pyproject.toml < kivy-ppa-patches/use-relaxed-build-time-reqs-versions.patch - for PYX in $(shell py3versions -r); do \ - rm -rf pypackages || true; \ - $(MAKE) clean; \ - mkdir pypackages; \ - $$PYX -m pip list; \ - $$PYX -m pip install $(CURDIR)/cython -t $(CURDIR)/pypackages --no-deps --upgrade; \ - $$PYX -m pip list; \ - $(MAKE) install PYTHON=$$PYX INSTALL_ROOT=$(CURDIR)/debian/tmp INSTALL_PREFIX=/usr INSTALL_LAYOUT=deb; \ - $(MAKE) install PYTHON=$$PYX-dbg INSTALL_ROOT=$(CURDIR)/debian/tmp-dbg INSTALL_PREFIX=/usr INSTALL_LAYOUT=deb || true; \ - done + + # Create a temporary installation directory + mkdir -p $(TMP_INSTALL_DIR) + + # Perform the installation step into the temporary directory + dh_auto_install --destdir=$(TMP_INSTALL_DIR) + + # Build the HTML documentation + # Set PYTHONPATH to include the installed package's dist-packages directory + + cd doc && PYTHONPATH=$$(find $(TMP_INSTALL_DIR) -type d -name dist-packages -print):$$PYTHONPATH make html + + # Clean up the temporary installation directory + rm -rf $(TMP_INSTALL_DIR) + override_dh_auto_test: #xvfb-run -s "+extension GLX" dh_auto_test - echo "! TESTS ARE TEMPORARY DISABLED !" - -override_dh_missing: - dh_missing --fail-missing --sourcedir debian/tmp + echo "! TESTS ARE TEMPORARY DISABLED !" \ No newline at end of file diff --git a/linux/debian/stable/changelog b/linux/debian/stable/changelog index 97f3a99..1e9347e 100644 --- a/linux/debian/stable/changelog +++ b/linux/debian/stable/changelog @@ -1,3 +1,9 @@ +kivy (2.3.1-0) stable; urgency=medium + + * update to new release + + -- Mirko Galimberti Thu, 26 Dec 2024 19:48:00 +0100 + kivy (2.3.0-0) stable; urgency=medium * update to new release diff --git a/linux/debian/stable/compat b/linux/debian/stable/compat deleted file mode 100644 index ec63514..0000000 --- a/linux/debian/stable/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/linux/debian/stable/control b/linux/debian/stable/control index 3f466a4..c230918 100644 --- a/linux/debian/stable/control +++ b/linux/debian/stable/control @@ -3,7 +3,7 @@ Section: python Priority: optional Maintainer: Thomas-Karl Pietrowski Uploaders: Kivy Launchpad-Team -Build-Depends: debhelper (>= 7.0.50~), dh-python, pkg-config, git, +Build-Depends: debhelper-compat (= 13), dh-python, pkg-config, git, # Python development files - metapackages for python3 python3-deadsnakes-all-dev | python3-all-dev (>= 3.3), # Cython3 @@ -44,6 +44,8 @@ Build-Depends: debhelper (>= 7.0.50~), dh-python, pkg-config, git, texlive-latex-base, texlive-latex-recommended, texlive-latex-extra, texlive-fonts-extra, texlive-fonts-recommended, # Raises an ImportError if not installed python3-pygments, +# Raises an ImportError if not installed + python3-filetype, Standards-Version: 3.9.1 Homepage: http://kivy.org/ Vcs-Git: https://github.com/kivy/kivy.git @@ -85,6 +87,7 @@ Conflicts: kivy-doc-html, Depends: ${misc:Depends}, + ${sphinxdoc:Depends}, ${shlibs:Depends}, ${python:Depends}, Description: Kivy - Multimedia / Multitouch framework - documentation (html) @@ -155,6 +158,7 @@ Depends: ${misc:Depends}, ${python:Depends}, python3-docutils, python3-pygments, + python3-filetype, xclip | xsel, libsdl2-2.0-0, libsdl2-image-2.0-0, diff --git a/linux/debian/stable/kivy-examples.install b/linux/debian/stable/kivy-examples.install deleted file mode 100644 index 2a72bc2..0000000 --- a/linux/debian/stable/kivy-examples.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/kivy-examples diff --git a/linux/debian/stable/kivy-tools.install b/linux/debian/stable/kivy-tools.install deleted file mode 100644 index 545ac47..0000000 --- a/linux/debian/stable/kivy-tools.install +++ /dev/null @@ -1,7 +0,0 @@ -# moved to kivy-garden/garden -# usr/bin/garden - -# Tools -usr/lib/python3/dist-packages/kivy/tools -# Tests -usr/lib/python3/dist-packages/kivy/tests diff --git a/linux/debian/stable/python3-kivy-bin.install b/linux/debian/stable/python3-kivy-bin.install deleted file mode 100644 index 4874c31..0000000 --- a/linux/debian/stable/python3-kivy-bin.install +++ /dev/null @@ -1,9 +0,0 @@ -usr/lib/python3/dist-packages/kivy/*.so -usr/lib/python3/dist-packages/kivy/core/clipboard/*.so -usr/lib/python3/dist-packages/kivy/graphics/*.so -usr/lib/python3/dist-packages/kivy/core/audio/*.so -usr/lib/python3/dist-packages/kivy/core/image/*.so -usr/lib/python3/dist-packages/kivy/core/text/*.so -usr/lib/python3/dist-packages/kivy/core/text/*.so -usr/lib/python3/dist-packages/kivy/core/window/*.so -usr/lib/python3/dist-packages/kivy/lib/gstplayer/*.so \ No newline at end of file diff --git a/linux/debian/stable/python3-kivy-common.install b/linux/debian/stable/python3-kivy-common.install deleted file mode 100644 index 4771703..0000000 --- a/linux/debian/stable/python3-kivy-common.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python3/dist-packages/kivy/data \ No newline at end of file diff --git a/linux/debian/stable/python3-kivy.install b/linux/debian/stable/python3-kivy.install deleted file mode 100644 index 0273f87..0000000 --- a/linux/debian/stable/python3-kivy.install +++ /dev/null @@ -1,19 +0,0 @@ -usr/lib/python3/dist-packages/Kivy-*.egg-info -usr/lib/python3/dist-packages/kivy/*.* -usr/lib/python3/dist-packages/kivy/__pycache__ -usr/lib/python3/dist-packages/kivy/core -usr/lib/python3/dist-packages/kivy/data -usr/lib/python3/dist-packages/kivy/deps -usr/lib/python3/dist-packages/kivy/effects -usr/lib/python3/dist-packages/kivy/eventmanager -usr/lib/python3/dist-packages/kivy/extras -usr/lib/python3/dist-packages/kivy/garden -usr/lib/python3/dist-packages/kivy/graphics -usr/lib/python3/dist-packages/kivy/include -usr/lib/python3/dist-packages/kivy/input -usr/lib/python3/dist-packages/kivy/lang -usr/lib/python3/dist-packages/kivy/lib -usr/lib/python3/dist-packages/kivy/modules -usr/lib/python3/dist-packages/kivy/network -usr/lib/python3/dist-packages/kivy/storage -usr/lib/python3/dist-packages/kivy/uix diff --git a/linux/debian/stable/rules b/linux/debian/stable/rules index 764e1cf..15b915c 100755 --- a/linux/debian/stable/rules +++ b/linux/debian/stable/rules @@ -1,50 +1,35 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -# Uncomment this to turn on verbose mode. -export DH_VERBOSE=1 + +export PYBUILD_NAME=kivy export KIVY_NO_CONFIG=1 -export PYTHONPATH=$(CURDIR)/pypackages:$PYTHONPATH +export TMP_INSTALL_DIR=$(CURDIR)/tmp-debian-install + %: - dh $@ --with python3 + dh $@ --with python3 --buildsystem=pybuild override_dh_auto_build: - echo "Skipping any builds - doing them on install..." - -override_dh_installdocs: - rm -rf pypackages || true; - $(MAKE) clean; - mkdir pypackages; - python3 -m pip list; - python3 -m pip install $(CURDIR)/cython -t $(CURDIR)/pypackages --no-deps --upgrade || true; + # Build the package + dh_auto_build + + # Patch the documentation configuration to disable the sphinxcontrib-jquery extension patch doc/sources/conf.py < kivy-ppa-patches/disable-sphinxcontrib-jquery.patch; - python3 -m pip list; - $(MAKE) PYTHON=python3 force; - cd doc && PYTHONPATH=..:$PYTHONPATH make html; - dh_installdocs - -override_dh_auto_install: - echo "PYTHONPATH is $$PYTHONPATH" - for PYX in $(shell py3versions -r); do \ - rm -rf pypackages || true; \ - $(MAKE) clean; \ - mkdir pypackages; \ - $$PYX -m pip list; \ - $$PYX -m pip install $(CURDIR)/cython -t $(CURDIR)/pypackages --no-deps --upgrade; \ - $$PYX -m pip list; \ - $(MAKE) install PYTHON=$$PYX INSTALL_ROOT=$(CURDIR)/debian/tmp INSTALL_PREFIX=/usr INSTALL_LAYOUT=deb; \ - $(MAKE) install PYTHON=$$PYX-dbg INSTALL_ROOT=$(CURDIR)/debian/tmp-dbg INSTALL_PREFIX=/usr INSTALL_LAYOUT=deb || true; \ - done + + # Create a temporary installation directory + mkdir -p $(TMP_INSTALL_DIR) + + # Perform the installation step into the temporary directory + dh_auto_install --destdir=$(TMP_INSTALL_DIR) + + # Build the HTML documentation + # Set PYTHONPATH to include the installed package's dist-packages directory + + cd doc && PYTHONPATH=$$(find $(TMP_INSTALL_DIR) -type d -name dist-packages -print):$$PYTHONPATH make html + + # Clean up the temporary installation directory + rm -rf $(TMP_INSTALL_DIR) + override_dh_auto_test: #xvfb-run -s "+extension GLX" dh_auto_test - echo "! TESTS ARE TEMPORARY DISABLED !" - -override_dh_missing: - dh_missing --fail-missing --sourcedir debian/tmp + echo "! TESTS ARE TEMPORARY DISABLED !" \ No newline at end of file