This commit is contained in:
Luis Guzmán 2021-02-05 18:56:45 +00:00 committed by Ruben Rodriguez
parent 62124d7437
commit ea95008851
4 changed files with 21 additions and 16 deletions

View file

@ -4,17 +4,17 @@
<!ENTITY keyring-filename "<filename>/usr/share/keyrings/trisquel-archive-keyring.gpg</filename>"> <!ENTITY keyring-filename "<filename>/usr/share/keyrings/trisquel-archive-keyring.gpg</filename>">
<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/trisquel-archive-removed-keys.gpg</filename>"> <!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/trisquel-archive-removed-keys.gpg</filename>">
<!ENTITY keyring-master-filename "/usr/share/keyrings/trisquel-master-keyring.gpg"> <!ENTITY keyring-master-filename "/usr/share/keyrings/trisquel-master-keyring.gpg">
<!ENTITY keyring-uri "http://archive.trisquel.info/trisquel/trisquel-archive-signkey.gpg"> <!ENTITY keyring-uri "http://archive.trisquel.org/trisquel/trisquel-archive-signkey.gpg">
<!ENTITY sourceslist-list-format "deb http://es.archive.trisquel.info/trisquel &trisquel-codename; main <!ENTITY sourceslist-list-format "deb http://es.archive.trisquel.org/trisquel &trisquel-codename; main
deb http://es.archive.trisquel.info/trisquel &trisquel-codename;-security main deb http://es.archive.trisquel.org/trisquel &trisquel-codename;-security main
deb http://es.archive.trisquel.info/trisquel &trisquel-codename;-updates main"> deb http://es.archive.trisquel.org/trisquel &trisquel-codename;-updates main">
<!ENTITY sourceslist-sources-format "Types: deb <!ENTITY sourceslist-sources-format "Types: deb
URIs: http://es.archive.trisquel.info/trisquel URIs: http://es.archive.trisquel.org/trisquel
Suites: &trisquel-codename; &trisquel-codename;-updates Suites: &trisquel-codename; &trisquel-codename;-updates
Components: main Components: main
Types: deb Types: deb
URIs: http://es.archive.trisquel.info/trisquel URIs: http://es.archive.trisquel.org/trisquel
Suites: &trisquel-codename;-security Suites: &trisquel-codename;-security
Components: main"> Components: main">

View file

@ -1,10 +1,10 @@
# See sources.list(5) manpage for more information # See sources.list(5) manpage for more information
# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. # Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool.
deb http://es.archive.trisquel.info/trisquel &trisquel-codename; main deb http://es.archive.trisquel.org/trisquel &trisquel-codename; main
deb-src http://es.archive.trisquel.info/trisquel &trisquel-codename; main deb-src http://es.archive.trisquel.org/trisquel &trisquel-codename; main
deb http://es.archive.trisquel.info/trisquel &trisquel-codename;-security main deb http://es.archive.trisquel.org/trisquel &trisquel-codename;-security main
deb-src http://es.archive.trisquel.info/trisquel &trisquel-codename;-security main deb-src http://es.archive.trisquel.org/trisquel &trisquel-codename;-security main
deb http://es.archive.trisquel.info/trisquel &trisquel-codename;-updates main deb http://es.archive.trisquel.org/trisquel &trisquel-codename;-updates main
deb-src http://es.archive.trisquel.info/trisquel &trisquel-codename;-updates main deb-src http://es.archive.trisquel.org/trisquel &trisquel-codename;-updates main

View file

@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=1 VERSION=2
COMPONENT=main COMPONENT=main
. ./config . ./config
@ -27,7 +27,7 @@ cp $DATA/trisquel vendor -a
replace ubuntu-codename trisquel-codename . replace ubuntu-codename trisquel-codename .
replace Ubuntu Trisquel . replace Ubuntu Trisquel .
replace "http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg" "http://archive.trisquel.info/trisquel/trisquel-archive-signkey.gpg" . replace "http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg" "http://archive.trisquel.org/trisquel/trisquel-archive-signkey.gpg" .
replace ubuntu-keyring trisquel-keyring . replace ubuntu-keyring trisquel-keyring .
replace ubuntu-archive-keyring trisquel-archive-keyring . replace ubuntu-archive-keyring trisquel-archive-keyring .

View file

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2015 fr33domlover <fr33domlover@riseup.net> # Copyright (C) 2015 fr33domlover <fr33domlover@riseup.net>
# Copyright (C) 2021 Luis Guzman <ark@switnet.org>
# #
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
@ -15,11 +16,15 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
VERSION=1 VERSION=2
. ./config . ./config
sed -i 's/Firefox, Chrome, Safari, or Opera/GNU IceCat, Abrowser, Epiphany, or Midori/g' src/dot.cpp sed -i 's|Firefox, Chrome, Safari, or Opera|GNU IceCat, Abrowser, Epiphany, or Midori|g' src/dotfilepatcher.cpp
sed -i 's|Firefox, Chrome, Safari, or Opera|GNU IceCat, Abrowser, Epiphany, or Midori|g' src/htmldocvisitor.cpp
sed -i 's|Firefox, Chrome, Safari, and Opera|GNU IceCat, Abrowser, Epiphany|g' src/config.xml
sed -i 's|Mozilla Firefox, Google Chrome, Safari|GNU IceCat, Abrowser, Epiphany|g' doc/starting.doc
find . -type f -exec sed -i 's|Firefox|Abrowser|g' {} +
changelog "Replace references to nonfree browsers to freedom respecting ones" changelog "Replace references to nonfree browsers to freedom respecting ones"