From dfef8e3dc662ca53a7675a1f16113f4ad4704911 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 19:58:08 +0200 Subject: Making org.gnome.software gsettings overrides derivatives friendlier. Signed-off-by: Daniel Baumann --- debian/gnome-software.gsettings-override.in | 2 +- debian/rules | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/gnome-software.gsettings-override.in b/debian/gnome-software.gsettings-override.in index f6ee4a0..3f5d025 100644 --- a/debian/gnome-software.gsettings-override.in +++ b/debian/gnome-software.gsettings-override.in @@ -1,4 +1,4 @@ [org.gnome.software] -official-repos=['@DISTRO@-*'] +official-repos=[@OFFICIAL_REPOS@] free-repos=[@FREE_REPOS@] free-repos-url='@URL@' diff --git a/debian/rules b/debian/rules index 743d5b8..980cae4 100755 --- a/debian/rules +++ b/debian/rules @@ -39,6 +39,7 @@ ifeq ($(DEB_HOST_ARCH_OS), linux) endif DISTRO_ID = debian +OFFICIAL_REPOS = \'@DISTRO@-*\' FREE_REPOS = \'@DISTRO@-*-main\' FREE_URL = https:\/\/www.debian.org\/social_contract\#guidelines ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes)) @@ -58,7 +59,7 @@ override_dh_auto_configure: dh_auto_configure -- $(GS_CONFIGURE_FLAGS) override_dh_installgsettings: - sed "s#@FREE_REPOS@#$(FREE_REPOS)#g" debian/gnome-software.gsettings-override.in > debian/gnome-software.gsettings-override + sed -e "s#@OFFICIAL_REPOS@#$(OFFICIAL_REPOS)#g" -e "s#@FREE_REPOS@#$(FREE_REPOS)#g" debian/gnome-software.gsettings-override.in > debian/gnome-software.gsettings-override sed -i "s/@DISTRO@/$(DISTRO_ID)/g" debian/gnome-software.gsettings-override sed -i "s/@URL@/$(FREE_URL)/g" debian/gnome-software.gsettings-override dh_installgsettings -- cgit v1.2.3