From c7130babb3ef9390bf038b6f6df8d0a5ea03937b Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 15 Oct 2020 14:54:28 +0000 Subject: [PATCH] [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#60583 X-original-commit: f31bdc0ae16698306a776332f3aa4aaa1cade764 Signed-off-by: Christophe Monniez (moc) --- .../data/account_chart_template_data.xml | 0 .../account_fiscal_position_template_data.xml | 0 addons/l10n_dz/data/account_tax_data.xml | 0 addons/l10n_ro/data/res.bank.csv | 0 .../survey/static/src/fonts/Oswald-Light.ttf | Bin debian/py3dist-overrides | 1 - debian/rules | 24 +----------------- 7 files changed, 1 insertion(+), 24 deletions(-) mode change 100755 => 100644 addons/l10n_dz/data/account_chart_template_data.xml mode change 100755 => 100644 addons/l10n_dz/data/account_fiscal_position_template_data.xml mode change 100755 => 100644 addons/l10n_dz/data/account_tax_data.xml mode change 100755 => 100644 addons/l10n_ro/data/res.bank.csv mode change 100755 => 100644 addons/survey/static/src/fonts/Oswald-Light.ttf delete mode 100644 debian/py3dist-overrides diff --git a/addons/l10n_dz/data/account_chart_template_data.xml b/addons/l10n_dz/data/account_chart_template_data.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_dz/data/account_fiscal_position_template_data.xml b/addons/l10n_dz/data/account_fiscal_position_template_data.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_dz/data/account_tax_data.xml b/addons/l10n_dz/data/account_tax_data.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_ro/data/res.bank.csv b/addons/l10n_ro/data/res.bank.csv old mode 100755 new mode 100644 diff --git a/addons/survey/static/src/fonts/Oswald-Light.ttf b/addons/survey/static/src/fonts/Oswald-Light.ttf old mode 100755 new mode 100644 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