Compare revisions

60f40500 · 60f40500 · 60f40500 · 60f40500 · 60f40500 · 60f40500
--- a/helpers/make-libkainjow-mustache
+++ b/helpers/make-libkainjow-mustache
@@ -18,13 +18,13 @@
 #

 VERSION=1
-EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
+EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main'
 REPOKEY=04EE7237B7D453EC
 BACKPORT=true
 BUILD_UNTIL=10.0

 . ./config

-changelog "Backported from debian stable as a dependency for kiwix"
+changelog "Backported from debian bullseye as a dependency for kiwix"

 compile
--- a/helpers/make-libkiwix
+++ b/helpers/make-libkiwix
@@ -18,7 +18,7 @@
 #

 VERSION=2
-EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
+EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main'
 REPOKEY=04EE7237B7D453EC
 BACKPORT=true
 BUILD_UNTIL=10.0
@@ -28,6 +28,6 @@ BUILD_UNTIL=10.0
 sed -i "/override_dh_auto_test/a #Prevent tests because of webserver failing" debian/rules
 sed -i "s|dh_auto_test --|#dh_auto_test --|" debian/rules

-changelog "Backported from debian stable as a kiwix dependency"
+changelog "Backported from debian bullseye as a kiwix dependency"

 compile
--- a/helpers/make-libphonenumber
+++ b/helpers/make-libphonenumber
@@ -18,12 +18,12 @@
 #

 VERSION=1
-EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
+EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main'
 REPOKEY=648ACFD622F3D138
 BUILD_UNTIL=10.0

 . ./config

-changelog "Backported from debian stable as part of protobuf reverse dependency"
+changelog "Backported from debian bullseye as part of protobuf reverse dependency"

 compile
--- a/helpers/make-libtgowt
+++ b/helpers/make-libtgowt
@@ -18,13 +18,13 @@
 #

 VERSION=2
-EXTERNAL='deb-src http://ftp.debian.org/debian oldstable-backports-sloppy main'
+EXTERNAL='deb-src http://ftp.debian.org/debian buster-backports-sloppy main'
 REPOKEY=648ACFD622F3D138
 BACKPORT=true
 BUILD_UNTIL=10.0

 . ./config

-changelog "Backported from debian oldstable-backports-sloppy as telegram-desktop dependency"
+changelog "Backported from debian buster-backports-sloppy as telegram-desktop dependency"

 compile
--- a/helpers/make-libtgvoip
+++ b/helpers/make-libtgvoip
@@ -18,13 +18,13 @@
 #

 VERSION=2
-EXTERNAL='deb-src http://ftp.debian.org/debian oldstable-backports main'
+EXTERNAL='deb-src http://ftp.debian.org/debian buster-backports main'
 REPOKEY=648ACFD622F3D138
 BACKPORT=true
 BUILD_UNTIL=10.0

 . ./config

-changelog "Backported from debian oldstable-backports as telegram-desktop dependency"
+changelog "Backported from debian buster-backports as telegram-desktop dependency"

 compile
--- a/helpers/make-libtorrent-rasterbar
+++ b/helpers/make-libtorrent-rasterbar
+#!/bin/sh
+#
+#    Copyright (C) 2022  Luis Guzmán <ark@switnet.org>
+#
+#    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
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+
+VERSION=1
+EXTERNAL='deb-src http://ppa.launchpad.net/deluge-team/stable/ubuntu $UPSTREAM main'
+REPOKEY="C5E6A5ED249AD24C"
+BACKPORT=true
+
+. ./config
+
+changelog "Imported to Trisquel from oficial PPA as dependency for deluge 2.x."
+
+compile
+
--- a/helpers/make-liferea
+++ b/helpers/make-liferea
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #

-VERSION=6
+VERSION=7

 . ./config

@@ -32,18 +32,18 @@ cat << EOF > opml/feedlist
 </head>
 <body>  
    <outline text="Trisquel GNU/Linux">          <!-- translate this for localized feed list -->
