.gitignore

+*~
 repos
 jails
 logs
+PACKAGES/

CONTRIBUTING.md

+# Contributing
+
+Whether you've got a bugfix, documentation update, or new feature for us, these are the steps to follow to contribute code back into the main trisquel repo.
+
+## 1. Prerequisites
+
+
+
+ 1. Install needed packages for running the helpers
+```
+sudo apt-get install cdbs devscripts dpkg-dev git gnupg patch quilt rpl sed
+```
+
+ 1. Get the Trisquel build environment and follow the [README](https://gitlab.trisquel.org/trisquel/trisquel-builder/-/blob/master/README.md) to setup your system for building
+```
+git clone https://gitlab.trisquel.org/trisquel/trisquel-builder.git
+```
+
+
+## 2. Get the latest code from gitlab
+
+You'll need to understand a little bit about how git and gitlab work before this step (GitHub works the same way, but we like free software). In simple terms, log in [here](https://gitlab.trisquel.org/users/sign_in?redirect_to_referer=yes), visit the [trisquel/package-helpers project page](https://gitlab.trisquel.org/trisquel/package-helpers), and click the "fork" button to create your own copy of the repo.  You will push your changes to this new repo under your own git account, and we will pull changes into the main repo from there.
+
+For the sake of the rest of the examples in this guide, we're going to assume your gitlab username is "**richardtorvalds**" and you will be working with the  "**hello**" package, and use those in our examples.
+
+Now, we want to grab the latest from this newly created repository and pull it down to your local machine. Getting the latest code from your repo is simple, just clone it:
+
+```bash
+git clone https://gitlab.trisquel.org/richardtorvalds/package-helpers.git
+cd package-helpers
+```
+
+This will give you a directory called "package-helpers" on your local machine with the latest checkout from your fork of the main package-helpers repo. **Note:** this is *not* a direct reference to the main trisquel repo. When you make changes in your fork, you'll need to let us know about it so we can pull it over....but that's later in the process.
+
+## 3. Add a remote for the main package-helpers repo
+
+One thing you'll need to do to make things easier to integrate and keep up to date in your fork is to add the main repo as a remote reference. This way you can fetch the latest code from the production version and integrate it. So, here's how to set that up:
+
+```bash
+git remote add upstream https://gitlab.trisquel.org/trisquel/package-helpers.git
+git remote   (this will list out your remotes, showing the new one we added)
+```
+
+Then, when you need to pull the latest from the main trisquel repo, you just fetch and merge the master branch:
+
+```bash
+git fetch upstream
+git merge upstream/nabia
+```
+
+You can also use *git pull upstream nabia* if you want it all in one step.
+
+## 4. Making a branch for your changes
+
+When adding features or bug fixes, please create a separate branch for each changeset you want us to pull in, either with the issue number in the branch name or with an indication of what the feature is (feature, bugfix...).
+
+```bash
+git branch   (lists your current branches)
+git checkout -b bugfix-hello   (makes a new branch called bugfix-hello)
+```
+
+
+## 5. Building the source package
+
+If you want to create a new package, apache2 is a good starting point, so:
+```
+cd helpers
+cp make-apache2 make-hello
+```
+
+For importing free packages from ppa's or other sources, check [make-tor](https://gitlab.trisquel.org/trisquel/package-helpers/blob/nabia/helpers/make-tor) and update the _EXTERNAL_ , _SIGNKEY_ and _changelog_ lines  with your own values.
+
+Then, run the helper with
+```
+bash make-hello
+```
+
+If everything goes fine, you will have your new source package ready at _PACKAGES/hello/_
+
+## 6. Build and test the binary package
+
+The last step generated a source package file, so we need to build the binary one. Please make sure that you set or replace `CODENAME` and `ARCH` variables:
+```
+sbuild -v -A --dist $CODENAME --arch $ARCH PACKAGES/hello/*.dsc
+```
+
+The binary packages will be avaliable in the directory from which you ran the previous command.
+
+
+## 7. Push your code and make a pull request
+
+When you have finished making your changes, you'll need to push up your changes to your fork so we can grab them. With them all committed, push them:
+
+```bash
+git push origin bugfix-hello
+```
+
+This pushes everything in that branch up. Then you can go back to your forked package-helpers gitlab page and issue a pull request from there.  Tell us what you want us to merge and what it does/fixes, and one of us will pick it up.
+
+That lets us know that there's something new from you that needs to be pulled in. We'll review it and get back to you about it if we have any questions. Otherwise, we'll integrate it and let you know when it's in!
+
+
+Hope this guide helps you get started in contributing to the trisquel project! If you still have questions, don't hesitate to join us on IRC - we're in #trisquel-dev on libera.chat -, or send a mail to the development mailing list trisquel-devel at listas.trisquel.info.

README

-This set of scripts are helpers that modify and compile those packages coming
-from the Ubuntu upstream which need it. It might be because they contain
-non-free stuff, references to Ubuntu that need to be changed, or because we
-want the package to work our way.
-
-This helpers are similar to some of those in the gNewSense builder[1], we took
-some ideas and even some lines from them. If you plan to build an Ubuntu
-derivative of your own, we suggest you to use Builder instead of this helpers.
-1: http://www.gnewsense.org/Builder/HowToCreateourOwnGNULinuxDistribution
-
-All packages in this list are in the appropriate blacklist in the repository
-updater, so they never enter into the repo from upstream and need to be
-compiled with this helpers and pushed into reprepro. This helpers also need 
-to be run by hand -and the results tested- any time the repo watchdog warns 
-about pending updates from upstream.
-
-To add a package to the list, just copy one -make-apache2 is a good template-
-and rename it to make-sourcePackageName. To send the file back to us, or to
-include any modification into the current scripts, use "bzr diff" and send
-the output as an attachment to trisquel-devel@listas.trisquel.info. You need
-to join the mailing list to send messages to it.
-
-Some recommendations:
-
-- Take care to use the right sourcePackageName, many source packages produce
-several binary packages. "apt-cache showsrc binary-package" can help you.
-- If possible, use sed to replace chains in the upstream source without the
-need of external files or patches. If you really need to include a file, place
-it at the DATA/sourcePackageName directory
-- Do not replace *all* references to Ubuntu in the package, just those that
-would actually be shown to the user. Avoid replacing copyright statements!
-- Try to write your replacements in a way they might work in future versions
-of the upstream package. Well written regexps and sed will help with that.
-- Some of this packages require the lsb to match Trisquel values. Edit the
-/etc/lsb_release accordingly, or run the helpers in a Trisquel box.
-- You can -and maybe should- run this scripts inside a chroot.
-
-Netinstall:
-
-Included are the set of scipts used to generate the network installer images
-found in Trisquel GNU/Linux LTS (version 2.0, 4.0, 6.0... and up). The scripts
-may not be available for all versions.
-
-To generate the images, we run the following scripts:
-
-make-apt-setup
-make-base-installer
-make-choose-mirror
-make-main-menu
-make-netcfg
-make-net-retriever
-make-pkgsel
-
-Then we push the results into the Trisquel repository and run the script
-make-debian-installer to build the final images.

README.md

+## Introduction
+
+This set of scripts are helpers that modify and create the source packages coming
+from the Ubuntu upstream which need it. It might be because they contain
+non-free stuff, references to Ubuntu that need to be changed, or because we
+want the package to work our way.
+
+This helpers are similar to some of those in the [gNewSense](http://www.gnewsense.org/Builder/HowToCreateYourOwnGNULinuxDistribution) builder, we took
+some ideas and even some lines from them. If you plan to build an Ubuntu
+derivative of your own, we suggest you to use Builder instead of this helpers.
+
+Once a new package is added, it takes priority over the original one from Ubuntu,
+so they never enter into the repo from upstream and need to be
+compiled with this helpers and pushed into reprepro.
+
+To add a package to the list, follow the [CONTRIBUTING](https://gitlab.trisquel.org/trisquel/package-helpers/blob/nabia/CONTRIBUTING.md) guidelines.
+
+## Steps
+
+Those are the steps done by the helpers:
+
+1. Create local apt configuration, so you don't need to be root to run the helpers
+2. Get the ubuntu and trisquel gpg keys
+3. Get the source packages from their original repo
+4. Uncompress them
+5. Apply the changes described in the helper
+6. Re-package it, adding "triquel$VERSION" version string
+
+## Variables in helper scripts
+
+* `VERSION` (required): The trisquel version for the helper.
+* `EXTERNAL`: When building packages not coming from the upstream Ubuntu, the external `deb-src` in the same format as in `apt.sources.list`.
+* `REPOKEY`: An additional GPG key to import for the helper. Mostly only used in conjunction with `EXTERNAL`.
+* `BACKPORT(S)`: Must be set to `true` if the package is a backport.
+* `QUILT`: If `skip`, avoids patches to be automatically applied. Only set this variables if you know what you are doing.
+* `BUILD_UNTIL`: build this helper if the Trisquel REVISION number (e.g. Trisquel 10.0) is <= this number. To be used when we know that the helper will not be needed at a certain future release.
+
+## Recommendations
+
+* You don't need to use sudo in order to run those scripts, but some extra packages are needed:
+
+     `sudo apt-get install cdbs devscripts dpkg-dev git gnupg gnupg2 patch python2 quilt rename rpl sed python3-jsonschema`
+
+* Take care to use the right sourcePackageName, many source packages produce
+several binary packages. `apt-cache showsrc binary-package` can help you.
+* If possible, use sed to replace chains in the upstream source without the
+need of external files or patches. If you really need to include a file, place
+it at the `DATA/sourcePackageName` directory
+* Do not replace *all* references to Ubuntu in the package, just those that
+would actually be shown to the user. Avoid replacing copyright statements!
+* Try to write your replacements in a way they might work in future versions
+of the upstream package. Well written regexps and sed will help with that.
+* You can test your changes by doing them inside the _PACKAGES/sourcePackageName/source/_ directory,
+and running `dpkg-source -b .`, before being added to the helper script
+* You can check the status of failed build at https://jenkins.trisquel.org/job/build-watchdog/lastBuild/consoleText
+
+## Debootstrap
+On every new release we need to get compiled the very basic packages in order
+to create a trisquel base builder.
+Before that we currently relay on a upstream debootstrap image, so creating a
+trisquel debootstrap is the starting point.
+
+Every new release need the following packages taken care of first,
+
+* `make-apt`
+* `make-base-files`
+* `make-bash`
+* `make-debootstrap`
+* `make-dpkg`
+* `make-cdebconf`
+* `trisquel-keyring` (not as helper)
+* `trisquel-meta` (not as helper)
+
+## Netinstall
+
+Included are the set of scipts used to generate the network installer images
+found in Trisquel GNU/Linux LTS (version 2.0, 4.0, 6.0... and up). The scripts
+may not be available for all versions.
+
+To generate the images, we run the following scripts:
+
+* `make-apt-setup`
+* `make-base-installer`
+* `make-choose-mirror`
+* `make-main-menu`
+* `make-netcfg`
+* `make-net-retriever`
+* `make-pkgsel`
+
+Then we push the results into the Trisquel repository and run the script
+`make-debian-installer` to build the final images.

helpers/DATA/akregator/trisquel_feeds.patch

+--- src/akregator_part.cpp	2020-06-05 11:41:23.000000000 -0500
++++ src/akregator_part_trisquel.cpp	2020-06-05 12:46:05.914051386 -0500
+@@ -189,6 +189,61 @@
+     wire.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://wire.kubuntu.org/?feed=rss2"));
+     kubuntuFolder.appendChild(wire);
+ 
++// Trisquel feeds
++    QDomElement trisquelFolder = doc.createElement(QStringLiteral("outline"));
++    trisquelFolder.setAttribute(QStringLiteral("text"), QStringLiteral("Trisquel GNU/Linux"));
++    body.appendChild(trisquelFolder);
++
++    QDomElement tnews = doc.createElement(QStringLiteral("outline"));
++    tnews.setAttribute(QStringLiteral("text"), i18n("News"));
++    tnews.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://trisquel.info/en/node/feed"));
++    trisquelFolder.appendChild(tnews);
++
++    QDomElement relAnnounce = doc.createElement(QStringLiteral("outline"));
++    relAnnounce.setAttribute(QStringLiteral("text"), i18n("Release announcements"));
++    relAnnounce.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://trisquel.info/en/taxonomy/term/700/0/feed"));
++    trisquelFolder.appendChild(relAnnounce);
++
++    QDomElement enForum = doc.createElement(QStringLiteral("outline"));
++    enForum.setAttribute(QStringLiteral("text"), i18n("Forum"));
++    enForum.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://trisquel.info/en/taxonomy/term/50/0/feed"));
++    trisquelFolder.appendChild(enForum);
++
++    QDomElement tReddit = doc.createElement(QStringLiteral("outline"));
++    tReddit.setAttribute(QStringLiteral("text"), i18n("Trisquel at Reddit"));
++    tReddit.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://www.reddit.com/r/trisquel/.rss"));
++    trisquelFolder.appendChild(tReddit);
++
++// Free Software feeds
++    QDomElement fsFolder = doc.createElement(QStringLiteral("outline"));
++    fsFolder.setAttribute(QStringLiteral("text"), QStringLiteral("Free Software"));
++    body.appendChild(fsFolder);
++
++    QDomElement newGNU = doc.createElement(QStringLiteral("outline"));
++    newGNU.setAttribute(QStringLiteral("text"), i18n("What's New at GNU"));
++    newGNU.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://www.reddit.com/r/trisquel/.rss"));
++    fsFolder.appendChild(newGNU);
++
++    QDomElement fsfNews = doc.createElement(QStringLiteral("outline"));
++    fsfNews.setAttribute(QStringLiteral("text"), i18n("FSF News"));
++    fsfNews.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://static.fsf.org/fsforg/rss/news.xml"));
++    fsFolder.appendChild(fsfNews);
++
++    QDomElement fsfEvents = doc.createElement(QStringLiteral("outline"));
++    fsfEvents.setAttribute(QStringLiteral("text"), i18n("FSF Events"));
++    fsfEvents.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://static.fsf.org/fsforg/rss/events.xml"));
++    fsFolder.appendChild(fsfEvents);
++
++    QDomElement fsfBlog = doc.createElement(QStringLiteral("outline"));
++    fsfBlog.setAttribute(QStringLiteral("text"), i18n("FSF Blogs"));
++    fsfBlog.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://static.fsf.org/fsforg/rss/blogs.xml"));
++    fsFolder.appendChild(fsfBlog);
++
++    QDomElement gnuReddit = doc.createElement(QStringLiteral("outline"));
++    gnuReddit.setAttribute(QStringLiteral("text"), i18n("GNU at Reddit"));
++    gnuReddit.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://www.reddit.com/r/gnu/.rss"));
++    fsFolder.appendChild(gnuReddit);
++
+     return doc;
+ }
+ }

helpers/DATA/apache2/001_branding

-#!/bin/sh -e
-## 02_branding.dpatch by Adam Conrad <adconrad@0c3.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes apache's PLATFORM based on lsb_release output
-
-BUILD_DIST="($(lsb_release -i -s) GNU/Linux)"
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-case "$1" in
-  -patch)
-    if grep -q "${BUILD_DIST}" server/core.c 2>/dev/null; then
-      echo >&2 "`basename $0`: patch already applied"
-      exit 1
-    else
-      # This is where we get our distribution-specific server signature from:
-      sed -i -e "s:(\" PLATFORM \"):${BUILD_DIST}:" server/core.c
-    fi
-  ;;
-  -unpatch)
-    if grep -q "${BUILD_DIST}" server/core.c 2>/dev/null; then
-      sed -i -e "s:${BUILD_DIST}:(\" PLATFORM \"):" server/core.c
-    else
-      echo >&2 "`basename $0`: patch not yet applied, cannot unpatch"
-      exit 1
-    fi
-  ;;
-  *)
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-  ;;
-esac
-

