Browse Source

major clean up and get closer with upstream

fixes #1
master
Alf Gaida 4 years ago
parent
commit
3498f4c500

+ 0
- 32
bin/setcinnamonschemas View File

@@ -1,32 +0,0 @@
#!/bin/bash

# XKBMODEL="linux"
# XKBLAYOUT="de"
# XKBVARIANT="nodeadkeys"
. /etc/default/keyboard

# LANG=de_DE.utf8
. /etc/default/locale



case $LANG in
en_US.utf8)
sed -e "s/'@LAYOUTS@',//" \
/usr/share/fll-live-initscripts/91_org.cinnamon.keyboard.input-sources.gschema.override \
> /usr/share/glib-2.0/schemas/91_org.cinnamon.keyboard.input-sources.gschema.override
if [ "${XKBLAYOUT}" != "us" ] ; then
sed -i -e "s/'us'/'${XKBLAYOUT}'/" \
/usr/share/glib-2.0/schemas/91_org.cinnamon.keyboard.input-sources.gschema.override
fi
;;
*)
XLANG=${LANG:0:2}
sed -e "s/@LAYOUTS@/${XLANG}/" \
/usr/share/fll-live-initscripts/91_org.cinnamon.keyboard.input-sources.gschema.override \
> /usr/share/glib-2.0/schemas/91_org.cinnamon.keyboard.input-sources.gschema.override
;;
esac


glib-compile-schemas /usr/share/glib-2.0/schemas/

+ 0
- 32
bin/setgnomeschemas View File

@@ -1,32 +0,0 @@
#!/bin/bash

# XKBMODEL="linux"
# XKBLAYOUT="de"
# XKBVARIANT="nodeadkeys"
. /etc/default/keyboard

# LANG=de_DE.utf8
. /etc/default/locale



case $LANG in
en_US.utf8)
sed -e "s/('xkb','@LAYOUTS@'),//" \
/usr/share/fll-live-initscripts/90_org.gnome.keyboard.input-sources.gschema.override \
> /usr/share/glib-2.0/schemas/90_org.gnome.keyboard.input-sources.gschema.override
;;
*)
XLANG=${LANG:0:2}
sed -e "s/@LAYOUTS@/${XLANG}/" \
/usr/share/fll-live-initscripts/90_org.gnome.keyboard.input-sources.gschema.override \
> /usr/share/glib-2.0/schemas/90_org.gnome.keyboard.input-sources.gschema.override

;;
esac

if [ "$LANG" = "en_US.utf8" -a "${XKBLAYOUT}" != "en" ]; then
sed -i "s/us/${XKBLAYOUT}/g" /usr/share/glib-2.0/schemas/90_org.gnome.keyboard.input-sources.gschema.override
fi

glib-compile-schemas /usr/share/glib-2.0/schemas/

+ 0
- 34
bin/setlxdekblanguages View File

@@ -1,34 +0,0 @@
#!/bin/bash

# XKBMODEL="linux"
# XKBLAYOUT="de"
# XKBVARIANT="nodeadkeys"
. /etc/default/keyboard

# LANG=de_DE.utf8
. /etc/default/locale


# /etc/xdg/lxpanel/LXDE/panels/panel

