Adjust debian-reference and delete already applied patch

This commit is contained in:
Luis Guzman 2021-06-26 14:53:47 -05:00
parent 417cf656b7
commit d867cfa4ac

View file

@ -2,6 +2,7 @@
#
# Copyright (C) 2015 Andrew M. Lindley <andrew@andrewlindley.co.uk>
# Copyright (C) 2019 Mason Hock <mason@masonhock.com>
# Copyright (C) 2021 Luis Guzman <ark@switnet.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -19,10 +20,16 @@
#
# One release to rule them all :)
VERSION=2
VERSION=3
#. ./config
QUILT=skip
. ./config
echo "#Remove already applied patch"
rm debian/patches/python2.diff
echo -n > debian/patches/series
# Drop languages Trisquel modifications haven't been translated for yet
sed '/^LANGALL/s/en ja fr it pt de/en/' -i debian/rules
sed '/^\Package: debian-reference-de/,$ d' debian/control -i
@ -39,7 +46,7 @@ sed 's/previously non-free,//;/non-free/d;/sharing some commercial/,/contaminati
sed 's/, and `non-free` for binary-only drivers supported by the vendor//;/non-free/d;/Softmodem/d' -i asciidoc/09_systips.txt
sed 's/ You may need to include the `contrib` and `non-free` archives in addition to the `main` archive since some GFDL documentations are not considered to be DFSG compliant.//' -i asciidoc/12_program.txt
changelog 'Remove references to non-free repos #5950'
changelog 'Remove references to non-free repos #5950, remove already applied patch'
compile