helpers/DATA/apache2/index.html

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Trisquel GNU/Linux Default Page for Apache2: It works</title>
+    <style type="text/css" media="screen">
+  * {
+    margin: 0px 0px 0px 0px;
+    padding: 0px 0px 0px 0px;
+  }
+
+  body, html {
+    padding: 3px 3px 3px 3px;
+
+    background-color: #D8DBE2;
+
+    font-family: Verdana, sans-serif;
+    font-size: 11pt;
+    text-align: center;
+  }
+
+  img{
+  padding:15px;
+  }
+
+  div.main_page {
+    position: relative;
+    display: table;
+
+    width: 800px;
+
+    margin-bottom: 3px;
+    margin-left: auto;
+    margin-right: auto;
+    padding: 0px 0px 0px 0px;
+
+    border-width: 2px;
+    border-color: #212738;
+    border-style: solid;
+
+    background-color: #FFFFFF;
+
+    text-align: center;
+  }
+
+  div.page_header {
+    width: 100%;
+
+    background-color: #F5F6F7;
+  }
+
+  div.page_header span {
+    margin: 55px 0px 0px 80px;
+
+    font-size: 180%;
+    font-weight: bold;
+  }
+
+  div.page_header img {
+    margin: 3px 0px 0px 40px;
+
+    border: 0px 0px 0px;
+  }
+
+  div.table_of_contents {
+    clear: left;
+
+    min-width: 200px;
+
+    margin: 3px 3px 3px 3px;
+
+    background-color: #FFFFFF;
+
+    text-align: left;
+  }
+
+  div.table_of_contents_item {
+    clear: left;
+
+    width: 100%;
+
+    margin: 4px 0px 0px 0px;
+
+    background-color: #FFFFFF;
+
+    color: #000000;
+    text-align: left;
+  }
+
+  div.table_of_contents_item a {
+    margin: 6px 0px 0px 6px;
+  }
+
+  div.content_section {
+    margin: 3px 3px 3px 3px;
+
+    background-color: #FFFFFF;
+
+    text-align: left;
+  }
+
+  div.content_section_text {
+    padding: 4px 8px 4px 8px;
+
+    color: #000000;
+    font-size: 100%;
+  }
+
+  div.content_section_text pre {
+    margin: 8px 0px 8px 0px;
+    padding: 8px 8px 8px 8px;
+
+    border-width: 1px;
+    border-style: dotted;
+    border-color: #000000;
+
+    background-color: #F5F6F7;
+
+    font-style: italic;
+  }
+
+  div.content_section_text p {
+    margin-bottom: 6px;
+  }
+
+  div.content_section_text ul, div.content_section_text li {
+    padding: 4px 8px 4px 16px;
+  }
+
+  div.section_header {
+    padding: 3px 6px 3px 6px;
+
+    background-color: #8E9CB2;
+
+    color: #FFFFFF;
+    font-weight: bold;
+    font-size: 112%;
+    text-align: center;
+  }
+
+  div.section_header_blue {
+    background-color: #3B5996;
+  }
+
+  div.section_header_grey {
+    background-color: #9F9386;
+  }
+
+  .floating_element {
+    position: relative;
+    float: left;
+  }
+
+  div.table_of_contents_item a,
+  div.content_section_text a {
+    text-decoration: none;
+    font-weight: bold;
+  }
+
+  div.table_of_contents_item a:link,
+  div.table_of_contents_item a:visited,
+  div.table_of_contents_item a:active {
+    color: #000000;
+  }
+
+  div.table_of_contents_item a:hover {
+    background-color: #000000;
+
+    color: #FFFFFF;
+  }
+
+  div.content_section_text a:link,
+  div.content_section_text a:visited,
+   div.content_section_text a:active {
+    background-color: #DCDFE6;
+
+    color: #000000;
+  }
+
+  div.content_section_text a:hover {
+    background-color: #000000;
+
+    color: #DCDFE6;
+  }
+
+  div.validator {
+  }
+    </style>
+  </head>
+  <body>
+    <div class="main_page">
+      <div class="page_header floating_element">
+        <img src="/icons/trisquel-logo.png" alt="Trisquel Logo" class="floating_element"/>
+        <span class="floating_element">
+          Trisquel Default Page for Apache2
+        </span>
+      </div>
+<!--      <div class="table_of_contents floating_element">
+        <div class="section_header section_header_grey">
+          TABLE OF CONTENTS
+        </div>
+        <div class="table_of_contents_item floating_element">
+          <a href="#about">About</a>
+        </div>
+        <div class="table_of_contents_item floating_element">
+          <a href="#changes">Changes</a>
+        </div>
+        <div class="table_of_contents_item floating_element">
+          <a href="#scope">Scope</a>
+        </div>
+        <div class="table_of_contents_item floating_element">
+          <a href="#files">Config files</a>
+        </div>
+      </div>
+-->
+      <div class="content_section floating_element">
+
+
+        <div class="section_header section_header_blue">
+          <div id="about"></div>
+          It works!
+        </div>
+        <div class="content_section_text">
+          <p>
+                This is the default welcome page used to test the correct 
+                operation of the Apache2 server after installation on Trisquel systems.
+                It is based on the equivalent page on Debian, from which the Trisquel Apache
+                packaging is derived.
+                If you can read this page, it means that the Apache HTTP server installed at
+                this site is working properly. You should <b>replace this file</b> (located at
+                <tt>/var/www/html/index.html</tt>) before continuing to operate your HTTP server.
+          </p>
+
+
+          <p>
+                If you are a normal user of this web site and don't know what this page is
+                about, this probably means that the site is currently unavailable due to
+                maintenance.
+                If the problem persists, please contact the site's administrator.
+          </p>
+
+        </div>
+        <div class="section_header">
+          <div id="changes"></div>
+                Configuration Overview
+        </div>
+        <div class="content_section_text">
+          <p>
+                Trisquel's Apache2 default configuration is different from the
+                upstream default configuration, and split into several files optimized for
+                interaction with Trisquel tools. The configuration system is
+                <b>fully documented in
+                /usr/share/doc/apache2/README.Debian.gz</b>. Refer to this for the full
+                documentation. Documentation for the web server itself can be
+                found by accessing the <a href="/manual">manual</a> if the <tt>apache2-doc</tt>
+                package was installed on this server.
+
+          </p>
+          <p>
+                The configuration layout for an Apache2 web server installation on Trisquel systems is as follows:
+          </p>
+          <pre>
+/etc/apache2/
+|-- apache2.conf
+|       `--  ports.conf
+|-- mods-enabled
+|       |-- *.load
+|       `-- *.conf
+|-- conf-enabled
+|       `-- *.conf
+|-- sites-enabled
+|       `-- *.conf
+          </pre>
+          <ul>
+                        <li>
+                           <tt>apache2.conf</tt> is the main configuration
+                           file. It puts the pieces together by including all remaining configuration
+                           files when starting up the web server.
+                        </li>
+
+                        <li>
+                           <tt>ports.conf</tt> is always included from the
+                           main configuration file. It is used to determine the listening ports for
+                           incoming connections, and this file can be customized anytime.
+                        </li>
+
+                        <li>
+                           Configuration files in the <tt>mods-enabled/</tt>,
+                           <tt>conf-enabled/</tt> and <tt>sites-enabled/</tt> directories contain
+                           particular configuration snippets which manage modules, global configuration
+                           fragments, or virtual host configurations, respectively.
+                        </li>
+
+                        <li>
+                           They are activated by symlinking available
+                           configuration files from their respective
+                           *-available/ counterparts. These should be managed
+                           by using our helpers
+                           <tt>
+                                <a href="http://manpages.debian.org/cgi-bin/man.cgi?query=a2enmod">a2enmod</a>,
+                                <a href="http://manpages.debian.org/cgi-bin/man.cgi?query=a2dismod">a2dismod</a>,
+                           </tt>
+                           <tt>
+                                <a href="http://manpages.debian.org/cgi-bin/man.cgi?query=a2ensite">a2ensite</a>,
+                                <a href="http://manpages.debian.org/cgi-bin/man.cgi?query=a2dissite">a2dissite</a>,
+                            </tt>
+                                and
+                           <tt>
+                                <a href="http://manpages.debian.org/cgi-bin/man.cgi?query=a2enconf">a2enconf</a>,
+                                <a href="http://manpages.debian.org/cgi-bin/man.cgi?query=a2disconf">a2disconf</a>
+                           </tt>. See their respective man pages for detailed information.
+                        </li>
+
+                        <li>
+                           The binary is called apache2. Due to the use of
+                           environment variables, in the default configuration, apache2 needs to be
+                           started/stopped with <tt>/etc/init.d/apache2</tt> or <tt>apache2ctl</tt>.
+                           <b>Calling <tt>/usr/bin/apache2</tt> directly will not work</b> with the
+                           default configuration.
+                        </li>
+          </ul>
+        </div>
+
+        <div class="section_header">
+            <div id="docroot"></div>
+                Document Roots
+        </div>
+
+        <div class="content_section_text">
+            <p>
+                By default, Trisquel does not allow access through the web browser to
+                <em>any</em> file apart of those located in <tt>/var/www</tt>,
+                <a href="http://httpd.apache.org/docs/2.4/mod/mod_userdir.html">public_html</a>
+                directories (when enabled) and <tt>/usr/share</tt> (for web
+                applications). If your site is using a web document root
+                located elsewhere (such as in <tt>/srv</tt>) you may need to whitelist your
+                document root directory in <tt>/etc/apache2/apache2.conf</tt>.
+            </p>
+            <p>
+                The default Trisquel document root is <tt>/var/www/html</tt>. You
+                can make your own virtual hosts under /var/www. This is different
+                to previous releases which provides better security out of the box.
+            </p>
+        </div>
+
+
+
+
+      </div>
+    </div>
+  </body>
+</html>
+

