From 7e4bc835fa28afa285c54da29315f1da0842acad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 24 Oct 2021 20:08:02 +0200 Subject: DEB metapackages: Add desktop-base to Conflicts for other desktop configurations. Add basic processing for abort-install to postrm scripts. This resolves issue TDE/tde#67. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- debian/_base/metapackages/redmond-default-settings-ii/debian/control | 2 +- .../debian/redmond-default-settings-trinity.postrm | 3 +++ debian/_base/metapackages/redmond-default-settings/debian/control | 2 +- .../debian/redmond-default-settings-trinity.postrm | 3 +++ debian/_base/metapackages/synaptic-trinity/debian/postrm | 2 ++ ubuntu/_base/metapackages/kubuntu-default-settings/debian/control | 2 +- .../debian/kubuntu-default-settings-trinity.postrm | 3 +++ 7 files changed, 14 insertions(+), 3 deletions(-) diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/control b/debian/_base/metapackages/redmond-default-settings-ii/debian/control index 96e43f1c5..e6b2a0da2 100644 --- a/debian/_base/metapackages/redmond-default-settings-ii/debian/control +++ b/debian/_base/metapackages/redmond-default-settings-ii/debian/control @@ -206,6 +206,6 @@ Suggests: adept-trinity, tde-guidance-trinity, apport-gtk, hplip-gui -Conflicts: redmond-default-settings-trinity, kubuntu-default-settings-trinity, kubuntu-default-settings, kubuntu-settings-desktop +Conflicts: redmond-default-settings-trinity, desktop-base, desktop-base-trinity, kubuntu-default-settings-trinity, kubuntu-default-settings, kubuntu-settings-desktop Description: Redmond II default settings and artwork for the Kubuntu Trinity desktop This package includes artwork and Kubuntu branding. diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postrm b/debian/_base/metapackages/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postrm index 2cbdac854..adada03a7 100644 --- a/debian/_base/metapackages/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postrm +++ b/debian/_base/metapackages/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postrm @@ -28,6 +28,9 @@ case "$1" in upgrade) ;; + abort-install) + ;; + *) echo "Unknown argument ($1) for $0" ;; diff --git a/debian/_base/metapackages/redmond-default-settings/debian/control b/debian/_base/metapackages/redmond-default-settings/debian/control index e89dcad2f..363962817 100644 --- a/debian/_base/metapackages/redmond-default-settings/debian/control +++ b/debian/_base/metapackages/redmond-default-settings/debian/control @@ -206,6 +206,6 @@ Suggests: adept-trinity, tde-guidance-trinity, apport-gtk, hplip-gui -Conflicts: kubuntu-default-settings-trinity, kubuntu-default-settings, kubuntu-settings-desktop +Conflicts: desktop-base, desktop-base-trinity, kubuntu-default-settings-trinity, kubuntu-default-settings, kubuntu-settings-desktop Description: Redmond default settings and artwork for the Kubuntu Trinity desktop This package includes artwork and Kubuntu branding. diff --git a/debian/_base/metapackages/redmond-default-settings/debian/redmond-default-settings-trinity.postrm b/debian/_base/metapackages/redmond-default-settings/debian/redmond-default-settings-trinity.postrm index 2cbdac854..adada03a7 100644 --- a/debian/_base/metapackages/redmond-default-settings/debian/redmond-default-settings-trinity.postrm +++ b/debian/_base/metapackages/redmond-default-settings/debian/redmond-default-settings-trinity.postrm @@ -28,6 +28,9 @@ case "$1" in upgrade) ;; + abort-install) + ;; + *) echo "Unknown argument ($1) for $0" ;; diff --git a/debian/_base/metapackages/synaptic-trinity/debian/postrm b/debian/_base/metapackages/synaptic-trinity/debian/postrm index 840ae090e..b06e07e58 100644 --- a/debian/_base/metapackages/synaptic-trinity/debian/postrm +++ b/debian/_base/metapackages/synaptic-trinity/debian/postrm @@ -18,6 +18,8 @@ case "$1" in ;; upgrade) ;; + abort-install) + ;; *) echo "$0: didn't understand being called with \`$1'" 1>&2 exit 0;; esac diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/control b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/control index bae0ab8af..a67cc83c9 100644 --- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/control +++ b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.8.4 Package: kubuntu-default-settings-trinity Architecture: all Depends: crystalcursors -Conflicts: kubuntu-default-settings, kubuntu-settings-desktop +Conflicts: desktop-base, desktop-base-trinity, kubuntu-default-settings, kubuntu-settings-desktop Recommends: tdmtheme-trinity, kubuntu-tdm-themes Description: Default settings and artwork for the Ubuntu Trinity desktop This package contains the default settings used by Ubuntu [Trinity]. It also diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm index 3727a65c1..22d39ff4b 100644 --- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm +++ b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm @@ -32,6 +32,9 @@ case "$1" in upgrade) ;; + abort-install) + ;; + *) echo "Unknown argument ($1) for $0" ;; -- cgit v1.2.1