I've rebased a minimal patch to fix the buld errors to apply on top of the latest salsa master (d3fa496) fixing the FTBFS.
See attached patch, or forked repo at: https://github.com/duelafn/deb-kivy-873501 The new kivy (1.10) will close #873501, #774052, #799833, #849090. Is there anything else I can do to help get kivy back in the repository? Thanks, Dean Serenevy
From 33ee413f7d3b5c4eae6b181690e8dc3163835a2d Mon Sep 17 00:00:00 2001 From: Dean Serenevy <d...@serenevy.net> Date: Mon, 19 Nov 2018 10:01:06 -0500 Subject: [PATCH] Fix FTBFS ("local changes detected") --- debian/changelog | 5 ++++- ...revent-local-changes-detected-build-error.patch | 25 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 debian/patches/0001-prevent-local-changes-detected-build-error.patch create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 55edeb0..829c6d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,7 +16,10 @@ kivy (1.10.1-1) UNRELEASED; urgency=medium * d/control: Remove ancient X-Python3-Version field * Convert git repository from git-dpm to gbp layout * d/changelog: Remove trailing whitespaces - + + [ Dean Serenevy ] + * Add debian/patches/0001-prevent-local-changes-detected-build-error.patch + to fix errors building v1.10 (Closes: #873501, #774052, #799833) -- Manas Kashyap <manaskashyapt...@gmail.com> Sat, 13 Oct 2018 07:49:44 +0000 diff --git a/debian/patches/0001-prevent-local-changes-detected-build-error.patch b/debian/patches/0001-prevent-local-changes-detected-build-error.patch new file mode 100644 index 0000000..6babb67 --- /dev/null +++ b/debian/patches/0001-prevent-local-changes-detected-build-error.patch @@ -0,0 +1,25 @@ +From: Dean Serenevy <d...@serenevy.net> +Date: Mon, 19 Nov 2018 09:49:15 -0500 +Subject: prevent "local changes detected" build error + +--- + setup.py | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/setup.py b/setup.py +index 0c3e2e4..702e662 100644 +--- a/setup.py ++++ b/setup.py +@@ -65,12 +65,6 @@ def get_version(filename='kivy/version.py'): + "__date__ = '%(date)s'\n" + ) + +- with open(filename, 'w') as f: +- f.write(cnt % { +- 'version': VERSION, +- 'hash': GIT_REVISION, +- 'date': DATE +- }) + return VERSION + + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..2664ec3 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-prevent-local-changes-detected-build-error.patch -- 2.11.0
signature.asc
Description: OpenPGP digital signature