helpers/DATA/app-install-data-ubuntu/09_app_install_entry.patch

-Index: gnome-menus-2.28.0/layout/applications.menu
-===================================================================
---- gnome-menus-2.28.0.orig/layout/applications.menu	2009-09-24 11:34:44.000000000 +0200
-+++ gnome-menus-2.28.0/layout/applications.menu	2009-09-24 11:34:44.000000000 +0200
-@@ -157,4 +157,29 @@
-     <Directory>Debian.directory</Directory>
-   </Menu>
- 
-+<Include>
-+  <Filename>gnome-app-install.desktop</Filename>
-+</Include>
-+
-+<!-- Separator between menus and gnome-app-install -->
-+<Layout>
-+  <Merge type="menus"/>
-+  <Menuname>Internet</Menuname>
-+  <Menuname>Office</Menuname>
-+  <Menuname>Education</Menuname>
-+  <Menuname>Development</Menuname>
-+  <Menuname>Graphics</Menuname>
-+  <Menuname>Multimedia</Menuname>
-+  <Menuname>Games</Menuname>
-+  <Menuname>Accessories</Menuname>
-+  <Menuname>System</Menuname>
-+  <Menuname>Universal Access</Menuname>
-+  <Menuname>Debian</Menuname>
-+  <Menuname>Other</Menuname>
-+  <Menuname>wine-wine</Menuname>
-+  <Merge type="files"/>
-+  <Separator/>
-+  <Filename>gnome-app-install.desktop</Filename>
-+</Layout>
-+
- </Menu> <!-- End Applications -->
-Index: gnome-menus-2.28.0/layout/settings.menu
-===================================================================
---- gnome-menus-2.28.0.orig/layout/settings.menu	2009-09-24 11:34:47.000000000 +0200
-+++ gnome-menus-2.28.0/layout/settings.menu	2009-09-24 11:35:22.000000000 +0200
-@@ -43,6 +43,7 @@
-       <And>
-         <Category>Settings</Category>
-         <Category>System</Category>
-+        <Not><Filename>gnome-app-install.desktop</Filename></Not>
-       </And>
-     </Include>
-   </Menu>     <!-- End System Settings -->

