Bug#686526: unblock: lightdm/1.2.2-4
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Hi release team,
once again, this is a pre-upload approval request. The upload would fix
two dependency bugs (#679538 and #684714) which are not really grave (or
don't really affect Wheezy), but they are mostly harmless.
The final fixed bug is currently RC, although it's upstart related so
I'm not sure if the severity is really adequate (especially since the
fix is to completely remove the upstart job).
There's a bit of noise into the diff which is made by removing a patch
not in debian/patches/series. It's harmless too, sorry for the noise.
Debdiff is attached.
Please unblock package lightdm
unblock lightdm/1.2.2-4
Regards,
--
Yves-Alexis
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-4-grsec-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru lightdm-1.2.2/debian/changelog lightdm-1.2.2/debian/changelog
--- lightdm-1.2.2/debian/changelog 2012-06-18 21:13:59.000000000 +0200
+++ lightdm-1.2.2/debian/changelog 2012-09-02 15:30:20.000000000 +0200
@@ -1,3 +1,14 @@
+lightdm (1.2.2-4) UNRELEASED; urgency=low
+
+ * debian/control:
+ - suggests upower. closes: #679538
+ - make lightdm depends on lightdm-gtk-greeter | lightdm-greeter, thanks
+ Ralf Jung for the report. closes: #684714
+ * debian/lightdm.install:
+ - stop installing lightdm upstart script since it's broken. closes: #679409
+
+ -- Yves-Alexis Perez <corsac@debian.org> Fri, 29 Jun 2012 17:16:58 +0200
+
lightdm (1.2.2-3) unstable; urgency=low
* debian/lightdm.pam:
diff -Nru lightdm-1.2.2/debian/control lightdm-1.2.2/debian/control
--- lightdm-1.2.2/debian/control 2012-04-06 21:32:04.000000000 +0200
+++ lightdm-1.2.2/debian/control 2012-08-27 14:37:55.000000000 +0200
@@ -19,9 +19,9 @@
Section: x11
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- lightdm-gtk-greeter | lightdm-qt-greeter, dbus, consolekit, adduser
+ lightdm-gtk-greeter | lightdm-greeter, dbus, consolekit, adduser
Recommends: xserver-xorg
-Suggests: accountsservice
+Suggests: accountsservice, upower
Provides: x-display-manager
Description: simple display manager
An X display manager that:
diff -Nru lightdm-1.2.2/debian/lightdm.install lightdm-1.2.2/debian/lightdm.install
--- lightdm-1.2.2/debian/lightdm.install 2011-10-08 13:34:11.000000000 +0200
+++ lightdm-1.2.2/debian/lightdm.install 2012-09-02 15:29:53.000000000 +0200
@@ -3,7 +3,6 @@
usr/share/man
usr/share/locale
etc/dbus-1
-etc/init
etc/lightdm/users.conf
etc/lightdm/lightdm.conf
etc/lightdm/keys.conf
diff -Nru lightdm-1.2.2/debian/patches/05_dont-add-pkglibexecdir-path.patch lightdm-1.2.2/debian/patches/05_dont-add-pkglibexecdir-path.patch
--- lightdm-1.2.2/debian/patches/05_dont-add-pkglibexecdir-path.patch 2012-01-17 21:46:58.000000000 +0100
+++ lightdm-1.2.2/debian/patches/05_dont-add-pkglibexecdir-path.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,41 +0,0 @@
-Author: Yves-Alexis Perez <corsac@debian.org>
-Description: don't add PKGLIBEXEC_DIR to the user PATH
-Index: lightdm-1.1.1/src/session.c
-===================================================================
---- lightdm-1.1.1.orig/src/session.c
-+++ lightdm-1.1.1/src/session.c
-@@ -217,26 +217,6 @@
- }
- }
-
--/* Insert our own utility directory to PATH
-- * This is to provide gdmflexiserver which provides backwards compatibility
-- * with GDM.
-- * Must be done after set_env_from_authentication because PAM sets PATH.
-- * This can be removed when this is no longer required.
-- */
--static void
--insert_utility_path (Session *session)
--{
-- const gchar *orig_path;
--
-- orig_path = session_get_env (session, "PATH");
-- if (orig_path)
-- {
-- gchar *path = g_strdup_printf ("%s:%s", PKGLIBEXEC_DIR, orig_path);
-- session_set_env (session, "PATH", path);
-- g_free (path);
-- }
--}
--
- gboolean
- session_start (Session *session)
- {
-@@ -438,7 +418,6 @@
- pam_session_setup (session->priv->authentication);
- set_env_from_authentication (session, session->priv->authentication);
- set_locale (session);
-- insert_utility_path (session);
-
- PROCESS_CLASS (session_parent_class)->run (process);
- }
diff -Nru lightdm-1.2.2/debian/rules lightdm-1.2.2/debian/rules
--- lightdm-1.2.2/debian/rules 2012-06-18 21:05:08.000000000 +0200
+++ lightdm-1.2.2/debian/rules 2012-09-02 16:12:16.000000000 +0200
@@ -14,7 +14,7 @@
override_dh_install:
find debian/tmp -name '*.la' -delete
rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/lightdm/gdmflexiserver
- dh_install --fail-missing
+ dh_install --fail-missing -X etc/init/lightdm.conf
override_dh_installpam:
dh_installpam
Reply to: