From 1614ee2dffab391c5aabf06a53f9c783c9a84442 Mon Sep 17 00:00:00 2001
From: Mason Hock <mason@masonhock.com>
Date: Fri, 31 May 2019 10:39:25 -0700
Subject: [PATCH] Revert "use disco instead of unmaintained ppa"
This reverts commit 5dcedc2f34ecabc963073f10ff37b84aeaa01768.
---
helpers/{make-libtoxcore => make-filteraudio} | 6 ++---
helpers/make-qtox | 6 ++---
helpers/make-toxcore | 26 +++++++++++++++++++
helpers/make-toxic | 26 +++++++++++++++++++
helpers/make-utox | 6 ++---
5 files changed, 61 insertions(+), 9 deletions(-)
rename helpers/{make-libtoxcore => make-filteraudio} (83%)
create mode 100644 helpers/make-toxcore
create mode 100644 helpers/make-toxic
diff --git a/helpers/make-libtoxcore b/helpers/make-filteraudio
similarity index 83%
rename from helpers/make-libtoxcore
rename to helpers/make-filteraudio
index b1fd0e25..6e88ad27 100644
--- a/helpers/make-libtoxcore
+++ b/helpers/make-filteraudio
@@ -16,11 +16,11 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
VERSION=1
-EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu disco main universe'
-REPOKEY=7638D0442B90D010
+EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main'
+REPOKEY=D1386E5F3FC3365C
. ./config
-changelog "Bring Tox to Trisquel from disco"
+changelog "Bring Tox to Trisquel from PPA"
compile
diff --git a/helpers/make-qtox b/helpers/make-qtox
index b1fd0e25..6e88ad27 100644
--- a/helpers/make-qtox
+++ b/helpers/make-qtox
@@ -16,11 +16,11 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
VERSION=1
-EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu disco main universe'
-REPOKEY=7638D0442B90D010
+EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main'
+REPOKEY=D1386E5F3FC3365C
. ./config
-changelog "Bring Tox to Trisquel from disco"
+changelog "Bring Tox to Trisquel from PPA"
compile
diff --git a/helpers/make-toxcore b/helpers/make-toxcore
new file mode 100644
index 00000000..646ac85d
--- /dev/null
+++ b/helpers/make-toxcore
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# Copyright (C) 2015 fr33domlover <fr33domlover@riseup.net>
+#
+# 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 3 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, see <http://www.gnu.org/licenses/>.
+
+VERSION=1
+EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main'
+REPOKEY="D1386E5F3FC3365C"
+
+. ./config
+
+changelog "Bring Tox to Trisquel from PPA"
+
+compile
diff --git a/helpers/make-toxic b/helpers/make-toxic
new file mode 100644
index 00000000..646ac85d
--- /dev/null
+++ b/helpers/make-toxic
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# Copyright (C) 2015 fr33domlover <fr33domlover@riseup.net>
+#
+# 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 3 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, see <http://www.gnu.org/licenses/>.
+
+VERSION=1
+EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main'
+REPOKEY="D1386E5F3FC3365C"
+
+. ./config
+
+changelog "Bring Tox to Trisquel from PPA"
+
+compile
diff --git a/helpers/make-utox b/helpers/make-utox
index b1fd0e25..646ac85d 100644
--- a/helpers/make-utox
+++ b/helpers/make-utox
@@ -16,11 +16,11 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
VERSION=1
-EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu disco main universe'
-REPOKEY=7638D0442B90D010
+EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main'
+REPOKEY="D1386E5F3FC3365C"
. ./config
-changelog "Bring Tox to Trisquel from disco"
+changelog "Bring Tox to Trisquel from PPA"
compile
--
GitLab