Commit e540c3ff authored by Ruben Rodriguez's avatar Ruben Rodriguez

Tuned up helpers for apt, dpkg, newt and tasksel

parent 7c493788
......@@ -17,18 +17,30 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=1
VERSION=2
COMPONENT=main
. ./config
cp $DATA/trisquel-archive.gpg share
rm share/ubuntu-archive.gpg
replace ubuntu-keyring trisquel-keyring .
sed '/VERSION/s/ubuntu/trisquel/' -i configure
# remove non-free examples https://trisquel.info/en/issues/5518
replace "contrib non-free" extras .
replace non-free extras .
sed '/non-free/d' -i ./test/integration/Packages-ubuntu-bug-614993 ./test/integration/status-ubuntu-bug-614993
replace "contrib main non-free" main .
replace "contrib non-free" main .
replace "main contrib non-free" main .
replace "contrib main" main .
replace "contrib" main test
sed "s/'main', 'contrib', 'non-free'/'main'/" -i ./dselect/setup
replace contrib universe doc
replace contrib universe po
replace non-free main .
# Ubuntu link to changelogs https://trisquel.info/en/issues/9967
replace "http://changelogs.ubuntu.com/changelogs" "http://packages.trisquel.info/changelogs" .
......
......@@ -18,12 +18,12 @@
#
VERSION=1
FAKEROOT=true
#FAKEROOT=true
COMPONENT=main
. ./config
sed '/x86_64-linux-gnu/,/endif/ d' debian/rules -i
#sed '/x86_64-linux-gnu/,/endif/ d' debian/rules -i
cat << EOF > scripts/t/origins/trisquel
Vendor: Trisquel
......@@ -59,7 +59,7 @@ EOF
cp $DATA/Trisquel.pm scripts/Dpkg/Vendor/Trisquel.pm
changelog "Multiarch disabled by default"
changelog "Compiled for Trisquel"
compile
......@@ -17,22 +17,17 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=1
QUILT=skip
VERSION=2
NETINST=true
. ./config
cat << EOF > debian/libnewt0.52.postinst
#!/bin/sh
set -e
#DEBHELPER#
rm debian/palette.ubuntu
cat << EOF > debian/palette.trisquel
white,blue,black,lightgray,black,lightgray,white,black,red,lightgray,lightgray,red,red,lightgray,lightgray,blue,lightgray,red,lightgray,blue,blue,lightgray,black,lightgray,lightgray,blue,black,lightgray,lightgray,red,white,blue,lightgray,blue,blue,red,blue,lightgray,black,lightgray,lightgray,red,black,brown
EOF
rm debian/patches/801_configurable-palette.patch
sed /palette/d -i debian/libnewt0.52.install
rm debian/palette*
sed 's/ubuntu/trisquel/' -i ./debian/libnewt0.52.install ./debian/libnewt0.52.postinst
changelog "Color palette set back to default"
......
......@@ -24,8 +24,13 @@ COMPONENT=main
mkdir trisquel-tasks
cp $DATA/* trisquel-tasks
sed s/mythbuntu/trisquel-pro/g Makefile -i
sed s/lubuntu/trisquel-sugar/g Makefile -i
sed s/xubuntu/trisquel-mini/g Makefile -i
sed s/edubuntu/trisquel-edu/g Makefile -i
sed s/kubuntu/triskel/g Makefile -i
sed s/ubuntu/trisquel/g Makefile -i
sed s/$UPSTREAM/$CODENAME/g Makefile -i
sed "/USUITE/s/.*/USUITE=$CODENAME/" Makefile -i
sed 's/\(UFLAVOURS=\).*/\1trisquel-desktop triskel trisquel-mini trisquel-sugar trisquel-edu trisquel-pro trisquel-console/' Makefile -i
changelog "Added Trisquel's tasks"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment