[SCM] live-config branch, upstream, updated. upstream/2.0.8-1-gf75babe
Daniel Baumann
daniel at debian.org
Thu Oct 21 09:18:07 UTC 2010
The following commit has been merged in the upstream branch:
commit f75babe2dc3610a75aaba03be208de18870c2104
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Oct 21 11:15:02 2010 +0200
Adding upstream version 2.0.9.
diff --git a/VERSION b/VERSION
index 815e68d..09843e3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.8
+2.0.9
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..53113f6
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,356 @@
+live-config (2.0.9-1) unstable; urgency=medium
+
+ * Don't compress example files in /usr/share/doc.
+ * Updating gdm3 check to make autologin work again with gdm3 2.30.5-4.
+
+ -- Daniel Baumann <daniel at debian.org> Thu, 21 Oct 2010 11:12:37 +0200
+
+live-config (2.0.8-1) unstable; urgency=medium
+
+ [ Daniel Baumann ]
+ * Adding forgotten config= shortcut in argument parsing.
+ * Using medium as keyword instead of media in hook script, as
+ documented in the manpage (Closes: #598375).
+ * Correctly prepending local hooks with file:// prefix (Closes:
+ #598375).
+
+ [ Scott Barker ]
+ * Fixing typo in config.d files parsing from live media (Closes:
+ #598536).
+
+ [ Daniel Baumann ]
+ * Correcting another typo in hooks config script regarding the loop
+ variable.
+ * Simplyfing and silencing switch between local and remote files in
+ hooks script.
+ * Simplyfing sed call when using local hook scripts.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 02 Oct 2010 10:12:13 +0200
+
+live-config (2.0.7-1) unstable; urgency=medium
+
+ [ Daniel Baumann ]
+ * Correcting typo in persistent file of apport and ureadahead scripts.
+ * Also allowing short names for live-config and live-noconfig
+ parameters.
+ * Correcting accidentally reverted change of live user uid from 999 to
+ 1000.
+
+ [ intrigeri ]
+ * Correcting typo in console-common script.
+
+ -- Daniel Baumann <daniel at debian.org> Sun, 26 Sep 2010 09:01:09 +0200
+
+live-config (2.0.6-1) unstable; urgency=low
+
+ * Applying patch from Jonathan Riddell <jriddell at ubuntu.com> to
+ disable some new akonadi services in kde-services script.
+ * Adding xinit config script.
+ * Adding xinit script in manpages.
+ * Renumbering config scripts for xinit.
+ * Renaming xinit.sh to zz-xinit.sh in /etc/profile.d to ensure it is
+ run last.
+
+ -- Daniel Baumann <daniel at debian.org> Wed, 15 Sep 2010 12:07:37 +0200
+
+live-config (2.0.5-1) unstable; urgency=low
+
+ * Disabling kaboom in user context.
+ * Using double-hashes as meta-comment sign.
+ * Updating standards version of example package to 3.9.1.
+ * Updating uinstall targets in makefile.
+ * Correcting wrong spelling of debconf frontend in xserver-xorg
+ script.
+ * Updating /etc/hosts handling in hostname config script for squeeze.
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 06 Sep 2010 15:04:05 +0200
+
+live-config (2.0.4-1) unstable; urgency=low
+
+ * Using config.d instead of config.conf.d as directory name for custom
+ configuration files.
+ * Updating live-installer-launcher script for debian-installer-
+ launcher rename.
+
+ -- Daniel Baumann <daniel at debian.org> Thu, 02 Sep 2010 22:33:04 +0200
+
+live-config (2.0.3-1) unstable; urgency=low
+
+ * Updating live-build reference in live-config manpage.
+ * Renumbering config scripts.
+ * Rewriting TODO file.
+
+ -- Daniel Baumann <daniel at debian.org> Thu, 02 Sep 2010 18:35:50 +0200
+
+live-config (2.0.2-1) unstable; urgency=low
+
+ * Downgrading runit-run depends to suggests as asked by release team.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 21 Aug 2010 23:41:45 +0200
+
+live-config (2.0.1-1) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Only run x-session-manager parts when x-session-manager is set.
+
+ [ intrigeri ]
+ * Removing spurious copy/pasted line in xserver-xorg script.
+
+ [ Daniel Baumann ]
+ * Using dpkg-reconfigure instead of dexconf in xserver-xorg script
+ (Closes: #592510).
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 14 Aug 2010 20:06:21 +0200
+
+live-config (2.0.0-1) unstable; urgency=low
+
+ * Improving grammar in the last changelog entry.
+ * Correcting spelling typo in manpage, thanks to Tassia Camoes Araujo
+ <tassia at gmail.com>.
+ * Updating TODO file.
+ * Updating French manpage translation, thanks to Thierry Lépicier
+ <thierry.lepicier at free.fr>.
+ * Updating TODO file.
+
+ -- Daniel Baumann <daniel at debian.org> Tue, 10 Aug 2010 00:03:20 +0200
+
+live-config (2.0~a17-1) unstable; urgency=low
+
+ * Split out runit backend to own package.
+
+ -- Daniel Baumann <daniel at debian.org> Thu, 29 Jul 2010 17:01:05 +0200
+
+live-config (2.0~a16-1) unstable; urgency=high
+
+ * Adding workaround for bug in install calls wrt/ permissions of
+ intermediate directories.
+ * Simplyfing tzdata script.
+ * Adding manpage symlinks in transitional package.
+ * Adding option to set x-session-manager in preparation for multi-
+ desktop images.
+ * Correcting install location for scripts in example package.
+ * Simplyfing scripts definition in makefile.
+ * Adding updated French manpage translation from Thierry Lépicier
+ <thierry.lepicier at free.fr>.
+ * Don't fail in Makefile when there's no checkbashism (Closes:
+ #590407).
+ * Adding alternative depends to runit-run on live-config-sysvinit,
+ thanks to Daniel Kahn Gillmor <dkg at fifthhorseman.net>.
+ * Updating package to standards version 3.9.1.
+ * Adding Brazilian Portuguese manpage translation from Tassia Camoes
+ Araujo <tassia at gmail.com>.
+
+ -- Daniel Baumann <daniel at debian.org> Wed, 28 Jul 2010 05:47:03 +0200
+
+live-config (2.0~a15-1) unstable; urgency=low
+
+ * Correcting typo in update-live-config script.
+ * Also including bin directory in test target of makefile.
+ * Updating TODO file.
+ * Adding ureadahead script (ubuntu only).
+ * Removing debian specific scripts when being used on ubuntu.
+ * Updating TODO file.
+ * Improving and updating French manpage translation.
+ * Improving backend dependencies.
+ * Adding example hooks.
+ * Correcting manpage syntax regarding multiple locales.
+ * Adding filesystem and media options to hook script to automatically
+ execute hooks in default locations.
+ * Allowing to combine different hook methods at the same time.
+ * Preconfiguring kxkb to show kde keyboard selector when using
+ multiple layouts.
+ * Ensuring that kde configuration is owned by the live user.
+ * Updating kxkbrc default values.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 17 Jul 2010 00:40:49 +0200
+
+live-config (2.0~a14-1) unstable; urgency=low
+
+ * Prefixing local variables in update-live-config script.
+ * Adding check for lsb_release in update-live-config script.
+ * Updating example package to standards 3.9.0.
+ * Adding README for example debian package.
+ * Adding note about live-config in copyright file of live-config-
+ foobar example package.
+ * Regenerating manpages po files.
+ * Enabling short options (foo instead of live-config.foo).
+ * Updating manpages to reflect that the gdm script was reenabled for
+ squeeze and newer.
+ * Updating manpages to reflect that short options are enabled now.
+ * Using two hashes for license headers.
+ * Prefixing some forgotten internal variables.
+ * Adding live-config.noautologin parameter to disable both console and
+ graphical autologin.
+ * Updating manpages to reflect addition of live-config.noautologin
+ parameter.
+
+ -- Daniel Baumann <daniel at debian.org> Fri, 16 Jul 2010 01:44:26 +0200
+
+live-config (2.0~a13-1) unstable; urgency=low
+
+ * Because lxde still uses gdm instead of gdm3 on squeeze, also
+ including gdm config scripts when building on squeeze and newer.
+ * Improving test targets in Makefile a bit.
+ * Improving clean target in manpages Makefile a bit.
+
+ -- Daniel Baumann <daniel at debian.org> Thu, 15 Jul 2010 19:25:37 +0200
+
+live-config (2.0~a12-1) unstable; urgency=low
+
+ * Factoring out common function to start network.
+ * Updating replacement update-initramfs cope with files being in /boot
+ rather than root.
+ * Updating package to standards version 3.9.0.
+
+ -- Daniel Baumann <daniel at debian.org> Wed, 07 Jul 2010 20:20:02 +0200
+
+live-config (2.0~a11-1) unstable; urgency=low
+
+ * Correcting spelling mistake in changelog.
+ * Degrading systemd depends to suggests for the time that systemd
+ resides in experimental only.
+ * Adding initial French manpage translation from Thierry Lépicier
+ <thierry.lepicier at free.fr>.
+
+ -- Daniel Baumann <daniel at debian.org> Sun, 20 Jun 2010 19:18:11 +0200
+
+live-config (2.0~a10-1) unstable; urgency=low
+
+ * Adding commentary description in systemd service file.
+ * Adding commentary description in sysvinit script file.
+ * Also moving sysv-rc script to sysvinit backend package.
+ * Renaming live-config.keyboard-layout parameter to live-
+ config.keyboard-layouts for consistency.
+ * Correcting typo in sysv-rc script.
+ * Updating TODO file.
+ * Export network status in hook script.
+ * Sorting dh_installinit calls in rules file.
+ * Adding debug boot option.
+ * Automatically determine on which distribution the package is built
+ through lsb_release and removing unnecessary config scripts from the
+ resulting package.
+ * Moving build-depends on lsb-release to build-depends-indep.
+ * Adding depends to systemd now that it passed the NEW queue.
+
+ -- Daniel Baumann <daniel at debian.org> Thu, 17 Jun 2010 21:47:33 +0200
+
+live-config (2.0~a9-1) unstable; urgency=low
+
+ * Adding slim config script.
+ * Adding sysv-rc script, thanks to Michal Suchanek
+ <hramrach at centrum.cz> for the idea.
+ * Correcting nodm script.
+ * Adding initial upstart backend.
+
+ -- Daniel Baumann <daniel at debian.org> Fri, 11 Jun 2010 18:36:11 +0200
+
+live-config (2.0~a8-1) unstable; urgency=low
+
+ * Renaming noxautologin parameter to nox11autologin for consistency.
+ * Renaming foobar example configuration file to foobar.conf for
+ consistency.
+ * Removing some confusing code from example script.
+ * Using example script with proper order number.
+ * Adding reference to http://live.debian.net/other/hooks/ in manpage.
+ * Improving live-config.hooks description in manpage.
+ * Updating manpage to reflect that there can be more than one keyboard
+ layout specified at the time.
+ * Adding comment about enabling kxkb in kde-services config script.
+ * Moving sysvinit config script to live-config-sysvinit package.
+ * Adding initial systemd backend.
+ * Documenting 'regressions' in TOOD file.
+
+ -- Daniel Baumann <daniel at debian.org> Thu, 10 Jun 2010 12:40:26 +0200
+
+live-config (2.0~a7-1) unstable; urgency=low
+
+ * Updating TODO file.
+ * Adding xserver-xorg script.
+
+ -- Daniel Baumann <daniel at debian.org> Tue, 08 Jun 2010 20:22:20 +0200
+
+live-config (2.0~a6-1) unstable; urgency=low
+
+ * Moving customization example in an own directory within the example
+ directory.
+ * Adding sample configuration file to customization examples package.
+ * Adding note about customization in manpage.
+ * Updating TODO file.
+ * Updating update-version script.
+ * Updating TODO file.
+ * Adding keyboard configuration scripts.
+ * Correcting dash escaping in manpage.
+ * Renaming hook script to hooks for consistency.
+ * Renaming noxlogin parameter to noxautologin for consistency.
+ * Adding sysvinit script for terminal autologin.
+ * Adding anacron script.
+ * Adding util-linux script.
+ * Adding login script.
+
+ -- Daniel Baumann <daniel at debian.org> Tue, 08 Jun 2010 06:02:06 +0200
+
+live-config (2.0~a5-1) unstable; urgency=low
+
+ * Adding boot parameter handling in example script.
+ * Adding copyright notices in end-user files.
+ * Further generalizing example script and packaging for users own
+ customized scripts.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 05 Jun 2010 14:08:58 +0200
+
+live-config (2.0~a4-1) unstable; urgency=low
+
+ * Adding shortcut parameter to disable automatic graphical login, no
+ matter which display manager would be used.
+ * Adding quotes in manpage for live-config.user-fullname.
+ * Documenting usable variables in configuration files in the manpage.
+ * Updating manpage to reflect that multiple hooks are supported at the
+ same time.
+ * Correcting typo in configuration files section of manpage.
+ * Running checkbashisms with -f and -x in Makefile.
+ * Correcting outdated check on /etc/init.d/live-config-sysvinit in
+ hook config script.
+ * Adding checks to ensure that scripts are not re-run with
+ persistency.
+
+ -- Daniel Baumann <daniel at debian.org> Wed, 02 Jun 2010 22:19:18 +0200
+
+live-config (2.0~a3-1) unstable; urgency=low
+
+ * Removing fixme note about configuration filename.
+ * Adding note about a logfile to todo.
+ * Adding reference to locales script in manpages.
+ * Adding live-noconfig option to exclude specific scripts from being
+ run (Closes: #583533).
+ * Reordering parameters to match ordering of scripts.
+ * Allow to use live-noconfig for excluding scripts without the need of
+ specifying live-config too.
+ * Updating German manpage translation.
+ * Using UTF-8 and umlauts in German manpage translation.
+ * Adding shortcut parameter to disable root privileges, no matter what
+ mechanism would be used.
+ * Replacing reference to live-initramfs with live-boot in manpage.
+ * Setting default user fullname to 'Debian Live user'.
+ * Adding wget to suggests.
+ * Adding script options in manpages.
+ * Improving wording in boot parameter (scripts) section of manpage.
+ * Improving German manpages translation.
+
+ -- Daniel Baumann <daniel at debian.org> Sun, 30 May 2010 09:35:32 +0200
+
+live-config (2.0~a2-1) unstable; urgency=low
+
+ * Additionally supporting configuration directories for configuration
+ files to ease customization.
+ * Correcting install command for manpages in Makefile.
+ * Simplyfing makefile a bit.
+ * Adding locales config script.
+ * Renumbering config scripts.
+
+ -- Daniel Baumann <daniel at debian.org> Thu, 27 May 2010 22:37:06 +0200
+
+live-config (2.0~a1-1) experimental; urgency=low
+
+ * Initial release.
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 24 May 2010 09:14:49 +0200
diff --git a/examples/live-config-foobar/debian/compat b/debian/compat
similarity index 100%
copy from examples/live-config-foobar/debian/compat
copy to debian/compat
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..9c7126e
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,73 @@
+Source: live-config
+Section: misc
+Priority: optional
+Maintainer: Debian Live Project <debian-live at lists.debian.org>
+Uploaders: Daniel Baumann <daniel at debian.org>
+Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends-Indep: lsb-release
+Standards-Version: 3.9.1
+Homepage: http://live.debian.net/devel/live-config/
+Vcs-Browser: http://live.debian.net/gitweb/?p=live-config.git
+Vcs-Git: git://live.debian.net/git/live-config.git
+
+Package: live-config
+Architecture: all
+Depends: ${misc:Depends}, live-config-sysvinit | live-config-backend
+Recommends: user-setup, sudo
+Suggests: wget
+Description: Debian Live - System Configuration Scripts
+ live-config contains the scripts that configure a Debian Live system during
+ the boot process (late userspace).
+ .
+ In addition to live-config, a backend for an init system is required, such as
+ live-config-sysvinit.
+
+Package: live-config-runit
+Architecture: all
+Depends: ${misc:Depends}
+Conflicts: live-config-backend
+Replaces: live-config-backend
+Provides: live-config-backend
+Suggests: runit-run
+Description: Debian Live - System Configuration Scripts (runit backend)
+ live-config contains the scripts that configure a Debian Live system during
+ the boot process (late userspace).
+ .
+ This package contains the runit backend (experimental!).
+
+Package: live-config-systemd
+Architecture: all
+Depends: ${misc:Depends}
+Conflicts: live-config-backend
+Replaces: live-config-backend
+Provides: live-config-backend
+Suggests: systemd
+Description: Debian Live - System Configuration Scripts (systemd backend)
+ live-config contains the scripts that configure a Debian Live system during
+ the boot process (late userspace).
+ .
+ This package contains the systemd backend (experimental!).
+
+Package: live-config-sysvinit
+Architecture: all
+Depends: ${misc:Depends}, sysvinit (>= 2.86)
+Conflicts: live-config-backend
+Replaces: live-config-backend
+Provides: live-config-backend
+Description: Debian Live - System Configuration Scripts (sysvinit backend)
+ live-config contains the scripts that configure a Debian Live system during
+ the boot process (late userspace).
+ .
+ This package contains the sysvinit backend.
+
+Package: live-config-upstart
+Architecture: all
+Depends: ${misc:Depends}, upstart
+Conflicts: live-config-backend
+Replaces: live-config-backend
+Provides: live-config-backend
+Description: Debian Live - System Configuration Scripts (upstart backend)
+ live-config contains the scripts that configure a Debian Live system during
+ the boot process (late userspace).
+ .
+ This package contains the upstart backend (experimental!).
diff --git a/examples/live-config-foobar/debian/copyright b/debian/copyright
similarity index 80%
copy from examples/live-config-foobar/debian/copyright
copy to debian/copyright
index d3c122a..fe5ae2f 100644
--- a/examples/live-config-foobar/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
-This package is based on the live-config-foobar example package included in
-live-config which can be optained from http://live.debian.net/.
+Upstream-Contact: Debian Live Project <debian-live at lists.debian.org>
+Upstream-Homepage: http://live.debian.net/
Files: *
-Copyright: (C) 2010 John Doe <john at example.org>
+Copyright: (C) 2006-2010 Daniel Baumann <daniel at debian.org>
License: GPL-3+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/debian/live-config-runit.live-config.init b/debian/live-config-runit.live-config.init
new file mode 100644
index 0000000..01487f8
--- /dev/null
+++ b/debian/live-config-runit.live-config.init
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+## live-config contains the scripts that configure a Debian Live system during
+## the boot process (late userspace).
+##
+## This is the runit-run script for live-config.
+
+
+### BEGIN INIT INFO
+# Provides: live-config
+# Required-Start:
+# Required-Stop:
+# Should-Start:
+# Should-Stop:
+# Default-Start: S
+# Default-Stop:
+# Short-Description: Debian Live - System Configuration Scripts
+# Description: live-config contains the scripts that configure a Debian
+# Live system during the boot process (late userspace).
+# X-Start-Before:
+# X-Stop-After:
+# X-Interactive: true
+### END INIT INFO
+
+case "${1}" in
+ start)
+ /lib/live/config.sh
+ ;;
+
+ force-reload|restart|stop)
+
+ ;;
+esac
diff --git a/debian/live-config-systemd.service b/debian/live-config-systemd.service
new file mode 100644
index 0000000..b9afb88
--- /dev/null
+++ b/debian/live-config-systemd.service
@@ -0,0 +1,15 @@
+## Debian Live - System Configuration Scripts
+##
+## live-config contains the scripts that configure a Debian Live system during
+## the boot process (late userspace).
+##
+## This is the systemd service for live-config.
+
+
+[Unit]
+Description=live-config contains the scripts that configure a Debian Live system during the boot process (late userspace).
+
+[Service]
+ExecStart=/lib/live/config.sh
+Type=finish
+ValidNoProcess=yes
diff --git a/debian/live-config-sysvinit.live-config.init b/debian/live-config-sysvinit.live-config.init
new file mode 100644
index 0000000..621d500
--- /dev/null
+++ b/debian/live-config-sysvinit.live-config.init
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+## live-config contains the scripts that configure a Debian Live system during
+## the boot process (late userspace).
+##
+## This is the sysvinit script for live-config.
+
+
+### BEGIN INIT INFO
+# Provides: live-config
+# Required-Start:
+# Required-Stop:
+# Should-Start:
+# Should-Stop:
+# Default-Start: S
+# Default-Stop:
+# Short-Description: Debian Live - System Configuration Scripts
+# Description: live-config contains the scripts that configure a Debian
+# Live system during the boot process (late userspace).
+# X-Start-Before:
+# X-Stop-After:
+# X-Interactive: true
+### END INIT INFO
+
+case "${1}" in
+ start)
+ /lib/live/config.sh
+ ;;
+
+ force-reload|restart|stop)
+
+ ;;
+esac
diff --git a/debian/live-config-upstart.live-config.upstart b/debian/live-config-upstart.live-config.upstart
new file mode 100644
index 0000000..1a14699
--- /dev/null
+++ b/debian/live-config-upstart.live-config.upstart
@@ -0,0 +1,15 @@
+## Debian Live - System Configuration Scripts
+##
+## live-config contains the scripts that configure a Debian Live system during
+## the boot process (late userspace).
+##
+## This is the upstart job for live-config.
+
+
+description "live-config"
+author "Daniel Baumann <daniel at debian.org>"
+
+start on runlevel S
+stop on runlevel [!2345]
+
+exec /lib/live/config.sh
diff --git a/debian/live-config.bug-presubj b/debian/live-config.bug-presubj
new file mode 100644
index 0000000..0cbbe23
--- /dev/null
+++ b/debian/live-config.bug-presubj
@@ -0,0 +1,11 @@
+Before submitting a bug report against live-config, please make sure
+that you have read our guidlines for Debian Live bug reports:
+
+ http://live.debian.net/manual/html/bugs.html
+
+By providing the required information as outlined in the guidlines makes
+sure that we can optimally reproduce and fix bugs, not doing so wastes a
+lot of time for both the maintainers and the submitters.
+
+Please keep in mind that bugs that lack the required information will
+likely be ignored.
diff --git a/debian/live-initramfs.links b/debian/live-initramfs.links
new file mode 100644
index 0000000..c9c3293
--- /dev/null
+++ b/debian/live-initramfs.links
@@ -0,0 +1,3 @@
+/usr/share/man/man7/live-config.7.gz /usr/share/man/man7/live-initramfs.7.gz
+/usr/share/man/de/man7/live-config.7.gz /usr/share/man/de/man7/live-initramfs.7.gz
+/usr/share/man/fr/man7/live-config.7.gz /usr/share/man/fr/man7/live-initramfs.7.gz
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..85f8fe1
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,32 @@
+#!/usr/bin/make -f
+
+%:
+ dh ${@}
+
+override_dh_auto_build:
+ # disabled
+
+override_dh_auto_install:
+ $(MAKE) DESTDIR=$(CURDIR)/debian/live-config install
+
+ # Removing useless files
+ rm -f debian/live-config/usr/share/doc/live-config/COPYING
+ bin/update-live-config.sh debian/live-config/lib/live/config
+
+ # live-config-systemd
+ install -D -m 0644 debian/live-config-systemd.service debian/live-config-systemd/etc/systemd/system/live-config.service
+ mkdir -p debian/live-config-systemd/etc/systemd/system/runlevel1.target.wants
+ ln -s ../live-config.service debian/live-config-systemd/etc/systemd/system/runlevel1.target.wants/live-config.service
+
+ # live-config-sysvinit
+ mkdir -p debian/live-config-sysvinit/lib/live/config
+ mv debian/live-config/lib/live/config/*-sysvinit debian/live-config-sysvinit/lib/live/config
+ mv debian/live-config/lib/live/config/*-sysv-rc debian/live-config-sysvinit/lib/live/config
+
+override_dh_installinit:
+ dh_installinit -p live-config-runit --no-restart-on-upgrade --no-start --update-rcd-params='start 00 S .' --name live-config
+ dh_installinit -p live-config-sysvinit --no-restart-on-upgrade --no-start --update-rcd-params='start 00 S .' --name live-config
+ dh_installinit -p live-config-upstart --no-restart-on-upgrade --no-start --name live-config
+
+override_dh_compress:
+ dh_compress -Xusr/share/doc/live-config/examples
diff --git a/examples/live-config-foobar/debian/source/format b/debian/source/format
similarity index 100%
copy from examples/live-config-foobar/debian/source/format
copy to debian/source/format
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index d09155a..a6441dd 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 02.10.2010 2.0.8 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 21.10.2010 2.0.9 "Debian Live Projekt"
.SH NAME
\fBlive\-config\fP \- System Konfiguration Skripte
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 798cd8b..8fdf23d 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details.
.\"
.\"
-.TH LIVE\-CONFIG 7 2010\-10\-02 2.0.8 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2010\-10\-21 2.0.9 "Debian Live Project"
.SH NAME
\fBlive\-config\fR \- System Configuration Scripts
diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index f50bb73..7737f0c 100644
--- a/manpages/fr/live-config.fr.7
+++ b/manpages/fr/live-config.fr.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 02.10.2010 2.0.8 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 21.10.2010 2.0.9 "Projet Debian Live"
.SH NOM
\fBlive\-config\fP \- Scripts de configuration du système
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index 5aded01..0705536 100644
--- a/manpages/po/de/live-config.7.po
+++ b/manpages/po/de/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 2.0.6\n"
-"POT-Creation-Date: 2010-09-26 09:00+0300\n"
+"Project-Id-Version: live-config 2.0.9\n"
+"POT-Creation-Date: 2010-10-21 11:13+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-10-02"
-msgstr "02.10.2010"
+msgid "2010-10-21"
+msgstr "21.10.2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.8"
-msgstr "2.0.8"
+msgid "2.0.9"
+msgstr "2.0.9"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index 245741f..c35750a 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 2.0.6\n"
-"POT-Creation-Date: 2010-09-26 09:00+0300\n"
+"Project-Id-Version: live-config 2.0.9\n"
+"POT-Creation-Date: 2010-10-21 11:13+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Thierry Lépicier <thierry.lepicier at free.fr>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-10-02"
-msgstr "02.10.2010"
+msgid "2010-10-21"
+msgstr "21.10.2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.8"
-msgstr "2.0.8"
+msgid "2.0.9"
+msgstr "2.0.9"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/po/pt_BR/live-config.7.po b/manpages/po/pt_BR/live-config.7.po
index 00c3d54..fc38643 100644
--- a/manpages/po/pt_BR/live-config.7.po
+++ b/manpages/po/pt_BR/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 2.0.6\n"
-"POT-Creation-Date: 2010-09-26 09:00+0300\n"
+"Project-Id-Version: live-config 2.0.9\n"
+"POT-Creation-Date: 2010-10-21 11:13+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Tassia Camoes Araujo <tassia at gmail.com>\n"
"Language-Team: none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-10-02"
-msgstr "02-10-2010"
+msgid "2010-10-21"
+msgstr "21-10-2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.8"
-msgstr "2.0.8"
+msgid "2.0.9"
+msgstr "2.0.9"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 78be142..b6ca99a 100644
--- a/manpages/pot/live-config.7.pot
+++ b/manpages/pot/live-config.7.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config VERSION\n"
-"POT-Creation-Date: 2010-10-02 10:11+0300\n"
+"POT-Creation-Date: 2010-10-21 11:13+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-10-02"
+msgid "2010-10-21"
msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.8"
+msgid "2.0.9"
msgstr ""
#. type: TH
diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index 2ab1d49..4deb348 100644
--- a/manpages/pt_BR/live-config.pt_BR.7
+++ b/manpages/pt_BR/live-config.pt_BR.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 02\-10\-2010 2.0.8 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 21\-10\-2010 2.0.9 "Projeto Debian Live"
.SH NOME
\fBlive\-config\fP \- Scripts para Configuração do Sistema
diff --git a/scripts/config/007-gdm3 b/scripts/config/007-gdm3
index 44dca50..d26a095 100755
--- a/scripts/config/007-gdm3
+++ b/scripts/config/007-gdm3
@@ -24,8 +24,8 @@ Gdm3 ()
Configure_gdm3 ()
{
- # Checking if if package is already configured differently
- if grep -qs AutomaticLoginEnable /etc/gdm3/daemon.conf
+ # Checking if if package is already configured
+ if grep -qs AutomaticLoginEnable=true /etc/gdm3/daemon.conf
then
return
fi
--
live-config
More information about the debian-live-changes
mailing list