[Pkg-xfce-commits] r5867 - in goodies/trunk/lightdm/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Mon Jul 25 06:45:46 UTC 2011
Author: corsac
Date: 2011-07-25 06:45:46 +0000 (Mon, 25 Jul 2011)
New Revision: 5867
Removed:
goodies/trunk/lightdm/debian/lightdm-python-gtk.install
Modified:
goodies/trunk/lightdm/debian/changelog
goodies/trunk/lightdm/debian/control
goodies/trunk/lightdm/debian/lightdm-gtk.install
goodies/trunk/lightdm/debian/lightdm-qt.install
goodies/trunk/lightdm/debian/lightdm-vala.install
goodies/trunk/lightdm/debian/lightdm.install
goodies/trunk/lightdm/debian/patches/02_default-config.patch
goodies/trunk/lightdm/debian/patches/03_quit-plymouth.patch
goodies/trunk/lightdm/debian/patches/series
goodies/trunk/lightdm/debian/rules
Log:
new upstream beta release 0.9.0:
* refresh patches, drop default path and min-vt (ported upstream)
* drop vala and python greeters, they're gone
* refresh install paths
Modified: goodies/trunk/lightdm/debian/changelog
===================================================================
--- goodies/trunk/lightdm/debian/changelog 2011-07-23 17:07:42 UTC (rev 5866)
+++ goodies/trunk/lightdm/debian/changelog 2011-07-25 06:45:46 UTC (rev 5867)
@@ -1,4 +1,4 @@
-lightdm (0.4.4-1) UNRELEASED; urgency=low
+lightdm (0.9.0-1) UNRELEASED; urgency=low
* Initial release. closes: #615591
Modified: goodies/trunk/lightdm/debian/control
===================================================================
--- goodies/trunk/lightdm/debian/control 2011-07-23 17:07:42 UTC (rev 5866)
+++ goodies/trunk/lightdm/debian/control 2011-07-25 06:45:46 UTC (rev 5867)
@@ -7,7 +7,7 @@
Simon Huggins <huggie at earth.li>
Build-Depends: debhelper (>= 7.0.50~), intltool, pkg-config, libglib2.0-dev,
libdbus-glib-1-dev, libxcb1-dev, libxdmcp-dev, libpam-dev, libxklavier-dev,
- libgtk2.0-dev, libck-connector-dev, gnome-doc-utils, libqt4-dev,
+ libgtk-3-dev, libck-connector-dev, gnome-doc-utils, libqt4-dev,
hardening-includes, valac, gobject-introspection
Standards-Version: 3.9.2
Homepage: https://launchpad.net/lightdm
@@ -41,8 +41,8 @@
Section: x11
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: simple display manager (Vala greeter)
- This package contains the Vala greeter for the lightdm display manager
+Description: simple display manager (Vala files)
+ This package contains the Vala files for the lightdm display manager
Package: lightdm-qt
Provides: lightdm-greeter
@@ -52,14 +52,6 @@
Description: simple display manager (Qt greeter)
This package contains the Qt greeter for the lightdm display manager
-Package: lightdm-python-gtk
-Provides: lightdm-greeter
-Section: x11
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python
-Description: simple display manager (PyGTK+ greeter)
- This package contains the PyGTK+ greeter for the lightdm display manager
-
Package: liblightdm-gobject-0-0
Section: libdevel
Architecture: any
Modified: goodies/trunk/lightdm/debian/lightdm-gtk.install
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-gtk.install 2011-07-23 17:07:42 UTC (rev 5866)
+++ goodies/trunk/lightdm/debian/lightdm-gtk.install 2011-07-25 06:45:46 UTC (rev 5867)
@@ -1,3 +1,3 @@
-usr/lib/lightdm/lightdm-example-gtk-greeter
-usr/share/lightdm-example-gtk-greeter/greeter.ui
-usr/share/lightdm/themes/example-gtk-gnome
+usr/sbin/lightdm-gtk-greeter
+usr/share/lightdm-gtk-greeter
+usr/share/xgreeters/lightdm-gtk-greeter.desktop
Deleted: goodies/trunk/lightdm/debian/lightdm-python-gtk.install
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-python-gtk.install 2011-07-23 17:07:42 UTC (rev 5866)
+++ goodies/trunk/lightdm/debian/lightdm-python-gtk.install 2011-07-25 06:45:46 UTC (rev 5867)
@@ -1,2 +0,0 @@
-usr/lib/lightdm/lightdm-example-python-gtk-greeter
-usr/share/lightdm/themes/example-python-gtk-gnome
Modified: goodies/trunk/lightdm/debian/lightdm-qt.install
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-qt.install 2011-07-23 17:07:42 UTC (rev 5866)
+++ goodies/trunk/lightdm/debian/lightdm-qt.install 2011-07-25 06:45:46 UTC (rev 5867)
@@ -1,2 +1,2 @@
-usr/lib/lightdm/lightdm-example-qt-greeter
-usr/share/lightdm/themes/example-qt-kde
+usr/sbin/lightdm-qt-greeter
+usr/share/xgreeters/lightdm-qt-greeter.desktop
Modified: goodies/trunk/lightdm/debian/lightdm-vala.install
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-vala.install 2011-07-23 17:07:42 UTC (rev 5866)
+++ goodies/trunk/lightdm/debian/lightdm-vala.install 2011-07-25 06:45:46 UTC (rev 5867)
@@ -1,3 +1 @@
-usr/share/vala/vapi/liblightdm-gobject-0.vapi
-usr/lib/lightdm/lightdm-example-vala-gtk-greeter
-usr/share/lightdm/themes/example-vala-gtk-gnome/
+usr/share/vala
Modified: goodies/trunk/lightdm/debian/lightdm.install
===================================================================
--- goodies/trunk/lightdm/debian/lightdm.install 2011-07-23 17:07:42 UTC (rev 5866)
+++ goodies/trunk/lightdm/debian/lightdm.install 2011-07-25 06:45:46 UTC (rev 5867)
@@ -1,3 +1,3 @@
etc
-usr/bin
+usr/sbin/lightdm
usr/share/man
Modified: goodies/trunk/lightdm/debian/patches/02_default-config.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/02_default-config.patch 2011-07-23 17:07:42 UTC (rev 5866)
+++ goodies/trunk/lightdm/debian/patches/02_default-config.patch 2011-07-25 06:45:46 UTC (rev 5867)
@@ -3,42 +3,27 @@
Description: adapt config to Debian
Especially:
-* use X11 session wraper
+* use X11 session wrapper
* start on vt7
* don't show userlist
-* disable DMCP
=== modified file 'data/lightdm.conf'
-Index: lightdm-0.4.0/data/lightdm.conf
+Index: lightdm-0.9.0/data/lightdm.conf
===================================================================
---- lightdm-0.4.0.orig/data/lightdm.conf 2011-06-27 18:43:17.805498735 +0200
-+++ lightdm-0.4.0/data/lightdm.conf 2011-06-27 18:43:43.112623806 +0200
-@@ -28,9 +28,9 @@
- #cache-directory=/var/cache/lightdm
+--- lightdm-0.9.0.orig/data/lightdm.conf 2011-07-24 09:23:56.000000000 +0200
++++ lightdm-0.9.0/data/lightdm.conf 2011-07-25 07:51:02.771167808 +0200
+@@ -54,11 +54,11 @@
#xsessions-directory=/usr/share/xsessions
- #default-xsession=
--#session-wrapper=/etc/X11/Xsession
+ #xgreeters-directory=/usr/share/xgreeters
+ #greeter-session=example-gtk-gnome
+-#greeter-hide-users=false
+-#user-session=default
++greeter-hide-users=true
++user-session=xfce
+ #allow-guest=true
+ #guest-session=UNIMPLEMENTED
+-#session-wrapper=lightdm-session
+session-wrapper=/etc/X11/Xsession
- #minimum-display-number=0
--#minimum-vt=7
-+minimum-vt=7
- #user-authority-in-system-dir=false
- seats=seat-0
-
-@@ -82,7 +82,7 @@ seats=seat-0
- # hidden-shells = Shells that indicate a user cannot login
- #
- [UserManager]
--#load-users=true
-+load-users=false
- #minimum-uid=500
- #hidden-users=nobody nobody4 noaccess
- #hidden-shells=/bin/false /usr/sbin/nologin
-@@ -112,6 +112,6 @@ seats=seat-0
- # it can be a word and the first 7 characters are used as the key.
- #
- [xdmcp]
--#enabled=false
-+enabled=false
- #port=177
- #key=0x0123456789ABCD
+ #autologin-guest=false
+ #autologin-user=
+ #autologin-user-timeout=0
Modified: goodies/trunk/lightdm/debian/patches/03_quit-plymouth.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/03_quit-plymouth.patch 2011-07-23 17:07:42 UTC (rev 5866)
+++ goodies/trunk/lightdm/debian/patches/03_quit-plymouth.patch 2011-07-25 06:45:46 UTC (rev 5867)
@@ -4,16 +4,16 @@
plymouth has been deactivated before, so just quit it for now.
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632737
Bug: https://bugs.launchpad.net/ubuntu/+source/lightdm/+bug/799069
-diff --git a/src/display-manager.c b/src/display-manager.c
-index c8f5f32..5191fcc 100644
---- a/src/display-manager.c
-+++ b/src/display-manager.c
-@@ -616,7 +616,7 @@ display_manager_start (DisplayManager *manager)
- plymouth_on_active_vt = plymouth_command_returns_true ("--has-active-vt");
-
- /* Deactivate stops Plymouth from drawing, as we are about to start an X server to replace it */
-- plymouth_run_command ("deactivate", NULL);
-+ plymouth_run_command ("quit", NULL);
- }
-
- /* Start each static display */
+Index: lightdm-0.9.0/src/xserver-local.c
+===================================================================
+--- lightdm-0.9.0.orig/src/xserver-local.c 2011-07-25 07:55:08.527604600 +0200
++++ lightdm-0.9.0/src/xserver-local.c 2011-07-25 07:55:14.207707242 +0200
+@@ -115,7 +115,7 @@
+ g_debug ("X server %s will replace Plymouth", xserver_get_address (XSERVER (self)));
+ self->priv->replacing_plymouth = TRUE;
+ self->priv->vt = active_vt;
+- plymouth_deactivate ();
++ plymouth_quit (FALSE);
+ }
+ else
+ g_debug ("Plymouth is running on VT %d, but this is less than the configured minimum of %d so not replacing it", active_vt, vt_get_min ());
Modified: goodies/trunk/lightdm/debian/patches/series
===================================================================
--- goodies/trunk/lightdm/debian/patches/series 2011-07-23 17:07:42 UTC (rev 5866)
+++ goodies/trunk/lightdm/debian/patches/series 2011-07-25 06:45:46 UTC (rev 5867)
@@ -1,4 +1,2 @@
-01_set-default-path.patch
02_default-config.patch
03_quit-plymouth.patch
-05_enforce-min-vt.patch
Modified: goodies/trunk/lightdm/debian/rules
===================================================================
--- goodies/trunk/lightdm/debian/rules 2011-07-23 17:07:42 UTC (rev 5866)
+++ goodies/trunk/lightdm/debian/rules 2011-07-25 06:45:46 UTC (rev 5867)
@@ -12,9 +12,6 @@
export CFLAGS CXXFLAGS LDFLAGS
-override_dh_auto_configure:
- dh_auto_configure -- --with-greeter-user=lightdm --with-default-xsession=xfce
-
override_dh_installinit:
dh_installinit --noscripts
More information about the Pkg-xfce-commits
mailing list