-      <outline text="News" htmlUrl="http://trisquel.info/" xmlUrl="http://trisquel.info/en/node/feed" />
-      <outline text="Release announcements" htmlUrl="http://trisquel.info/" xmlUrl="http://trisquel.info/en/taxonomy/term/700/0/feed" />
-      <outline text="Forum" htmlUrl="http://trisquel.info/en/forum" xmlUrl="http://trisquel.info/en/taxonomy/term/50/0/feed" />
-      <outline text="Trisquel at Reddit" htmlUrl="http://www.reddit.com/r/gnu" xmlUrl="http://www.reddit.com/r/trisquel/.rss" />
+      <outline text="News" htmlUrl="https://trisquel.info/" xmlUrl="https://trisquel.info/en/node/feed" />
+      <outline text="Release announcements" htmlUrl="https://trisquel.info/" xmlUrl="https://trisquel.info/en/taxonomy/term/700/0/feed" />
+      <outline text="Forum" htmlUrl="https://trisquel.info/en/forum" xmlUrl="https://trisquel.info/en/taxonomy/term/50/0/feed" />
+      <outline text="Trisquel at Reddit" htmlUrl="https://www.reddit.com/r/gnu" xmlUrl="https://www.reddit.com/r/trisquel/.rss" />
    </outline>
    <outline text="Free Software">          <!-- translate this for localized feed list -->
-      <outline text="What's New at GNU" htmlUrl="http://www.gnu.org/" xmlUrl="http://www.gnu.org/rss/whatsnew.rss" />
-      <outline text="FSF News" htmlUrl="http://www.fsf.org/" xmlUrl="http://static.fsf.org/fsforg/rss/news.xml" />
-      <outline text="FSF Events" htmlUrl="http://www.fsf.org/" xmlUrl="http://static.fsf.org/fsforg/rss/events.xml" />
-      <outline text="FSF Blogs" htmlUrl="http://www.fsf.org/" xmlUrl="http://static.fsf.org/fsforg/rss/blogs.xml" />
-      <outline text="fsdaily.com - Free Software News" htmlUrl="http://www.fsdaily.com/" xmlUrl="http://www.fsdaily.com/feed/published/All" />
-      <outline text="GNU at Reddit" htmlUrl="http://www.reddit.com/r/gnu" xmlUrl="http://www.reddit.com/r/gnu/.rss" />
+      <outline text="What's New at GNU" htmlUrl="https://www.gnu.org/" xmlUrl="https://www.gnu.org/rss/whatsnew.rss" />
+      <outline text="FSF News" htmlUrl="https://www.fsf.org/" xmlUrl="https://static.fsf.org/fsforg/rss/news.xml" />
+      <outline text="FSF Events" htmlUrl="https://www.fsf.org/" xmlUrl="https://static.fsf.org/fsforg/rss/events.xml" />
+      <outline text="FSF Blogs" htmlUrl="https://www.fsf.org/" xmlUrl="https://static.fsf.org/fsforg/rss/blogs.xml" />
+      <outline text="fsdaily.com - Free Software News" htmlUrl="https://www.fsdaily.com/" xmlUrl="https://www.fsdaily.com/feed/published/All" />
+      <outline text="GNU at Reddit" htmlUrl="https://www.reddit.com/r/gnu" xmlUrl="https://www.reddit.com/r/gnu/.rss" />
    </outline>

        <!-- the following search folders should also be in sync for all feed lists -->
@@ -73,18 +73,18 @@ cat << EOF > opml/feedlist_es.opml
 </head>
 <body>  
    <outline text="Trisquel GNU/Linux">          <!-- translate this for localized feed list -->
