From ea95008851e0ccc0acb262285c6500d49e391e89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org>
Date: Fri, 5 Feb 2021 18:56:45 +0000
Subject: [PATCH] Fix apt
---
helpers/DATA/apt/trisquel/apt-vendor.ent | 12 ++++++------
helpers/DATA/apt/trisquel/sources.list.in | 12 ++++++------
helpers/make-apt | 4 ++--
helpers/make-doxygen | 9 +++++++--
4 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/helpers/DATA/apt/trisquel/apt-vendor.ent b/helpers/DATA/apt/trisquel/apt-vendor.ent
index 53dbf4dd..abab8a79 100644
--- a/helpers/DATA/apt/trisquel/apt-vendor.ent
+++ b/helpers/DATA/apt/trisquel/apt-vendor.ent
@@ -4,17 +4,17 @@
<!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-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
-deb http://es.archive.trisquel.info/trisquel &trisquel-codename;-security main
-deb http://es.archive.trisquel.info/trisquel &trisquel-codename;-updates main">
+<!ENTITY sourceslist-list-format "deb http://es.archive.trisquel.org/trisquel &trisquel-codename; main
+deb http://es.archive.trisquel.org/trisquel &trisquel-codename;-security main
+deb http://es.archive.trisquel.org/trisquel &trisquel-codename;-updates main">
<!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
Components: main
Types: deb
-URIs: http://es.archive.trisquel.info/trisquel
+URIs: http://es.archive.trisquel.org/trisquel
Suites: &trisquel-codename;-security
Components: main">
diff --git a/helpers/DATA/apt/trisquel/sources.list.in b/helpers/DATA/apt/trisquel/sources.list.in
index 7b4b8dbf..5a190e8a 100644
--- a/helpers/DATA/apt/trisquel/sources.list.in
+++ b/helpers/DATA/apt/trisquel/sources.list.in
@@ -1,10 +1,10 @@
# See sources.list(5) manpage for more information
# 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-src 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.org/trisquel &trisquel-codename; main
-deb http://es.archive.trisquel.info/trisquel &trisquel-codename;-security main
-deb-src 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.org/trisquel &trisquel-codename;-security main
-deb http://es.archive.trisquel.info/trisquel &trisquel-codename;-updates main
-deb-src 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.org/trisquel &trisquel-codename;-updates main
diff --git a/helpers/make-apt b/helpers/make-apt
index 0e5350c2..b69373da 100644
--- a/helpers/make-apt
+++ b/helpers/make-apt
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=1
+VERSION=2
COMPONENT=main
. ./config
@@ -27,7 +27,7 @@ cp $DATA/trisquel vendor -a
replace ubuntu-codename trisquel-codename .
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-archive-keyring trisquel-archive-keyring .
diff --git a/helpers/make-doxygen b/helpers/make-doxygen
index bda0b017..fcd82588 100644
--- a/helpers/make-doxygen
+++ b/helpers/make-doxygen
@@ -1,6 +1,7 @@
#!/bin/sh
#
# 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
# 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
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-VERSION=1
+VERSION=2
. ./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"
--
GitLab