helpers/DATA/apparmor-profiles-extra/70aed868a4ed76d74eecf3b210ce7bf3098ffab4.patch

+From 70aed868a4ed76d74eecf3b210ce7bf3098ffab4 Mon Sep 17 00:00:00 2001
+From: Jacob K <jacobk@disroot.org>
+Date: Wed, 12 Feb 2025 12:19:24 -0600
+Subject: [PATCH] Add some lines from Atril's profile to fix the screen reader
+
+---
+ profiles/usr.bin.pidgin | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/profiles/usr.bin.pidgin b/profiles/usr.bin.pidgin
+index 5e18702..085301c 100644
+--- a/profiles/usr.bin.pidgin
++++ b/profiles/usr.bin.pidgin
+@@ -8,6 +8,7 @@
+   #include <abstractions/bash>
+   #include <abstractions/dbus-session>
+   #include <abstractions/dbus-strict>
++  #include <abstractions/dbus-accessibility>
+   #include <abstractions/dconf>
+   #include <abstractions/enchant>
+   #include <abstractions/gnome>
+@@ -82,6 +83,13 @@
+   owner @{PROC}/@{pid}/auxv r,
+   owner @{PROC}/@{pid}/fd/ r,
+ 
++  # These lines were copied from Atril's profile to make the screen reader functional
++  owner /{,var/}run/user/*/at-spi2-*/   rw,
++  owner /{,var/}run/user/*/at-spi2-*/** rw,
++  # Allow access to the non-abstract D-Bus socket used by at-spi > 2.42.0
++  #   https://gitlab.gnome.org/GNOME/at-spi2-core/-/issues/43
++  owner /{,var/}run/user/*/at-spi/bus* rw,
++
+   # Site-specific additions and overrides. See local/README for details.
+   #include <local/usr.bin.pidgin>
+ }
+-- 
+2.25.1
+

helpers/DATA/apparmor/b5a7641dd3502fcfb897d3b96e197628b674ce3c.patch

+From b5a7641dd3502fcfb897d3b96e197628b674ce3c Mon Sep 17 00:00:00 2001
+From: Adrian Heine <mail@adrianheine.de>
+Date: Mon, 23 Jan 2023 20:35:29 +0100
+Subject: [PATCH] Add pipewire client.conf to audio abstractions
+
+Fixes: https://bugs.launchpad.net/bugs/2003702
+---
+ profiles/apparmor.d/abstractions/audio | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/profiles/apparmor.d/abstractions/audio b/profiles/apparmor.d/abstractions/audio
+index 01493260d..dd783992d 100644
+--- a/profiles/apparmor.d/abstractions/audio
++++ b/profiles/apparmor.d/abstractions/audio
+@@ -85,5 +85,8 @@ owner @{HOME}/.local/share/openal/hrtf/{,**} r,
+ # wildmidi
+ /etc/wildmidi/wildmidi.cfg r,
+ 
++# pipewire
++/usr/share/pipewire/client.conf r,
++
+   # Include additions to the abstraction
+   include if exists <abstractions/audio.d>
+-- 
+GitLab
+

helpers/DATA/apt-mirror/Trisquel-mirror.list

@@ -14,14 +14,14 @@ set _tilde 0
 #
 ############# end config ##############
 
-deb http://archive.trisquel.info/trisquel @CODENAME@ main
-deb http://archive.trisquel.info/trisquel @CODENAME@-security main 
-deb http://archive.trisquel.info/trisquel @CODENAME@-updates main 
-deb http://archive.trisquel.info/trisquel @CODENAME@-backports main 
+deb http://archive.trisquel.org/trisquel @CODENAME@ main
+deb http://archive.trisquel.org/trisquel @CODENAME@-security main 
+deb http://archive.trisquel.org/trisquel @CODENAME@-updates main 
+deb http://archive.trisquel.org/trisquel @CODENAME@-backports main 
 
-deb-src http://archive.trisquel.info/trisquel @CODENAME@ main 
-deb-src http://archive.trisquel.info/trisquel @CODENAME@-security main 
-deb-src http://archive.trisquel.info/trisquel @CODENAME@-updates main 
-deb-src http://archive.trisquel.info/trisquel @CODENAME@-backports main 
+deb-src http://archive.trisquel.org/trisquel @CODENAME@ main 
+deb-src http://archive.trisquel.org/trisquel @CODENAME@-security main 
+deb-src http://archive.trisquel.org/trisquel @CODENAME@-updates main 
+deb-src http://archive.trisquel.org/trisquel @CODENAME@-backports main 
 
-clean http://archive.trisquel.info/trisquel
+clean http://archive.trisquel.org/trisquel

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.org/trisquel/trisquel-archive-signkey.gpg">
+
+<!ENTITY sourceslist-list-format "deb http://archive.trisquel.org/trisquel &trisquel-codename; main
+deb http://archive.trisquel.org/trisquel &trisquel-codename;-security main
+deb http://archive.trisquel.org/trisquel &trisquel-codename;-updates main">
+<!ENTITY sourceslist-sources-format "Types: deb
+URIs: http://archive.trisquel.org/trisquel
+Suites: &trisquel-codename; &trisquel-codename;-updates
+Components: main
+
+Types: deb
+URIs: http://archive.trisquel.org/trisquel
+Suites: &trisquel-codename;-security
+Components: main">

helpers/DATA/apt/trisquel/apt.conf-01-vendor-trisquel

+// The phased updates system from Ubuntu does not apply
+// correctly to our repositories and should be disabled.
+Update-Manager::Always-Include-Phased-Updates "True";

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://archive.trisquel.org/trisquel &trisquel-codename; main
+deb-src http://archive.trisquel.org/trisquel &trisquel-codename; main
+
+deb http://archive.trisquel.org/trisquel &trisquel-codename;-security main
+deb-src http://archive.trisquel.org/trisquel &trisquel-codename;-security main
+
+deb http://archive.trisquel.org/trisquel &trisquel-codename;-updates main
+deb-src http://archive.trisquel.org/trisquel &trisquel-codename;-updates main

helpers/DATA/arctica-greeter/org.ArcticaProject.arctica-greeter.gschema.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist gettext-domain="arctica-greeter">
+  <schema id="org.ArcticaProject.arctica-greeter" path="/org/ArcticaProject/arctica-greeter/">
+    <key name="background" type="s">
+      <default>'/usr/share/backgrounds/aramo.jpg'</default>
+      <summary>Background file to use, either an image path or a color (e.g. #772953)</summary>
+    </key>
+    <key name="background-color" type="s">
+      <default>'#000000'</default>
+      <summary>Background color (e.g. #772953), set before wallpaper is seen</summary>
+    </key>
+    <key name="togglebox-font-fgcolor" type="s">
+      <default>'#A0A0A0'</default>
+      <summary>Font foreground color (e.g. #A0A0A0) for selected session names in session list</summary>
+    </key>
+    <key name="togglebox-button-bgcolor" type="s">
+      <default>'#2F70C6'</default>
+      <summary>Font foreground color (e.g. #202020) for selected session names in session list</summary>
+    </key>
+    <key name="draw-user-backgrounds" type="b">
+      <default>true</default>
+      <summary>Whether to draw user backgrounds</summary>
+    </key>
+    <key name="draw-grid" type="b">
+      <default>false</default>
+      <summary>Whether to draw an overlay grid</summary>
+    </key>
+    <key name="show-hostname" type="b">
+      <default>true</default>
+      <summary>Whether to show the hostname in the menubar</summary>
+    </key>
+    <key name="logo" type="s">
+      <default>'/usr/share/arctica-greeter/logo.png'</default>
+      <summary>Logo file to use</summary>
+    </key>
+    <key name="theme-name" type="s">
+      <default>'Trisquel-dark'</default>
+      <summary>GTK+ theme to use</summary>
+    </key>
+    <key name="icon-theme-name" type="s">
+      <default>'trisquel'</default>
+      <summary>Icon theme to use</summary>
+    </key>
+    <key name="font-name" type="s">
+      <default>'Sans 11'</default>
+      <summary>Font to use</summary>
+    </key>
+    <key name="xft-antialias" type="b">
+      <default>true</default>
+      <summary>Whether to antialias Xft fonts</summary>
+    </key>
+    <key name="xft-dpi" type="d">
+      <default>96</default>
+      <summary>Resolution for Xft in dots per inch</summary>
+    </key>
+    <key name="xft-hintstyle" type="s">
+      <choices>
+        <choice value='hintnone'/>
+        <choice value='hintslight'/>
+        <choice value='hintmedium'/>
+        <choice value='hintfull'/>
+      </choices>
+      <default>'hintslight'</default>
+      <summary>What degree of hinting to use</summary>
+    </key>
+    <key name="xft-rgba" type="s">
+      <choices>
+        <choice value='none'/>
+        <choice value='rgb'/>
+        <choice value='bgr'/>
+        <choice value='vrgb'/>
+        <choice value='vbgr'/>
+      </choices>
+      <default>'rgb'</default>
+      <summary>Type of subpixel antialiasing</summary>
+    </key>
+    <key name="onscreen-keyboard" type="b">
+      <default>false</default>
+      <summary>Whether to enable the onscreen keyboard</summary>
+    </key>
+    <key name="high-contrast" type="b">
+      <default>false</default>
+      <summary>Whether to use a high contrast theme</summary>
+    </key>
+    <key name="screen-reader" type="b">
+      <default>false</default>
+      <summary>Whether to enable the screen reader</summary>
+    </key>
+    <key name="play-ready-sound" type="b">
+      <default>true</default>
+      <summary>Whether to play sound when greeter is ready</summary>
+    </key>
+    <key name="indicators" type="as">
+      <default>['ug-accessibility', 'org.ayatana.indicator.keyboard', 'org.ayatana.indicator.session', 'org.ayatana.indicator.datetime', 'org.ayatana.indicator.power', 'org.ayatana.indicator.sound', 'ayatana-application']</default>
+      <summary>Which indicators to load</summary>
+    </key>
+    <key name="hidden-users" type="as">
+      <default>[]</default>
+      <summary>List of usernames that are hidden until a special key combination is hit</summary>
+    </key>
+    <key name="group-filter" type="as">
+      <default>[]</default>
+      <summary>List of groups that users must be part of to be shown (empty list shows all users)</summary>
+    </key>
+    <key name="idle-timeout" type="i">
+      <default>300</default>
+      <summary>Number of seconds of inactivity before blanking the screen. Set to 0 to never timeout.</summary>
+    </key>
+    <key name="enable-hidpi" type="s">
+      <choices>
+        <choice value='on'/>
+        <choice value='off'/>
+        <choice value='auto'/>
+      </choices>
+      <default>'auto'</default>
+      <summary>Whether to enable HiDPI support</summary>
+    </key>
+    <key name="remote-service-configure-uri" type="s">
+      <default>''</default>
+      <summary>Default FQDN for host offering Remote Logon Service</summary>
+    </key>
+    <key name="activate-numlock" type="b">
+      <default>false</default>
+      <summary>Whether to activate numlock. This features requires the installation of numlockx.</summary>
+    </key>
+    <key name="only-on-monitor" type="s">
+      <default>'auto'</default>
+      <summary>Monitor on which to show the Login GUI</summary>
+    </key>
+  </schema>
+</schemalist>