-      <outline text="Noticias" htmlUrl="http://trisquel.info/" xmlUrl="http://trisquel.info/es/node/feed" />
-      <outline text="Foro" htmlUrl="http://trisquel.info/es/forum" xmlUrl="http://trisquel.info/es/taxonomy/term/29/0/feed" />
-      <outline text="Anuncio de nuevas versiones" htmlUrl="http://trisquel.info/" xmlUrl="http://trisquel.info/en/taxonomy/term/700/0/feed" />
-      <outline text="Trisquel en Reddit" htmlUrl="http://www.reddit.com/r/gnu" xmlUrl="http://www.reddit.com/r/trisquel/.rss" />
+      <outline text="Noticias" htmlUrl="https://trisquel.info/" xmlUrl="https://trisquel.info/es/node/feed" />
+      <outline text="Foro" htmlUrl="https://trisquel.info/es/forum" xmlUrl="https://trisquel.info/es/taxonomy/term/29/0/feed" />
+      <outline text="Anuncio de nuevas versiones" htmlUrl="https://trisquel.info/" xmlUrl="https://trisquel.info/en/taxonomy/term/700/0/feed" />
+      <outline text="Trisquel en Reddit" htmlUrl="https://www.reddit.com/r/gnu" xmlUrl="https://www.reddit.com/r/trisquel/.rss" />
    </outline>
    <outline text="Free Software">          <!-- translate this for localized feed list -->
-      <outline text="What's New at GNU" htmlUrl="http://www.gnu.org/" xmlUrl="http://www.gnu.org/rss/whatsnew.rss" />
-      <outline text="FSF News" htmlUrl="http://www.fsf.org/" xmlUrl="http://static.fsf.org/fsforg/rss/news.xml" />
-      <outline text="FSF Events" htmlUrl="http://www.fsf.org/" xmlUrl="http://static.fsf.org/fsforg/rss/events.xml" />
-      <outline text="FSF Blogs" htmlUrl="http://www.fsf.org/" xmlUrl="http://static.fsf.org/fsforg/rss/blogs.xml" />
-      <outline text="fsdaily.com - Free Software News" htmlUrl="http://www.fsdaily.com/" xmlUrl="http://www.fsdaily.com/feed/published/All" />
-      <outline text="GNU en Reddit" htmlUrl="http://www.reddit.com/r/gnu" xmlUrl="http://www.reddit.com/r/gnu/.rss" />
+      <outline text="What's New at GNU" htmlUrl="https://www.gnu.org/" xmlUrl="https://www.gnu.org/rss/whatsnew.rss" />
+      <outline text="FSF News" htmlUrl="https://www.fsf.org/" xmlUrl="https://static.fsf.org/fsforg/rss/news.xml" />
+      <outline text="FSF Events" htmlUrl="https://www.fsf.org/" xmlUrl="https://static.fsf.org/fsforg/rss/events.xml" />
+      <outline text="FSF Blogs" htmlUrl="https://www.fsf.org/" xmlUrl="https://static.fsf.org/fsforg/rss/blogs.xml" />
+      <outline text="fsdaily.com - Free Software News" htmlUrl="https://www.fsdaily.com/" xmlUrl="https://www.fsdaily.com/feed/published/All" />
+      <outline text="GNU en Reddit" htmlUrl="https://www.reddit.com/r/gnu" xmlUrl="https://www.reddit.com/r/gnu/.rss" />
    </outline>

        <!-- the following search folders should also be in sync for all feed lists -->

--- a/helpers/make-linux
+++ b/helpers/make-linux
 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
-#    Copyright (C) 2008-2020  Ruben Rodriguez <ruben@trisquel.info>
+#    Copyright (C) 2008-2022  Ruben Rodriguez <ruben@trisquel.info>
 #    Copyright (C) 2019 David Trudgian <dave@trudgian.net>
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #

-VERSION=10
+VERSION=11

 . ./config

@@ -108,6 +108,10 @@ sed 's/.unsigned//' -i debian/scripts/control-create
 line=$(grep -n ')-Ubuntu' debian/rules.d/0-common-vars.mk|cut -d: -f1)
 sed $(expr $line - 1 ),$(expr $line + 1 )d debian/rules.d/0-common-vars.mk -i
 sed s/family=ubuntu/family=trisquel/ -i debian/rules.d/0-common-vars.mk
