Bug#704638: unblock: live-config/3.0.22-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package live-config
Fixes one RC bug, #704562, which breaks upgrades from squeeze. Also
includes some translation and spelling fixes and closes a few more
bugs of lesser severity but which are very simple and low-risk
fixes.
The attached debdiff has the manpage translations filtered to ease
review.
unblock live-config/3.0.22-1
diff -Nru live-config-3.0.21/bin/live-config-update live-config-3.0.22/bin/live-config-update
--- live-config-3.0.21/bin/live-config-update 2013-02-15 04:30:57.000000000 -0400
+++ live-config-3.0.22/bin/live-config-update 2013-04-03 12:48:56.000000000 -0300
@@ -24,7 +24,7 @@
if ( [ -z "${_DISTRIBUTION}" ] || [ -z "${_RELEASE}" ] ) && [ ! -x "$(which lsb_release 2>/dev/null)" ]
then
echo "E: lsb_release: command not found."
- echo "I: lsb_release can be optained from:"
+ echo "I: lsb_release can be obtained from:"
echo "I: http://www.linux-foundation.org/en/LSB";
echo "I: On Debian based systems, lsb_release can be installed with:"
echo "I: sudo apt-get install lsb-release"
diff -Nru live-config-3.0.21/debian/changelog live-config-3.0.22/debian/changelog
--- live-config-3.0.21/debian/changelog 2013-02-15 04:33:25.000000000 -0400
+++ live-config-3.0.22/debian/changelog 2013-04-03 12:57:27.000000000 -0300
@@ -1,3 +1,27 @@
+live-config (3.0.22-1) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Adding conflicts/replaces for squeeze upgrade (Closes: #704562).
+ * Skipping sudo script if username is root (Closes: #701788).
+ * Replacing systemctl call with manual symlink, which is error prone
+ wrt/ changes in systemd or the service file but doesn't require up and
+ running systemd (Closes: #700597).
+ * Correcting some spelling typos, thanks to Adam D. Barratt <adam@adam-
+ barratt.org.uk>.
+ * Correcting spelling typo in noroot variable name, thanks to Chris
+ Malton <chrism@cmalton.me.uk> (Closes: #703108).
+
+ [ Jun Nogata ]
+ * Updating gnome-screensaver locking for gnome3 (Closes: #703972).
+
+ [ Daniel Baumann ]
+ * Issueing gnome-screensaver disabling differently depending on wheezy
+ or squeeze.
+ * Adding updated Brazilian Portuguese manpage translations from Tiago
+ Bortoletto Vaz <tiago@debian.org>.
+
+ -- Daniel Baumann <daniel@debian.org> Wed, 03 Apr 2013 17:47:25 +0200
+
live-config (3.0.21-1) unstable; urgency=low
* Calling systemctl with --quiet.
diff -Nru live-config-3.0.21/debian/control live-config-3.0.22/debian/control
--- live-config-3.0.21/debian/control 2013-02-15 04:33:25.000000000 -0400
+++ live-config-3.0.22/debian/control 2013-04-03 12:57:27.000000000 -0300
@@ -28,6 +28,8 @@
Section: doc
Architecture: all
Depends: ${misc:Depends}
+Conflicts: live-config (<< 3.0)
+Replaces: live-config
Description: Live System Configuration Scripts (documentation)
live-config contains the scripts that configure a live system during the boot
process (late userspace).
diff -Nru live-config-3.0.21/debian/live-config-systemd.links live-config-3.0.22/debian/live-config-systemd.links
--- live-config-3.0.21/debian/live-config-systemd.links 1969-12-31 20:00:00.000000000 -0400
+++ live-config-3.0.22/debian/live-config-systemd.links 2013-04-03 12:55:42.000000000 -0300
@@ -0,0 +1 @@
+/lib/systemd/system/live-config.service /etc/systemd/system/basic.target.wants/live-config.service
diff -Nru live-config-3.0.21/debian/live-config-systemd.postinst live-config-3.0.22/debian/live-config-systemd.postinst
--- live-config-3.0.21/debian/live-config-systemd.postinst 2013-02-15 04:33:25.000000000 -0400
+++ live-config-3.0.22/debian/live-config-systemd.postinst 1969-12-31 20:00:00.000000000 -0400
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "${1}" in
- configure)
- if [ -x /bin/systemctl ]
- then
- systemctl enable --quiet live-config.service
- fi
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`${1}'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff -Nru live-config-3.0.21/examples/live-config-foobar/debian/copyright live-config-3.0.22/examples/live-config-foobar/debian/copyright
--- live-config-3.0.21/examples/live-config-foobar/debian/copyright 2013-02-15 04:28:48.000000000 -0400
+++ live-config-3.0.22/examples/live-config-foobar/debian/copyright 2013-04-03 12:48:56.000000000 -0300
@@ -4,7 +4,7 @@
Source: http://www.example.org/foobar/
Comment:
This package is based on the live-config-foobar example package
- included in live-config which can be optained from
+ included in live-config which can be obtained from
http://live.debian.net/devel/live-config/.
Files: *
diff -Nru live-config-3.0.21/Makefile live-config-3.0.22/Makefile
--- live-config-3.0.21/Makefile 2013-02-15 04:28:48.000000000 -0400
+++ live-config-3.0.22/Makefile 2013-04-03 12:48:56.000000000 -0300
@@ -38,7 +38,7 @@
echo " done."; \
else \
echo "W: checkbashisms - command not found"; \
- echo "I: checkbashisms can be optained from: "; \
+ echo "I: checkbashisms can be obtained from: "; \
echo "I: http://git.debian.org/?p=devscripts/devscripts.git";; \
echo "I: On Debian based systems, checkbashisms can be installed with:"; \
echo "I: apt-get install devscripts"; \
diff -Nru live-config-3.0.21/manpages/de/live-config.de.7 live-config-3.0.22/manpages/de/live-config.de.7
diff -Nru live-config-3.0.21/manpages/en/live-config.7 live-config-3.0.22/manpages/en/live-config.7
diff -Nru live-config-3.0.21/manpages/es/live-config.es.7 live-config-3.0.22/manpages/es/live-config.es.7
diff -Nru live-config-3.0.21/manpages/fr/live-config.fr.7 live-config-3.0.22/manpages/fr/live-config.fr.7
diff -Nru live-config-3.0.21/manpages/it/live-config.it.7 live-config-3.0.22/manpages/it/live-config.it.7
diff -Nru live-config-3.0.21/manpages/Makefile live-config-3.0.22/manpages/Makefile
--- live-config-3.0.21/manpages/Makefile 2013-02-15 04:28:48.000000000 -0400
+++ live-config-3.0.22/manpages/Makefile 2013-04-03 12:48:56.000000000 -0300
@@ -31,7 +31,7 @@
@if [ ! -x "$$(which po4a 2>/dev/null)" ]; \
then \
echo "E: po4a - command not found"; \
- echo "I: po4a can be optained from:"; \
+ echo "I: po4a can be obtained from:"; \
echo "I: http://po4a.alioth.debian.org/";; \
echo "I: On Debian based systems, po4a can be installed with:"; \
echo "I: apt-get install po4a"; \
diff -Nru live-config-3.0.21/manpages/po/de/live-config.7.po live-config-3.0.22/manpages/po/de/live-config.7.po
diff -Nru live-config-3.0.21/manpages/po/es/live-config.7.po live-config-3.0.22/manpages/po/es/live-config.7.po
diff -Nru live-config-3.0.21/manpages/po/fr/live-config.7.po live-config-3.0.22/manpages/po/fr/live-config.7.po
diff -Nru live-config-3.0.21/manpages/po/it/live-config.7.po live-config-3.0.22/manpages/po/it/live-config.7.po
diff -Nru live-config-3.0.21/manpages/po/pt_BR/live-config.7.po live-config-3.0.22/manpages/po/pt_BR/live-config.7.po
diff -Nru live-config-3.0.21/manpages/pot/live-config.7.pot live-config-3.0.22/manpages/pot/live-config.7.pot
diff -Nru live-config-3.0.21/manpages/pt_BR/live-config.pt_BR.7 live-config-3.0.22/manpages/pt_BR/live-config.pt_BR.7
diff -Nru live-config-3.0.21/scripts/config/0040-sudo live-config-3.0.22/scripts/config/0040-sudo
--- live-config-3.0.21/scripts/config/0040-sudo 2013-02-15 04:28:48.000000000 -0400
+++ live-config-3.0.22/scripts/config/0040-sudo 2013-04-03 12:48:56.000000000 -0300
@@ -34,6 +34,13 @@
Configure_sudo ()
{
+ # Skip sudo configuration if username is root
+ case "${LIVE_USERNAME}" in
+ root)
+ return
+ ;;
+ esac
+
# Checking if package is already configured differently
if grep -qs "^${LIVE_USERNAME}" /etc/sudoers.d/live
then
diff -Nru live-config-3.0.21/scripts/config/1040-gnome-screensaver live-config-3.0.22/scripts/config/1040-gnome-screensaver
--- live-config-3.0.21/scripts/config/1040-gnome-screensaver 2013-02-15 04:28:48.000000000 -0400
+++ live-config-3.0.22/scripts/config/1040-gnome-screensaver 2013-04-03 12:48:56.000000000 -0300
@@ -35,7 +35,14 @@
Configure_gnome_screensaver ()
{
# Disabling to lock the screen when the screensaver goes active.
- sudo -u "${LIVE_USERNAME}" gconftool-2 -t bool -s /apps/gnome-screensaver/lock_enabled false
+ if [ -e /run ]
+ then
+ # wheezy
+ sudo -u "${LIVE_USERNAME}" gsettings set org.gnome.desktop.screensaver lock-enabled false
+ else
+ # squeeze
+ sudo -u "${LIVE_USERNAME}" gconftool-2 -t bool -s /apps/gnome-screensaver/lock_enabled false
+ fi
# Creating state file
touch /var/lib/live/config/gnome-screensaver
diff -Nru live-config-3.0.21/scripts/config.sh live-config-3.0.22/scripts/config.sh
--- live-config-3.0.21/scripts/config.sh 2013-02-15 04:28:48.000000000 -0400
+++ live-config-3.0.22/scripts/config.sh 2013-04-03 12:48:56.000000000 -0300
@@ -97,7 +97,7 @@
done
# Exclude shortcuts specific scripts
- case "${_NO_ROOT}" in
+ case "${_NOROOT}" in
true)
# Disable root access, no matter what mechanism
LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sudo,policykit"
diff -Nru live-config-3.0.21/VERSION live-config-3.0.22/VERSION
--- live-config-3.0.21/VERSION 2013-02-15 04:32:30.000000000 -0400
+++ live-config-3.0.22/VERSION 2013-04-03 12:48:56.000000000 -0300
@@ -1 +1 @@
-3.0.21-1
+3.0.22-1
Reply to: