From 2a68273ffa10ad9151c3cca8c48c745edb76d43b Mon Sep 17 00:00:00 2001
From: Luis Guzman <ark@switnet.org>
Date: Sun, 31 Oct 2021 01:39:45 -0500
Subject: [PATCH] Migrate sugar to impish as fix on trisquel-sugar
---
helpers/make-sugar | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/helpers/make-sugar b/helpers/make-sugar
index 1798a140..f7a90cb9 100644
--- a/helpers/make-sugar
+++ b/helpers/make-sugar
@@ -18,16 +18,16 @@
#
VERSION=2
-EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu groovy main universe'
+EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu impish main universe'
REPOKEY="871920D1991BC93C"
. ./config
-patch -p1 < $DATA/git-20201017.patch
-
sed '/ImageViewerActivity/d;/sugar.Jukebox/d;/sugar.ReadActivity/d' -i data/activities.hidden
+#Replace upstream dependencies with trisquel sugar-activities
+sed '/sucrose/,/\${cdbs:Depends}/s|\${cdbs:Depends}|sugar-honey|' -i debian/control
-changelog "Backported from groovy"
+changelog "Backported from impish for trisquel-sugar"
compile
--
GitLab