diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2021-10-24 20:08:02 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-10-24 20:13:32 +0200 |
| commit | ae6fdea3336ec22bd7e81d249c1823b02f15dddf (patch) | |
| tree | 28f2f591412334c79a614dee06545debf20f0576 /debian | |
| parent | 7e60a86b49820eefbedee7c578fee26704563143 (diff) | |
| download | tde-packaging-ae6fdea3336ec22bd7e81d249c1823b02f15dddf.tar.gz tde-packaging-ae6fdea3336ec22bd7e81d249c1823b02f15dddf.zip | |
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.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 7e4bc835fa28afa285c54da29315f1da0842acad)
Diffstat (limited to 'debian')
5 files changed, 10 insertions, 2 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 |