Commit 9c10bf14 authored by Jeremy Bicha's avatar Jeremy Bicha Committed by Jonas Smedegaard

Import Debian changes 3.26.0-2

gnome-initial-setup (3.26.0-2) unstable; urgency=medium

  * Lower dependency on gdm3 to Suggests.
  * Update Vcs fields for conversion to git
  * Add debian/gbp.conf
  * Bump Standards-Version to 4.1.2
  * Bump debhelper compat to 11
  * Disable the Software Sources page since there is no obvious easy way
    to change this setting later
parent b78fa073
gnome-initial-setup (3.26.0-1pureos1) green; urgency=medium
* Fork for PureOS:
+ Set dev@puri.sm as maintainer, prefixing original XSBC-Original-.
+ Set myself as uploader, dropping original.
* Build without software sources enabled (there is nothing non-free in
PureOS).
Stop build-depend on libpackagekit-glib2-dev.
Closes: PureOS:T246.
* Add patch to have localed set and rebuild locale.gen stuff (hack -
needs better solution later).
Closes: PureOS:T245.
-- Jonas Smedegaard <jonas.smedegaard@puri.sm> Fri, 10 Nov 2017 03:42:10 +0100
gnome-initial-setup (3.26.0-2) unstable; urgency=medium
* Lower dependency on gdm3 to Suggests.
* Update Vcs fields for conversion to git
* Add debian/gbp.conf
* Bump Standards-Version to 4.1.2
* Bump debhelper compat to 11
* Disable the Software Sources page since there is no obvious easy way
to change this setting later
-- Jeremy Bicha <jbicha@debian.org> Mon, 25 Dec 2017 09:22:53 -0500
gnome-initial-setup (3.26.0-1) unstable; urgency=medium
......
......@@ -5,10 +5,9 @@
Source: gnome-initial-setup
Section: gnome
Priority: optional
Maintainer: Purism developers <dev@puri.sm>
Uploaders: Jonas Smedegaard <jonas.smedegaard@puri.sm>
XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Build-Depends: debhelper (>= 10),
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Uploaders: Jeremy Bicha <jbicha@debian.org>, Jordi Mallach <jordi@debian.org>, Laurent Bigonville <bigon@debian.org>
Build-Depends: debhelper (>= 11),
geoclue-2.0 (>= 2.3.1),
gnome-common,
gnome-pkg-tools (>= 0.13),
......@@ -31,27 +30,27 @@ Build-Depends: debhelper (>= 10),
libkrb5-dev,
libnm-dev (>= 1.2),
libnma-dev (>= 1.0),
libpackagekit-glib2-dev (>= 1.1.4),
libpango1.0-dev (>= 1.32.5),
libpolkit-gobject-1-dev (>= 0.103),
libpwquality-dev,
librest-dev,
libsecret-1-dev,
libwebkit2gtk-4.0-dev
Standards-Version: 4.1.0
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-initial-setup
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-initial-setup/
Standards-Version: 4.1.2
Vcs-Git: https://anonscm.debian.org/git/pkg-gnome/gnome-initial-setup.git
Vcs-Browser: https://anonscm.debian.org/git/pkg-gnome/gnome-initial-setup.git
Homepage: https://git.gnome.org/browse/gnome-initial-setup/
Package: gnome-initial-setup
Architecture: linux-any
Depends: ${shlibs:Depends},
gdm3,
policykit-1 (>= 0.103),
adduser,
gnome-settings-daemon (>= 3.24),
python3,
${misc:Depends}
Recommends: gnome-getting-started-docs
Suggests: gdm3
Description: Initial GNOME system setup helper
After acquiring or installing a new system there are a few essential things
to set up before use. GNOME Initial Setup aims to provide a simple, easy,
......
Source: gnome-initial-setup
Section: gnome
Priority: optional
Maintainer: Purism developers <dev@puri.sm>
Uploaders: Jonas Smedegaard <jonas.smedegaard@puri.sm>
XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Build-Depends: debhelper (>= 10),
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 11),
geoclue-2.0 (>= 2.3.1),
gnome-common,
gnome-pkg-tools (>= 0.13),
......@@ -27,27 +26,27 @@ Build-Depends: debhelper (>= 10),
libkrb5-dev,
libnm-dev (>= 1.2),
libnma-dev (>= 1.0),
libpackagekit-glib2-dev (>= 1.1.4),
libpango1.0-dev (>= 1.32.5),
libpolkit-gobject-1-dev (>= 0.103),
libpwquality-dev,
librest-dev,
libsecret-1-dev,
libwebkit2gtk-4.0-dev
Standards-Version: 4.1.0
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-initial-setup
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-initial-setup/
Standards-Version: 4.1.2
Vcs-Git: https://anonscm.debian.org/git/pkg-gnome/gnome-initial-setup.git
Vcs-Browser: https://anonscm.debian.org/git/pkg-gnome/gnome-initial-setup.git
Homepage: https://git.gnome.org/browse/gnome-initial-setup/
Package: gnome-initial-setup
Architecture: linux-any
Depends: ${shlibs:Depends},
gdm3,
policykit-1 (>= 0.103),
adduser,
gnome-settings-daemon (>= 3.24),
python3,
${misc:Depends}
Recommends: gnome-getting-started-docs
Suggests: gdm3
Description: Initial GNOME system setup helper
After acquiring or installing a new system there are a few essential things
to set up before use. GNOME Initial Setup aims to provide a simple, easy,
......
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
import os
import sys
from subprocess import call
def install_locale(locale):
lgen = []
# toggle the selected locale in the locale.gen list
with open('/etc/locale.gen', 'r') as lf:
lgen = lf.read().split('\n')
for i in range(0, len(lgen)):
parts = lgen[i].split(' ')
if len(parts) != 3:
if len(parts) == 2:
if parts[0].startswith('en_US') or parts[0].startswith('en_DK'):
# ignore default locale
continue
lgen[i] = '# ' + lgen[i]
continue
if parts[1] == locale:
lgen[i] = ' '.join(parts[1:])
with open('/etc/locale.gen', 'w') as lf:
lf.write('\n'.join(lgen))
# run locale-gen to actually activate the changes
call(['locale-gen'])
return 0
if __name__ == '__main__':
if len(sys.argv) != 2:
raise Exception('Invalid number of arguments passed.')
r = install_locale(sys.argv[1])
sys.exit(r)
[Allow the gnome-initial-setup user to mount disks, set the locale, keyboard, date/time, control the network and create users without prompting]
Identity=unix-user:gnome-initial-setup
Action=org.freedesktop.policykit.exec;org.freedesktop.udisks2.filesystem-mount-system;org.freedesktop.hostname1.*;org.freedesktop.NetworkManager.*;org.freedesktop.locale1.*;org.freedesktop.accounts.*;org.freedesktop.timedate1.*;org.freedesktop.realmd.*;org.freedesktop.RealtimeKit1.*
Action=org.freedesktop.udisks2.filesystem-mount-system;org.freedesktop.hostname1.*;org.freedesktop.NetworkManager.*;org.freedesktop.locale1.*;org.freedesktop.accounts.*;org.freedesktop.timedate1.*;org.freedesktop.realmd.*;org.freedesktop.RealtimeKit1.*
ResultAny=no
ResultInactive=no
ResultActive=yes
debian/gnome-initial-setup.pkla /var/lib/polkit-1/localauthority/10-vendor.d/
debian/extra/install-locale.py /usr/lib/gnome-initial-setup/
Description: Have localed set and rebuild locale.gen stuff.
Hack to set and rebuild locale.gen stuff so the locale set by localed
is actually installed (we need to solve this in a better way later).
Author: Matthias Klumpp <matthias.klumpp@puri.sm>
Last-Update: 2017-05-30
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/gnome-initial-setup/pages/language/gis-language-page.c
+++ b/gnome-initial-setup/pages/language/gis-language-page.c
@@ -62,6 +62,7 @@
GisLanguagePagePrivate *priv = gis_language_page_get_instance_private (self);
GVariantBuilder *b;
gchar *s;
+ g_autofree gchar *tmp = NULL;
b = g_variant_builder_new (G_VARIANT_TYPE ("as"));
s = g_strconcat ("LANG=", priv->new_locale_id, NULL);
@@ -74,6 +75,10 @@
G_DBUS_CALL_FLAGS_NONE,
-1, NULL, NULL, NULL);
g_variant_builder_unref (b);
+
+ /* an absolutely awful hack, but it will do for now - however, we should not keep this */
+ tmp = g_strdup_printf ("pkexec /usr/lib/gnome-initial-setup/install-locale.py %s", priv->new_locale_id);
+ g_spawn_command_line_sync (tmp, NULL, NULL, NULL, NULL);
}
static void
......@@ -2,16 +2,12 @@
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed
%:
dh $@ --parallel --with gnome
dh $@ --with gnome
override_dh_auto_configure:
dh_auto_configure -- \
--libexecdir=/usr/lib/gnome-initial-setup \
--disable-software-sources
override_dh_install:
dh_install
chmod +x $(CURDIR)/debian/gnome-initial-setup/usr/lib/gnome-initial-setup/install-locale.py
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment