summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2023-10-31 16:48:09 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2023-10-31 16:48:09 +0000
commitbeb3f02cc1f556e302183eb390436c1726b81588 (patch)
tree3a67981fe076248deb2b67ee24b71bfe6d3fc9c5
parentUpdating vcs fields. (diff)
downloadgnome-initial-setup-beb3f02cc1f556e302183eb390436c1726b81588.tar.xz
gnome-initial-setup-beb3f02cc1f556e302183eb390436c1726b81588.zip
Enabling inclusion of vendor.conf.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rwxr-xr-xdebian/rules3
-rw-r--r--debian/vendor.conf2
2 files changed, 1 insertions, 4 deletions
diff --git a/debian/rules b/debian/rules
index 939d03e..4800753 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,11 +22,8 @@ override_dh_auto_configure:
-Dauto_features=enabled \
$(PARENTAL_CONTROL)
-# Skip language chooser on Ubuntu since it doesn't work there
-ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
execute_after_dh_install:
dh_install debian/vendor.conf /usr/share/gnome-initial-setup/
-endif
# Depend on the appropriate package for the Welcome logo
# And don't add malcontent Recommends in Ubuntu
diff --git a/debian/vendor.conf b/debian/vendor.conf
index 690909e..9081060 100644
--- a/debian/vendor.conf
+++ b/debian/vendor.conf
@@ -1,2 +1,2 @@
[pages]
-skip=language
+skip=