🚀 Debian package: python-django-ishtar - remove static files packaged in Debian - fix some package error

6 files changed, 44 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 66eeea43e..2cf0ac16d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+python-django-ishtar (4.0.63-3) UNRELEASED; urgency=low
+
+  * Fix font path - bis.
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 8 Nov 2023 17:57:00 +0200
+
+python-django-ishtar (4.0.63-2) UNRELEASED; urgency=low
+
+  * Fix font path.
+
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 8 Nov 2023 17:50:00 +0200
+
 python-django-ishtar (4.0.63-1) UNRELEASED; urgency=low
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index b986b2fe6..1d81fe2ab 100644
--- a/debian/control
+++ b/debian/control
@@ -50,6 +50,8 @@ Depends: ${misc:Depends},
  graphviz,
  poppler-utils,
  pandoc,
+ fonts-sil-gentiumplus,
+ fonts-fork-awesome,
  weasyprint
 Recommends:
  postgresql,
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
new file mode 100644
index 000000000..7d19a52d5
--- /dev/null
+++ b/debian/lintian-overrides
@@ -0,0 +1,13 @@
+# we're punk we use srv
+python3-django-ishtar: dir-or-file-in-srv
+# link to existing packages
+python3-django-ishtar: breakout-link usr/lib/python3/dist-packages/ishtar_common/static/*
+# own bootstrap version
+python3-django-ishtar: embedded-javascript-library usr/lib/python3/dist-packages/ishtar_common/static/bootstrap/*
+# excanvas included in jqplot
+python3-django-ishtar: embedded-javascript-library usr/lib/python3/dist-packages/ishtar_common/static/js/jqplot/excanvas*
+# own jquery and jquery-ui version
+python3-django-ishtar: embedded-javascript-library usr/lib/python3/dist-packages/ishtar_common/static/js/jquery.*
+python3-django-ishtar: embedded-javascript-library usr/lib/python3/dist-packages/ishtar_common/static/js/jquery-ui/*
+# bad encoding used for failed test
+python3-django-ishtar: national-encoding usr/lib/python3/dist-packages/archaeological_operations/tests/MCC-operations-example-bad-encoding.csv
diff --git a/debian/python3-django-ishtar.links b/debian/python3-django-ishtar.links
index 0dc44a33e..41e72a876 100644
--- a/debian/python3-django-ishtar.links
+++ b/debian/python3-django-ishtar.links
@@ -5,3 +5,11 @@ usr/share/python3-django-ishtar/locale srv/ishtar/locale
 usr/share/python3-django-ishtar/example_project srv/ishtar/example_project
 usr/share/python3-django-ishtar/install srv/ishtar/install
 usr/share/python3-django-ishtar/install/extra_settings.py etc/ishtar/extra_settings.py
+usr/share/fonts/truetype/gentiumplus/GentiumPlus-I.ttf usr/lib/python3/dist-packages/ishtar_common/static/gentium/GentiumPlus-I.ttf
+usr/share/fonts/truetype/gentiumplus/GentiumPlus-R.ttf usr/lib/python3/dist-packages/ishtar_common/static/gentium/GentiumPlus-R.ttf
+usr/share/fonts-fork-awesome/css/fork-awesome.css usr/lib/python3/dist-packages/ishtar_common/static/fork-awesome/css/fork-awesome.min.css
+usr/share/fonts/eot/fork-awesome/forkawesome-webfont.eot usr/lib/python3/dist-packages/ishtar_common/static/fork-awesome/fonts/forkawesome-webfont.eot
+usr/share/fonts/svg/fork-awesome/forkawesome-webfont.svg usr/lib/python3/dist-packages/ishtar_common/static/fork-awesome/fonts/forkawesome-webfont.svg
+usr/share/fonts/truetype/fork-awesome/forkawesome-webfont.ttf usr/lib/python3/dist-packages/ishtar_common/static/fork-awesome/fonts/forkawesome-webfont.ttf
+usr/share/fonts/woff/fork-awesome/forkawesome-webfont.woff usr/lib/python3/dist-packages/ishtar_common/static/fork-awesome/fonts/forkawesome-webfont.woff
+usr/share/fonts/woff/fork-awesome/forkawesome-webfont.woff2 usr/lib/python3/dist-packages/ishtar_common/static/fork-awesome/fonts/forkawesome-webfont.woff2
diff --git a/debian/rules b/debian/rules
index 9956da312..d7f00740a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,9 @@ override_dh_auto_install:
 	touch debian/tmp/etc/ishtar/instances
 	mkdir -p debian/tmp/srv/ishtar
 	touch debian/tmp/srv/ishtar/__init__.py
+	mkdir -p debian/tmp/usr/lib/python3/dist-packages/ishtar_common/static/gentium
+	mkdir -p debian/tmp/usr/lib/python3/dist-packages/ishtar_common/static/fork-awesome/css
+	mkdir -p debian/tmp/usr/lib/python3/dist-packages/ishtar_common/static/fork-awesome/fonts
 
 override_dh_auto_test:
 	# create test databases and default database to allow setup
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 000000000..c386b3d00
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,6 @@
+# minimized translations
+python-django-ishtar: source-is-missing bootstrap_datepicker/static/js/locales/*
+# sozi files - the attached svg is the source
+python-django-ishtar: source-is-missing docs/fr/source/media-src/*
+# minimized translations and real js source not provided but with the link to the upstream source
+python-django-ishtar: source-is-missing ishtar_common/static/*