From f31bdc0ae16698306a776332f3aa4aaa1cade764 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 15 Oct 2020 14:54:28 +0000 Subject: [IMP] packaging, l10n_dz, l10n_ro, survey: integrate Debian fix With this commit, the executions bits are fixed on some xml, csv and ttf files. The fix was initialy made at the Debian packaging level. As xlwt is now in Debian buster, the overide is removed. The linked fonts in Debian package are now removed in one line to simplify the code. closes odoo/odoo#60114 Signed-off-by: Christophe Monniez (moc) --- debian/py3dist-overrides | 1 - debian/rules | 24 +----------------------- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 debian/py3dist-overrides (limited to 'debian') diff --git a/debian/py3dist-overrides b/debian/py3dist-overrides deleted file mode 100644 index 688866a1854..00000000000 --- a/debian/py3dist-overrides +++ /dev/null @@ -1 +0,0 @@ -xlwt diff --git a/debian/rules b/debian/rules index 9b37bba6d51..dbe34b54a68 100755 --- a/debian/rules +++ b/debian/rules @@ -13,31 +13,9 @@ override_dh_auto_build: override_dh_auto_install: dh_auto_install rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/point_of_sale/static/src/fonts/Inconsolata.otf - rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/lib/fontawesome/fonts/FontAwesome.otf - rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.ttf - rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.eot - rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.woff - rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.woff2 - rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Black.ttf - rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-BlackItalic.ttf - rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Bold.ttf - rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-BoldItalic.ttf - rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Italic.ttf - rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Light.ttf - rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-LightItalic.ttf - rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Medium.ttf - rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-MediumItalic.ttf - rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Regular.ttf - rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Thin.ttf - rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-ThinItalic.ttf + for LINKTARGET in `awk '{ print $2 }' odoo.links`; do rm debian/odoo/${LINKTARGET} ; done find debian/odoo -name LICENSE.txt -exec rm {} \; -override_dh_fixperms: - dh_fixperms - chmod 644 debian/odoo/usr/lib/python3/dist-packages/odoo/addons/l10n_ro/data/res.bank.csv - chmod 644 debian/odoo/usr/lib/python3/dist-packages/odoo/addons/l10n_dz/data/*.xml - chmod 644 debian/odoo/usr/lib/python3/dist-packages/odoo/addons/survey/static/src/fonts/Oswald-Light.ttf - override_dh_auto_clean: dh_auto_clean for d in addons/* ; do rm -fr odoo/$$d ; done -- cgit v1.2.3