From b1310874e4cb9b81478919f8074a7ecc96a7144b Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Thu, 16 Feb 2023 02:26:06 -0600
Subject: [PATCH] ubuntu-budgie-meta, ubuntukylin-meta: remove whoopsie
dependency.
---
helpers/make-ubuntu-budgie-meta | 4 +++-
helpers/make-ubuntukylin-meta | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/helpers/make-ubuntu-budgie-meta b/helpers/make-ubuntu-budgie-meta
index e76f27c6..0975feab 100644
--- a/helpers/make-ubuntu-budgie-meta
+++ b/helpers/make-ubuntu-budgie-meta
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=3
+VERSION=4
. ./config
# Rebrand and tweak packages
@@ -29,6 +29,8 @@ sed -i '/budgie-desktop-raspi/,/it not be removed./d' debian/control
# Remove deprecated packages
grep -l ubuntu-drivers-common desktop*| xargs sed -i '/ubuntu-drivers-common/d'
grep -l snapd desktop*| xargs sed -i '/snapd/d'
+grep -l whoopsie desktop* | xargs sed -i '/whoopsie/d'
+grep -l apport desktop* | xargs sed -i '/apport/d'
grep -l ubuntu-budgie desktop*| xargs sed -i 's|ubuntu-budgie|trisquel-budgie|g'
sed -i 's|ubuntu-budgie|trisquel-budgie|' metapackage-map
diff --git a/helpers/make-ubuntukylin-meta b/helpers/make-ubuntukylin-meta
index 3890859d..ba4fc16d 100644
--- a/helpers/make-ubuntukylin-meta
+++ b/helpers/make-ubuntukylin-meta
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=4
+VERSION=5
. ./config
rm_pkg_line(){
@@ -28,6 +28,8 @@ grep -rl $1 | xargs sed -i "/$1/d"
grep -l ubuntu-drivers-common desktop* | xargs sed -i '/ubuntu-drivers-common/d'
grep -l snapd desktop* | xargs sed -i '/snapd/d'
grep -l kylin-docs desktop* | xargs sed -i '/ubuntu-kylin-docs/d'
+grep -l whoopsie desktop* | xargs sed -i '/whoopsie/d'
+grep -l apport desktop* | xargs sed -i '/apport/d'
rm_pkg_line xul-ext-ubufox
rm_pkg_line branding-ubuntu
rm_pkg_line ubuntu-advantage-tools
--
GitLab