summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 18:16:12 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 18:16:12 +0000
commit9ab3f731d0c7b26d094c04d44a45b62cfbd0b477 (patch)
tree3746341bff6ee568e83ef693825b8a3134aec141
parentUpdating vcs fields. (diff)
downloadgnome-initial-setup-9ab3f731d0c7b26d094c04d44a45b62cfbd0b477.tar.xz
gnome-initial-setup-9ab3f731d0c7b26d094c04d44a45b62cfbd0b477.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 dfccc5b..ec62cc1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,12 +18,9 @@ override_dh_auto_configure:
$(PARENTAL_CONTROL) \
-Dvendor-conf-file=/usr/lib/gnome-initial-setup/vendor.conf
-# Skip language chooser on Ubuntu since it doesn't work there
override_dh_install:
dh_install
-ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
dh_install debian/vendor.conf /usr/lib/gnome-initial-setup
-endif
# Depend on the appropriate package for the Welcome logo
override_dh_gencontrol:
diff --git a/debian/vendor.conf b/debian/vendor.conf
index 1e0c9e0..9081060 100644
--- a/debian/vendor.conf
+++ b/debian/vendor.conf
@@ -1,2 +1,2 @@
[pages]
-skip=language;
+skip=