From 089f1308db08ed7f972f6477219e94ca24afbd09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Rodr=C3=ADguez?= <ruben@trisquel.info> Date: Thu, 29 Aug 2013 06:38:50 +0200 Subject: [PATCH] Replaced changelogs server link to Trisquel's, fixes #9967 --- helpers/make-apt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/helpers/make-apt b/helpers/make-apt index a6b87faf..12a16ee5 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=2 +VERSION=4 COMPONENT=main . ./config @@ -30,6 +30,15 @@ replace non-free extras . replace contrib universe doc replace contrib universe po +# Ubuntu link to changelogs https://trisquel.info/en/issues/9967 +replace "http://changelogs.ubuntu.com/changelogs" "http://packages.trisquel.info/changelogs" . +sed 's!http://changelogs.ubuntu.com/changelogs!http://packages.trisquel.info/changelogs!' -i debian/apt.conf.changelog + +#Ubuntu references in the doc +#replace Ubuntu Trisquel . +#replace ubuntu-archive-keyring . +#replace ubuntu-archive-removed-keys . + cat << EOF > ./test/interactive-helper/networkless-install-fixes/sources.test.list deb http://archive.trisquel.info/trisquel/ $CODENAME main deb-src http://archive.trisquel.info/trisquel/ $CODENAME main @@ -78,7 +87,7 @@ EOF ## end non-free examples -sed -i 's_http://archive.ubuntu.com/ubuntu/project/_http://archive.trisquel.info/trisquel/_g; s/ubuntu-archive-keyring/trisquel-archive-keyring/g; s/ubuntu-keyring/trisquel-keyring/g; ' cmdline/apt-key debian/control* +/bin/sed -i 's_http://archive.ubuntu.com/ubuntu/project/_http://archive.trisquel.info/trisquel/_g; s/ubuntu-archive-keyring/trisquel-archive-keyring/g; s/ubuntu-keyring/trisquel-keyring/g; ' cmdline/apt-key debian/control* replace Ubuntu Trisquel methods/http.cc replace ubuntu-archive.gpg trisquel-archive.gpg . -- GitLab