Conflicts:
	helpers/make-firejail
	helpers/make-libsodium
	helpers/make-midori
	helpers/make-mozilla-kde-support
	helpers/make-scilab

Legimet authored 9 years ago and Ruben Rodriguez committed 8 years ago

Conflicts:
	helpers/config

Add Scilab helper

Removes/replaces non-free code using patch from upstream. Also, scilab will have to be removed from the blacklist.

See merge request !170

Conflicts:
	helpers/make-icedove

xchat is no longer a package in flidas

See merge request !153

Fix pbuilder branding

See merge request !151

 - Use sed, not sedhelper, add -i for inline editing
 - added /ubuntu to the url to replace

Santiago Rodriguez authored 9 years ago and Ruben Rodriguez committed 8 years ago

Verbatim from Legimet, avaliable at
http://listas.trisquel.info/pipermail/trisquel-devel/2014-May/000839.html