+cat << EOF > debian.master/etc/kernelconfig
+archs="amd64 i386 armhf arm64 ppc64el"
+family='trisquel'
+EOF

 rename s/ubuntu/trisquel/ debian.*/config/config.common.ubuntu


--- a/helpers/make-linux-hwe-5.13
+++ b/helpers/make-linux-hwe-5.13
 #!/bin/sh
 #
 #    Copyright (C) 2008-2022  Ruben Rodriguez <ruben@trisquel.info>
-#    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
+#    Copyright (C) 2022 Luis Guzman <ark@switnet.org>
 #    Copyright (C) 2021 Pablo Correa Gómez <ablocorrea@hotmail.com>
 #    Copyright (C) 2019 David Trudgian <dave@trudgian.net>
 #
@@ -20,7 +20,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #

-VERSION=3
+VERSION=4

 . ./config


--- a/helpers/make-network-manager-applet
+++ b/helpers/make-network-manager-applet
+#!/bin/sh
+#
+#    Copyright (C) 2022 Luis Guzman <ark@switnet.org>
+#
+#    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
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+
+VERSION=0
+
+. ./config
+
+#Remove gnome-shell and notification-daemon dependency
+sed -i 's/gnome-shell <!s390x> | //g' debian/control
+sed -i 's/notification-daemon <!s390x>/policykit-1-gnome <!s390x>/g' debian/control
+
+changelog "Remove gnome-shell and notification-daemon dependency from network-manager-gnome"
+
+compile
--- a/helpers/make-otpclient
+++ b/helpers/make-otpclient
@@ -18,13 +18,13 @@
 #

 VERSION=1
-EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
+EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main'
 REPOKEY="648ACFD622F3D138"
 BACKPORT=true
 BUILD_UNTIL=10.0

 . ./config

-changelog "Backported optclient from Debian stable into Trisquel"
+changelog "Backported optclient from Debian bullseye into Trisquel"

 compile
--- a/helpers/make-pagure
+++ b/helpers/make-pagure
@@ -18,7 +18,7 @@
 #

 VERSION=1
-EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
+EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main'
 REPOKEY=648ACFD622F3D138
 BACKPORTS=true
 DEPENDS=alembic,python-email-validator

--- a/helpers/make-protobuf
+++ b/helpers/make-protobuf
@@ -18,12 +18,12 @@
 #

 VERSION=1
-EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
+EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main'
 REPOKEY=648ACFD622F3D138
 BUILD_UNTIL=10.0

 . ./config

-changelog "Backported from debian stable"
+changelog "Backported from debian bullseye"

 compile
--- a/helpers/make-pspp
+++ b/helpers/make-pspp
@@ -19,7 +19,7 @@
 #

 VERSION=0
-EXTERNAL='deb-src http://ftp.us.debian.org/debian oldstable main'
+EXTERNAL='deb-src http://ftp.us.debian.org/debian buster main'
 REPOKEY=648ACFD622F3D138
 BUILD_UNTIL=10.0

@@ -28,6 +28,6 @@ BUILD_UNTIL=10.0
 #This helper is for nabia only
 sed -i '/texlive-generic/d' debian/control

-changelog "Backported from oldstable due to lack of packaging upstream."
+changelog "Backported from buster due to lack of packaging upstream."

 compile
--- a/helpers/make-python-apt
+++ b/helpers/make-python-apt
 #!/bin/sh
 #
-#    Copyright (C) 2008-2019 Ruben Rodriguez <ruben@trisquel.info>
+#    Copyright (C) 2008-2022 Ruben Rodriguez <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,47 +17,46 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #

-VERSION=3
+VERSION=4
 COMPONENT=main

 . ./config

 cat << EOF > data/templates/Trisquel.mirrors
 #LOC:CA
-https://mirror.freemirror.org/trisquel-packages/
-#LOC:FR
-https://archive.trisquel.info/trisquel/
-#LOC:US
-https://mirror.fsf.org/trisquel/
-http://mirrors.knoesis.org/trisquel/packages
-https://mirrors.ocf.berkeley.edu/trisquel/
-#LOC:IN
-http://in.archive.trisquel.info/trisquel/
-#LOC:EC
-https://mirror.cedia.org.ec/trisquel.packages
-#LOC:RO
-http://mirrors.serverhost.ro/trisquel/packages
+https://mirror.csclub.uwaterloo.ca/trisquel/packages/
 #LOC:CN
 https://mirrors.ustc.edu.cn/trisquel
+https://mirrors.nju.edu.cn/trisquel/
+#LOC:DE
+https://mirrors.dotsrc.org/trisquel/
+#LOC:EC
+https://mirror.cedia.org.ec/trisquel.packages
+#LOC:HU
+https://quantum-mirror.hu/mirrors/pub/trisquel/packages/
 #LOC:ES
 https://ftp.caliu.cat/pub/distribucions/trisquel/packages
 https://mirror.librelabucm.org/trisquel/
-#LOC:TW
-https://ftp.yzu.edu.tw/Linux/trisquel.packages/
 #LOC:SE
 https://mirror.linux.pizza/trisquel/packages/
 https://ftp.acc.umu.se/mirror/trisquel/packages/
-#LOC:HU
-https://quantum-mirror.hu/mirrors/pub/trisquel/packages/
+https://ftpmirror1.infania.net/mirror/trisquel/packages/
+https://mirror.operationtulip.com/trisquel/packages/
+#LOC:US
+https://archive.trisquel.info/trisquel/
+https://archive.trisquel.org/trisquel/
+https://mirror.fsf.org/trisquel/
+https://mirrors.ocf.berkeley.edu/trisquel/
+https://mirror.math.princeton.edu/pub/trisquel-packages/
 EOF

 cat << EOF > data/templates/Trisquel.info.in
-_ChangelogURI: http://packages.trisquel.info/changelogs/pool/%s/%s/%s/%s_%s/changelog
+_ChangelogURI: https://packages.trisquel.org/changelogs/pool/%s/%s/%s/%s_%s/changelog

 Suite: $CODENAME
 RepositoryType: deb
-BaseURI: https://archive.trisquel.info/trisquel/
-MatchURI: archive.trisquel.info/trisquel
+BaseURI: https://archive.trisquel.org/trisquel/
+MatchURI: archive.trisquel.org/trisquel
 MirrorsFile: Trisquel.mirrors
 _Description: Trisquel $REVISION '$CODENAME'
 Component: main
@@ -67,8 +66,8 @@ _CompDescriptionLong: Officially supported
 Suite: $CODENAME-security
 ParentSuite: $CODENAME
 RepositoryType: deb
-BaseURI: https://archive.trisquel.info/trisquel/
-MatchURI: archive.trisquel.info/trisquel
+BaseURI: https://archive.trisquel.org/trisquel/
+MatchURI: archive.trisquel.org/trisquel
 _Description: Important security updates

 Suite: $CODENAME-updates

--- a/helpers/make-python-email-validator
+++ b/helpers/make-python-email-validator
@@ -18,13 +18,13 @@
 #

 VERSION=1
-EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
+EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main'
 REPOKEY=648ACFD622F3D138
 BACKPORTS=true
 BUILD_UNTIL=10.0

 . ./config

-changelog "Backported from debian testing"
+changelog "Backported from debian bullseye"

 compile
--- a/helpers/make-rustc
+++ b/helpers/make-rustc
+#!/bin/sh
+#
+#    Copyright (C) 2022 Luis Guzmán <ark@switnet.org>
+#
+#    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
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+
+##
+# rustc 1.63+ version
+##
+
+VERSION=1
+EXTERNAL='deb-src http://ppa.launchpadcontent.net/ubuntu-mozilla-security/rust-updates/ubuntu $UPSTREAM main'
+REPOKEY=A6DCF7707EBC211F
+BACKPORTS=true
+. ./config
+
+
+changelog "Import as dependency of newer abrowser deb dependencies."
+
+compile
--- a/helpers/make-screenfetch
+++ b/helpers/make-screenfetch
+#!/bin/sh
+#
+#    Copyright (C) 2022  Luis Guzman <ark@switnet.org>
+#
+#    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
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+
+VERSION=1
+
+. ./config
+
+patch -p1 < $DATA/screenfetch_3.9.patch
+
+changelog "Adding ASC-II trisquel logo update, thanks to @LegoLeprechaun"
+
+compile
+
--- a/helpers/make-software-properties
+++ b/helpers/make-software-properties
 #!/bin/sh
 #
