Skip to content

Commit f31bdc0

Browse files
committed
[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#60114 Signed-off-by: Christophe Monniez (moc) <[email protected]>
1 parent 16b2cf8 commit f31bdc0

File tree

7 files changed

+1
-24
lines changed

7 files changed

+1
-24
lines changed

addons/l10n_dz/data/account_chart_template_data.xml

100755100644
File mode changed.

addons/l10n_dz/data/account_fiscal_position_template_data.xml

100755100644
File mode changed.

addons/l10n_dz/data/account_tax_data.xml

100755100644
File mode changed.

addons/l10n_ro/data/res.bank.csv

100755100644
File mode changed.

addons/survey/static/src/fonts/Oswald-Light.ttf

100755100644
File mode changed.

debian/py3dist-overrides

-1
This file was deleted.

debian/rules

+1-23
Original file line numberDiff line numberDiff line change
@@ -13,31 +13,9 @@ override_dh_auto_build:
1313
override_dh_auto_install:
1414
dh_auto_install
1515
rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/point_of_sale/static/src/fonts/Inconsolata.otf
16-
rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/lib/fontawesome/fonts/FontAwesome.otf
17-
rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.ttf
18-
rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.eot
19-
rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.woff
20-
rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.woff2
21-
rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Black.ttf
22-
rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-BlackItalic.ttf
23-
rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Bold.ttf
24-
rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-BoldItalic.ttf
25-
rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Italic.ttf
26-
rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Light.ttf
27-
rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-LightItalic.ttf
28-
rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Medium.ttf
29-
rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-MediumItalic.ttf
30-
rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Regular.ttf
31-
rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Thin.ttf
32-
rm debian/odoo/usr/lib/python3*/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-ThinItalic.ttf
16+
for LINKTARGET in `awk '{ print $2 }' odoo.links`; do rm debian/odoo/${LINKTARGET} ; done
3317
find debian/odoo -name LICENSE.txt -exec rm {} \;
3418

35-
override_dh_fixperms:
36-
dh_fixperms
37-
chmod 644 debian/odoo/usr/lib/python3/dist-packages/odoo/addons/l10n_ro/data/res.bank.csv
38-
chmod 644 debian/odoo/usr/lib/python3/dist-packages/odoo/addons/l10n_dz/data/*.xml
39-
chmod 644 debian/odoo/usr/lib/python3/dist-packages/odoo/addons/survey/static/src/fonts/Oswald-Light.ttf
40-
4119
override_dh_auto_clean:
4220
dh_auto_clean
4321
for d in addons/* ; do rm -fr odoo/$$d ; done

0 commit comments

Comments
 (0)