apt helper updated for flidas

helpers/DATA/apt/trisquel/apt-vendor.ent

+<!-- 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">

helpers/DATA/apt/trisquel/sources.list.in

+# 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

helpers/make-apt

 #!/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