Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
Please unblock package lsb
I has two minor fixes, one for the upstart support (to avoid spitting warnings
when it's not running: #682032 )and one to cope better with the libqt3-mt
removal. Debdiff is attached.
unblock lsb/4.1+Debian8
Cheers,
OdyX
diff -Nru lsb-4.1+Debian7/0001-Revert-Allow-FANCYTTY-to-be-sourced-from-etc-default.patch lsb-4.1+Debian8/0001-Revert-Allow-FANCYTTY-to-be-sourced-from-etc-default.patch
--- lsb-4.1+Debian7/0001-Revert-Allow-FANCYTTY-to-be-sourced-from-etc-default.patch 2012-05-30 19:40:26.0 +0200
+++ lsb-4.1+Debian8/0001-Revert-Allow-FANCYTTY-to-be-sourced-from-etc-default.patch 1970-01-01 01:00:00.0 +0100
@@ -1,62 +0,0 @@
-From 7fc087dfd985e7e6e12659637b268129f60605de Mon Sep 17 00:00:00 2001
-From: Didier Raboud
-Date: Wed, 30 May 2012 16:01:53 +0200
-Subject: [PATCH] Revert "Allow FANCYTTY to be sourced from /etc/default/rcS."
-
-This reverts commit ce9dcceef7745798cf92b2aac03164818b79ce63.
-
-This avoids one ugly `set +u` in the $() subshell and avoids the hijack of /etc/default/rcS.
-
-Reopens: #673207
-
-Closes: #675162
-Reported-by: Kamen Naydenov
-Closes: #675197
-Reported-by: Steve Cotton
-Thanks-To: Julien Cristau
- debian/lsb-base.NEWS |2 +-
- debian/lsb-base.README.Debian |3 ++-
- init-functions|2 +-
- 3 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/debian/lsb-base.NEWS b/debian/lsb-base.NEWS
-index 40c30fe..476ddc6 100644
a/debian/lsb-base.NEWS
-+++ b/debian/lsb-base.NEWS
-@@ -12,6 +12,6 @@ lsb (4.1+Debian1) unstable; urgency=low
- or a red [FAIL] depending on the daemon exit status.
-
- The "Fancy output" can be disabled by setting the FANCYTTY variable to 0
-- in the /etc/default/rcS configuration file.
-+ in the /etc/lsb-base-logging.sh configuration file.
-
- -- Didier Raboud Thu, 19 Apr 2012 11:25:01 +0200
-diff --git a/debian/lsb-base.README.Debian b/debian/lsb-base.README.Debian
-index 2a3637c..3f86d93 100644
a/debian/lsb-base.README.Debian
-+++ b/debian/lsb-base.README.Debian
-@@ -193,7 +193,8 @@ Bourne-style shell permitted by Debian policy (i.e. not just bash).
-
- - FANCY OUTPUT
-
--"Fancy output" can be overridden by setting FANCYTTY=0 in /etc/default/rcS.
-+"Fancy output" can be overridden by setting FANCYTTY=0 in
-+/etc/lsb-base-logging.sh .
-
- - OUTPUT FUNCTIONS
-
-diff --git a/init-functions b/init-functions
-index d8a7e98..0bfea9e 100644
a/init-functions
-+++ b/init-functions
-@@ -425,5 +425,5 @@ for hook in $(run-parts --lsbsysinit --list /lib/lsb/init-functions.d 2>/dev/nul
- [ -r $hook ] && . $hook || true
- done
-
--FANCYTTY=$([ -e /etc/default/rcS ] && . /etc/default/rcS && echo $FANCYTTY)
-+FANCYTTY=
- [ -e /etc/lsb-base-logging.sh ] && . /etc/lsb-base-logging.sh || true
---
-1.7.2.5
-
diff -Nru lsb-4.1+Debian7/debian/changelog lsb-4.1+Debian8/debian/changelog
--- lsb-4.1+Debian7/debian/changelog 2012-06-10 23:19:00.0 +0200
+++ lsb-4.1+Debian8/debian/changelog 2012-11-05 12:08:22.0 +0100
@@ -1,3 +1,11 @@
+lsb (4.1+Debian8) unstable; urgency=low
+
+ * Fix libqt3-mt missing epoch.
+ * Hide the stderr output of $(initctl version) in init_is_upstart.
+(Closes: #682032)
+
+ -- Didier Raboud Mon, 05 Nov 2012 12:03:33 +0100
+
lsb (4.1+Debian7) unstable; urgency=low
* lsb-desktop: Demote Qt3 dependency to a Recommends. Closes: #604360
diff -Nru lsb-4.1+Debian7/debian/control lsb-4.1+Debian8/debian/control
--- lsb-4.1+Debian7/debian/control 2012-06-10 23:15:34.0 +0200
+++ lsb-4.1+Debian8/debian/control 2012-11-02 10:49:47.0 +0100
@@ -150,7 +150,7 @@
libnss3-1d,
${misc:Depends}
# libqt4-sql-sqlite is Not strictly needed by LSB, but the tests want a valid database handler
-Recommends: libqt3-mt (>= 3.3.6)
+Recommends: libqt3-mt (>= 3:3.3.6)
Provides: lsb-desktop-noarch, lsb-qt4, lsb-qt4-noarch, ${provides}
Description: Linux Standard Base 4.1 Desktop support package
The Linux Standard Base (http://www.linuxbase.org/) is a standard
diff -Nru lsb-4.1+Debian7/init-functions lsb-4.1+Debian8/init-functions
--- lsb-4.1+Debian7/init-functions 2012-05-30 16:01:53.0 +0200
+++ lsb-4.1+Debian8/init-functions 2012-11-02 10:49:48.0 +0100
@@ -264,7 +264,7 @@
# upstart job, it should generally exit non-zero in this case.
init_is_upstart()
{
- if [ -x /sbin/initctl ] && /sbin/initctl version | /bin/grep -q upstart; then
+ if [ -x /sbin/initctl ] && /sbin/initctl version 2>/dev/null | /bin/grep -q upstart; then
return 0
fi
return 1
