Skip to content

Commit

Permalink
[IMP] packaging, l10n_dz, l10n_ro, survey: integrate Debian fix
Browse files Browse the repository at this point in the history
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#60583

X-original-commit: f31bdc0
Signed-off-by: Christophe Monniez (moc) <moc@odoo.com>
  • Loading branch information
d-fence committed Oct 23, 2020
1 parent 0e62728 commit c7130ba
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 24 deletions.
Empty file modified addons/l10n_dz/data/account_chart_template_data.xml
100755 → 100644
Empty file.
Empty file modified addons/l10n_dz/data/account_fiscal_position_template_data.xml
100755 → 100644
Empty file.
Empty file modified addons/l10n_dz/data/account_tax_data.xml
100755 → 100644
Empty file.
Empty file modified addons/l10n_ro/data/res.bank.csv
100755 → 100644
Empty file.
Empty file modified addons/survey/static/src/fonts/Oswald-Light.ttf
100755 → 100644
Empty file.
1 change: 0 additions & 1 deletion debian/py3dist-overrides

This file was deleted.

24 changes: 1 addition & 23 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit c7130ba

Please sign in to comment.