From 5ea3dfa5a1778e9ed92c708f9230c17ec66990ff Mon Sep 17 00:00:00 2001
From: Ruben Rodriguez <ruben@trisquel.info>
Date: Sun, 28 Feb 2016 14:47:42 -0600
Subject: [PATCH] apt helper updated for flidas

---
 helpers/DATA/apt/trisquel/apt-vendor.ent      | 20 ++++++++++++++++++
 .../apt/trisquel/apt.conf-01-vendor-trisquel  |  0
 helpers/DATA/apt/trisquel/sources.list.in     | 10 +++++++++
 helpers/make-apt                              | 21 ++++++++-----------
 4 files changed, 39 insertions(+), 12 deletions(-)
 create mode 100644 helpers/DATA/apt/trisquel/apt-vendor.ent
 create mode 100644 helpers/DATA/apt/trisquel/apt.conf-01-vendor-trisquel
 create mode 100644 helpers/DATA/apt/trisquel/sources.list.in

diff --git a/helpers/DATA/apt/trisquel/apt-vendor.ent b/helpers/DATA/apt/trisquel/apt-vendor.ent
new file mode 100644
index 000000000..53dbf4dda
--- /dev/null
+++ b/helpers/DATA/apt/trisquel/apt-vendor.ent
@@ -0,0 +1,20 @@
+<!-- details about the keys used by the distribution -->
+<!ENTITY keyring-distro "Trisquel">
+<!ENTITY keyring-package "<package>trisquel-keyring</package>">
+<!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 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-sources-format "Types: deb
+URIs: http://es.archive.trisquel.info/trisquel
+Suites: &trisquel-codename; &trisquel-codename;-updates
+Components: main
+
+Types: deb
+URIs: http://es.archive.trisquel.info/trisquel
+Suites: &trisquel-codename;-security
+Components: main">
diff --git a/helpers/DATA/apt/trisquel/apt.conf-01-vendor-trisquel b/helpers/DATA/apt/trisquel/apt.conf-01-vendor-trisquel
new file mode 100644
index 000000000..e69de29bb
diff --git a/helpers/DATA/apt/trisquel/sources.list.in b/helpers/DATA/apt/trisquel/sources.list.in
new file mode 100644
index 000000000..7b4b8dbff
--- /dev/null
+++ b/helpers/DATA/apt/trisquel/sources.list.in
@@ -0,0 +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.info/trisquel &trisquel-codename;-security main
+deb-src http://es.archive.trisquel.info/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
diff --git a/helpers/make-apt b/helpers/make-apt
index 70f1bf8ac..2acfbd34a 100644
--- a/helpers/make-apt
+++ b/helpers/make-apt
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#    Copyright (C) 2008-2010  Rubén Rodríguez <ruben@trisquel.info>
+#    Copyright (C) 2008-2016  Rubén Rodríguez <ruben@trisquel.info>
 #
 #    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
@@ -17,19 +17,20 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=3
+VERSION=1
 COMPONENT=main
 
 . ./config
 
-cp $DATA/trisquel-archive.gpg share
-rm share/ubuntu-archive.gpg
+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 ubuntu-keyring trisquel-keyring .
 replace ubuntu-archive-keyring trisquel-archive-keyring .
 
-sed '/VERSION/s/ubuntu/trisquel/' -i configure
-
 # remove non-free examples https://trisquel.info/en/issues/5518
 sed '/non-free/d' -i ./test/integration/Packages-ubuntu-bug-614993 ./test/integration/status-ubuntu-bug-614993
 replace "contrib main non-free" main .
@@ -46,12 +47,8 @@ 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" .
-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 .
+replace changelogs.ubuntu.com packages.trisquel.info .
+replace ubuntu.com/changelogs trisquel.info/changelogs .
 
 cat << EOF > ./test/interactive-helper/networkless-install-fixes/sources.test.list
 deb http://archive.trisquel.info/trisquel/ $CODENAME main
-- 
GitLab