case $LANG in
de_DE.utf8)
sed -e "s/@VARIANTSLIST@/,/" \
-e "s/@LAYOUTSLIST@/de,us/" \
/usr/share/*-lxde-settings/etc/xdg/lxpanel/LXDE/panels/panel \
> /etc/xdg/lxpanel/LXDE/panels/panel
;;
en_US.utf8)
sed -e "s/@VARIANTSLIST@/,/" \
-e "s/@LAYOUTSLIST@/us,de/" \
/usr/share/*-lxde-settings/etc/xdg/lxpanel/LXDE/panels/panel \
> /etc/xdg/lxpanel/LXDE/panels/panel
;;
*)
XLANG=${LANG:0:2}
sed -e "s/@VARIANTSLIST@/,/" \
-e "s/@LAYOUTSLIST@/${XLANG},us/" \
/usr/share/*-lxde-settings/etc/xdg/lxpanel/LXDE/panels/panel \
> /etc/xdg/lxpanel/LXDE/panels/panel
;;
esac

+ 6
- 6
debian/changelog View File

@@ -1,14 +1,14 @@
fll-live-initscripts (4.4.4.11.2) unstable; urgency=medium
fll-live-initscripts (4.4.5) unstable; urgency=medium

* fix starting behaviour
* major clean up and get closer with upstream

-- Alf Gaida <agaida@siduction.org> Wed, 18 Jan 2017 14:49:31 -0500
-- Alf Gaida <agaida@siduction.org> Thu, 26 Jan 2017 16:59:23 +0100

fll-live-initscripts (4.4.4.11.1) unstable; urgency=medium
fll-live-initscripts (4.4.4.12) unstable; urgency=medium

* added fll-calamares.init
* new version, no changes

-- Alf Gaida <agaida@siduction.org> Wed, 18 Jan 2017 13:45:28 -0500
-- Alf Gaida <agaida@siduction.org> Tue, 24 Jan 2017 23:55:15 +0100

fll-live-initscripts (4.4.4.10) unstable; urgency=medium


+ 1
- 1
debian/compat View File

@@ -1 +1 @@
9
10

+ 7
- 10
debian/control View File

@@ -1,15 +1,13 @@
Source: fll-live-initscripts
Maintainer: Stefan Lippers-Hollmann <s.l-h@gmx.de>
Uploaders: Joaquim Boura <x-un-i@sapo.pt>,
Niall Walsh <niallwalsh@celtux.org>,
Alf Gaida <agaida@siduction.org>,
Angelescu Ovidiu <convbsd@siduction.org>,
Jens Theede <musca@siduction.org>
Uploaders: Alf Gaida <agaida@siduction.org>,
Angelescu Ovidiu <convbsd@siduction.org>,
Jens Theede <musca@siduction.org>
Section: misc
Priority: optional
Build-Depends: debhelper (>= 9.20120115),
Build-Depends: debhelper (>= 10),
dh-systemd,
asciidoc,
asciidoc-base,
docbook,
gengetopt,
xsltproc,
@@ -21,8 +19,8 @@ Build-Depends: debhelper (>= 9.20120115),
libudev-dev,
libxml2-utils
Standards-Version: 3.9.8
Vcs-Browser: http://git.siduction.org/?p=packages/siduction-repository/fll-live-initscripts.git
Vcs-Git: git://git.siduction.org/packages/siduction-repository/fll-live-initscripts
Vcs-Browser: https://git.siduction.org/extra/fll-live-initscripts.git
Vcs-Git: https://git.siduction.org/extra/fll-live-initscripts.git

Package: distro-defaults
Architecture: all
@@ -42,7 +40,6 @@ Depends: ${misc:Depends},
eject,
fll-live-utils,
procps,
ceni,
keyboard-configuration,
lsb-base,
systemd-sysv (>= 217-2~)

+ 5
- 5
debian/copyright View File

@@ -5,7 +5,7 @@ Source: git://github.com/fullstory/fll-live-initscripts.git

Files: *
Copyright: 2007-2008, Kel Modderman <kel@otaku42.de>
2007-2016, Stefan Lippers-Hollmann <s.l-h@gmx.net>
2007-2017, Stefan Lippers-Hollmann <s.l-h@gmx.net>
2008-2016, Niall Walsh <niallwalsh@users.berlios.de>
License: GPL-2.0
Comment:
@@ -18,7 +18,7 @@ Comment:
/etc/init.d/umountfs from initscripts (2.86.ds1-38).
Copyright: 1997-2005, Miquel van Smoorenburg <miquels@cistron.nl>
2007-2008, Kel Modderman <kel@otaku42.de>
2007-2015, Stefan Lippers-Hollmann <s.l-h@gmx.net>
2007-2017, Stefan Lippers-Hollmann <s.l-h@gmx.net>
the members pkg-sysvinit project.
.
copy_exec() in ./debian/fll-live-initscripts.fll-reboot.init was shamelessly
@@ -30,13 +30,13 @@ Comment:
2005-2007, Maximilian Attems
2005-2006, Scott James Remnant
2007-2008, Kel Modderman <kel@otaku42.de>
2007-2015 Stefan Lippers-Hollmann <s.l-h@gmx.net>
2007-2017 Stefan Lippers-Hollmann <s.l-h@gmx.net>


Files: debian/*
Copyright: 2012-2016 Angelescu Ovidiu <convbsd@siduction.org>
2011-2016 Alf Gaida <agaida@siduction.org>
2007-2016 Stefan Lippers-Hollmann <s.l-h@gmx.net>
2011-2017 Alf Gaida <agaida@siduction.org>
2007-2017 Stefan Lippers-Hollmann <s.l-h@gmx.net>
2008-2016, Niall Walsh <niallwalsh@users.berlios.de>
2007-2008 Kel Modderman <kel@otaku42.de>
License: GPL-2.0

+ 0
- 1
debian/fll-live-initscripts.install View File

@@ -1,4 +1,3 @@
bin/set* usr/bin
fll lib/init
share/fll-live-initscripts/* usr/share/fll-live-initscripts/
networking/fll-networkd-one usr/share/fll-live-initscripts/

+ 5
- 0
debian/rules View File

@@ -1,5 +1,8 @@
#!/usr/bin/make -f

# contrary to the documentation, compat level 10 doesn't enable bindnow yet
export DEB_BUILD_MAINT_OPTIONS = hardening=+all

%:
dh ${@} --parallel --with=systemd

@@ -18,6 +21,7 @@ override_dh_systemd_enable:
dh_systemd_enable --package=fll-live-initscripts --name=fll-adduser
dh_systemd_enable --package=fll-live-initscripts --name=fll-locales
dh_systemd_enable --package=fll-live-initscripts --name=fll-xdm
dh_systemd_enable

override_dh_systemd_start:
# dh_systemd_start --package=fll-live-initscripts --no-start fll-networkd-one.service
@@ -28,3 +32,4 @@ override_dh_systemd_start:
dh_systemd_start --package=fll-live-initscripts --no-start fll-adduser.service
dh_systemd_start --package=fll-live-initscripts --no-start fll-locales.service
dh_systemd_start --package=fll-live-initscripts --no-start fll-xdm.service
dh_systemd_start

+ 0
- 2
share/fll-live-initscripts/90_org.gnome.keyboard.input-sources.gschema.override View File

@@ -1,2 +0,0 @@
[org.gnome.desktop.input-sources]
sources=[('xkb','@LAYOUTS@'),('xkb','us')]

+ 0
- 2
share/fll-live-initscripts/91_org.cinnamon.keyboard.input-sources.gschema.override View File

@@ -1,2 +0,0 @@
[org.gnome.libgnomekbd.keyboard]
layouts=['@LAYOUTS@','us']

+ 2
- 34
share/fll-live-initscripts/fll_locales View File

@@ -272,38 +272,6 @@ set_locale()
echo "locales locales/default_environment_locale select ${LANG}" | \
debconf-set-selections
update-locale "LANG=${LANG}"

# mod for lxde
if [ -f /usr/bin/setlxdekblanguages ]; then
echo "lxdekb-lang-set ${LANG}"
setlxdekblanguages
fi

case ${FLL_FLAVOUR} in
cinnamon)
echo "cinnamon setcinnamonschemas"
setcinnamonschemas;
;;
gnome)
echo "gnome setgnomeschemas"
setgnomeschemas;
;;
lxde)
echo "lxde set languages"
;;
lxqt)
echo "lxqt set languages"
;;
mate)
;;
kde)
;;
xorg)
;;
xfce)
echo "xfce set languages"
;;
esac
}

set_console()
@@ -482,16 +450,16 @@ save_locale_variables() {
case "${1}" in
start)
set_timezone
set_console
set_locale
set_console
apt_install_lang
localize_sources_list
save_locale_variables
;;
localize)
# localize
set_console
set_locale
set_console
apt_install_lang
localize_sources_list
save_locale_variables

Loading…
Cancel
Save