From e4b5238fa63c79d2979c01b6cc314008189ce45a Mon Sep 17 00:00:00 2001 From: Ark74 <ark@switnet.org> Date: Fri, 25 Nov 2022 05:32:23 -0600 Subject: [PATCH] ubuntukylin-meta: add preference to kylin-desktop over ubuntukylin-desktop --- helpers/make-ubuntukylin-meta | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helpers/make-ubuntukylin-meta b/helpers/make-ubuntukylin-meta index 8f29ae6f..c7ccd375 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=2 +VERSION=3 . ./config rm_pkg_line(){ @@ -39,6 +39,7 @@ rm_pkg_line ubuntu-settings #Rename package and fix map. sed -i "/^Package:/s|ubuntukylin-desktop$|kylin-desktop|" debian/control sed -i "s|ubuntukylin-|kylin-|g" metapackage-map +sed -i "/^Recommends:/a Provides: ubuntukylin-desktop\nConflicts: ubuntukylin-desktop (<= 0.46+11.0trisquel1)" debian/control # Rebrand and tweak packages sed -i 's|Ubuntu|Trisquel|g' debian/control -- GitLab