From d1360e4e981fc5d931b44467f01bd9302e27d725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Rodr=C3=ADguez?= <ruben@trisquel.info>
Date: Thu, 22 May 2014 00:40:23 +0200
Subject: [PATCH] Fixed keyring references in make-apt

---
 helpers/make-apt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/helpers/make-apt b/helpers/make-apt
index fff72ba6..70f1bf8a 100644
--- a/helpers/make-apt
+++ b/helpers/make-apt
@@ -17,14 +17,16 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=2
+VERSION=3
 COMPONENT=main
 
 . ./config
 
 cp $DATA/trisquel-archive.gpg share
 rm share/ubuntu-archive.gpg
+replace "http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg" "http://archive.trisquel.info/trisquel/trisquel-archive-signkey.gpg" .
 replace ubuntu-keyring trisquel-keyring .
+replace ubuntu-archive-keyring trisquel-archive-keyring .
 
 sed '/VERSION/s/ubuntu/trisquel/' -i configure
 
@@ -99,7 +101,7 @@ EOF
 ## end non-free examples
 
 
-/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*
+/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.in debian/control*
 replace Ubuntu Trisquel  methods/http.cc
 replace ubuntu-archive.gpg trisquel-archive.gpg .
 
-- 
GitLab