-#    Copyright (C) 2011-2020  Ruben Rodriguez <ruben@trisquel.info>
-#    Copyright (C) 2011  Carlos Pais <freemind@lavabit.com>
+#    Copyright (C) 2023 Luis Guzman <ark@switnet.org>
+#    Copyright (C) 2011-2022  Ruben Rodriguez <ruben@trisquel.info>
 #    Copyright (C) 2019 Mason Hock <mason@masonhock.com>
+#    Copyright (C) 2011  Carlos Pais <freemind@lavabit.com>
 #
 #    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
@@ -19,47 +20,23 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #

-VERSION=6
+VERSION=7

 . ./config

-cat << EOF | patch -p1
--- source.orig/softwareproperties/SoftwareProperties.py        2014-04-14 17:10:58.000000000 +0200
-+++ source/softwareproperties/SoftwareProperties.py     2014-05-18 03:02:05.309290804 +0200
-@@ -725,8 +725,18 @@
-     site is in whitelist or the shortcut implementer adds it.
-     """
- 
-+    codenames = {}
-+    codenames["nabia"] = "focal" 
-+    codenames["etiona"] = "bionic" 
-+    codenames["flidas"] = "xenial" 
-+    codenames["belenos"] = "trusty" 
-+    codenames["toutatis"] = "precise" 
-+    codenames["brigantia"] = "oneiric" 
-+    codenames["dagda"] = "natty"
-+    codenames["slaine"] = "maverick"
-+    codenames["taranis"] = "lucid"
-+    codenames["awen"] = "karmic" 
-+    (deb_line, file) = shortcut.expand(codename=codenames[self.distro.codename])
-    (deb_line, file) = shortcut.expand(
-        codename=self.distro.codename, distro=self.distro.id.lower())
-     deb_line = self.expand_http_line(deb_line)
-     debsrc_entry_type = 'deb-src' if enable_source_code else '# deb-src'
-     debsrc_line = debsrc_entry_type + deb_line[3:]
-EOF
-
-patch -p1 < $DATA/remove_livepatch_from_gtk_uiv1_1.patch
-patch -p1 < $DATA/disable-livepatch.patch
-patch -p0 < $DATA/remove_snap_label.patch
+#Remove logo
+rm data/ubuntu-pro-logo*.svg
+sed -i '/ubuntu-pro-logo/d' debian/software-properties-gtk.install
+
+rm softwareproperties/gtk/UbuntuProPage.py
+patch  --no-backup-if-mismatch -p0 < $DATA/remove_snap_label.patch

 #Python specific changes
-cp $DATA/trisquel_info.py softwareproperties/gtk/
-sed -i '/import softwareproperties.SoftwareProperties/a from softwareproperties.gtk.trisquel_info import trisquel_rel_desc, trisquel_eol' softwareproperties/gtk/SoftwarePropertiesGtk.py
+cp $DATA/trisquel_info.py softwareproperties/
+sed -i '/import softwareproperties.SoftwareProperties/a from softwareproperties.trisquel_info import trisquel_rel_desc, trisquel_eol' softwareproperties/gtk/SoftwarePropertiesGtk.py
 sed -i 's|eol_date = distro.eol|eol_date = trisquel_eol|' softwareproperties/gtk/SoftwarePropertiesGtk.py
 sed -i 's|eol_text = .*|eol_text = trisquel_rel_desc|' softwareproperties/gtk/SoftwarePropertiesGtk.py
 #Allow to start and remove drivers tab for qt flavor
-sed -i '/info_bar_ubuntu_pro/d' softwareproperties/gtk/SoftwarePropertiesGtk.py
 sed -i '/UbuntuDrivers/d' softwareproperties/qt/SoftwarePropertiesQt.py
 sed -i '/tab_switched(self)/i \ \ \ \ self.userinterface.tabWidget.removeTab(4)' softwareproperties/qt/SoftwarePropertiesQt.py
 sed -i '/tab_switched(self)/,/self.button_revert.setVisible(True)/{//!d}' softwareproperties/qt/SoftwarePropertiesQt.py
@@ -74,31 +51,34 @@ replace cdimage@ubuntu.com trisquel-devel@listas.trisquel.info .
 replace TrisquelDistribution UbuntuDistribution .
 sed '/NoDisplay/d; s/Trisquel/Ubuntu/' -i data/software-properties-gtk.desktop.in

-#Replace went too far
-sed -i 's|TrisquelDistroInfo|UbuntuDistroInfo|' softwareproperties/gtk/utils.py
-
-sed '/ubuntu-drivers-common/d' -i debian/control
+patch --no-backup-if-mismatch -p1 < $DATA/fix_debian_control_file.patch
 sed '/software-properties-drivers/d' -i debian/software-properties-gtk.install setup.cfg

 replace "Trisquel-Gettext" "Ubuntu-Gettext" .
-sed -i 's|UbuntuDistroInfo|TrisquelDistroInfo|g' softwareproperties/gtk/utils.py
+#sed -i 's|UbuntuDistroInfo|TrisquelDistroInfo|g' softwareproperties/gtk/utils.py

 sed '/test_suite/d' -i setup.py
 rm -rf tests

-sed '/gir1.2-snapd-1/d' -i debian/control
-sed '/self.init_livepatch/d' -i softwareproperties/gtk/SoftwarePropertiesGtk.py
-sed 's/status = self.get_status()/status = Snapd.SnapStatus.UNKNOWN/' -i softwareproperties/LivepatchSnap.py
-
 rm data/software-properties-drivers.desktop.in
 sed -i '/software-properties-drivers/d' po/POTFILES.in
+sed -i '/TrisquelProPage/d' po/POTFILES.in

 rm data/software-properties-livepatch.desktop.in
 sed -i '/software-properties-livepatch.desktop.in/d' po/POTFILES.in
 sed -i '/software-properties-livepatch.desktop.in/d' setup.cfg
 sed -i '/software-properties-livepatch.desktop/s|^|#|' debian/software-properties-gtk.install

-changelog "Removed Ubuntu-specifc tests, Livepatch, Snap"
+#Remove ProPage
+sed -i '/TrisquelProPage/d' softwareproperties/gtk/SoftwarePropertiesGtk.py
+sed -i '/init_ubuntu_pro/d' softwareproperties/gtk/SoftwarePropertiesGtk.py

-compile
+#Livepatch - aramo
+patch --no-backup-if-mismatch -p1 < $DATA/remove_ubuntu_suscription_tab.patch
+patch --no-backup-if-mismatch -p1 < $DATA/remove_proposed_updates.patch
+#Patch codename for PPAs
+patch --no-backup-if-mismatch -p1 < $DATA/fix_PPA_upstream_codename.patch

+changelog "Removed Ubuntu-specifc tests, Livepatch, Snap and fix PPA integration."
+
+compile
--- a/helpers/make-telegram-desktop
+++ b/helpers/make-telegram-desktop
@@ -18,13 +18,13 @@
 #

 VERSION=2
-EXTERNAL='deb-src http://ftp.debian.org/debian oldstable-backports-sloppy main'
+EXTERNAL='deb-src http://ftp.debian.org/debian buster-backports-sloppy main'
 REPOKEY=648ACFD622F3D138
 BACKPORT=true
 BUILD_UNTIL=10.0

 . ./config

-changelog "Backported from debian oldstable-backports-sloppy"
+changelog "Backported from debian buster-backports-sloppy"

 compile
No results found