[Pkg-xfce-commits] r5371 - in goodies/trunk/lightdm/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Mon Apr 18 02:19:21 UTC 2011
Author: corsac
Date: 2011-04-18 14:19:16 +0000 (Mon, 18 Apr 2011)
New Revision: 5371
Added:
goodies/trunk/lightdm/debian/lightdm-python-gtk.install
goodies/trunk/lightdm/debian/lightdm-vala.install
Removed:
goodies/trunk/lightdm/debian/lightdm-webkit.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/patches/02_default-config.patch
goodies/trunk/lightdm/debian/patches/04_fix_xauthority-path.patch
goodies/trunk/lightdm/debian/patches/series
goodies/trunk/lightdm/debian/rules
Log:
new upstream release
* refresh patches
* drop webkit greeter, add pygtk and vala one
* use --fail-missing
* remove .la files
Modified: goodies/trunk/lightdm/debian/changelog
===================================================================
--- goodies/trunk/lightdm/debian/changelog 2011-04-18 06:35:58 UTC (rev 5370)
+++ goodies/trunk/lightdm/debian/changelog 2011-04-18 14:19:16 UTC (rev 5371)
@@ -1,4 +1,4 @@
-lightdm (0.2.3-1) unstable; urgency=low
+lightdm (0.3.0-1) UNRELEASED; urgency=low
* Initial release. closes: #615591
Modified: goodies/trunk/lightdm/debian/control
===================================================================
--- goodies/trunk/lightdm/debian/control 2011-04-18 06:35:58 UTC (rev 5370)
+++ goodies/trunk/lightdm/debian/control 2011-04-18 14:19:16 UTC (rev 5371)
@@ -7,9 +7,9 @@
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, libwebkit-dev, libck-connector-dev, gnome-doc-utils, libqt4-dev,
- hardening-includes
-Standards-Version: 3.9.1
+ libgtk2.0-dev, libck-connector-dev, gnome-doc-utils, libqt4-dev,
+ hardening-includes, valac, gobject-introspection
+Standards-Version: 3.9.2
Homepage: https://launchpad.net/lightdm
Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/lightdm
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/lightdm
@@ -19,29 +19,47 @@
Section: xfce
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- lightdm-gtk | lightdm-webkit | lightdm-qt, dbus, consolekit, adduser
+ lightdm-gtk | lightdm-greeter, dbus, consolekit, adduser
Description: simple display manager
An X display manager that:
* Has a lightweight codebase
* Is standards compliant (PAM, ConsoleKit, etc)
* Has a well defined interface between the server and user interface
- * Fully themeable (easiest with the webkit interface)
+ * Fully themeable
* Cross-desktop (greeters can be written in any toolkit)
Package: lightdm-gtk
+Provides: lightdm-greeter
Section: xfce
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: simple display manager (GTK+ greeter)
This package contains the GTK+ greeter for the lightdm display manager
-Package: lightdm-webkit
-Section: x11
+Package: lightdm-vala
+Provides: lightdm-greeter
+Section: xfce
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: simple display manager (webkit greeter)
- This package contains the webkit greeter for the lightdm display manager
+Description: simple display manager (Vala greeter)
+ This package contains the Vala greeter for the lightdm display manager
+Package: lightdm-qt
+Provides: lightdm-greeter
+Section: xfce
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+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: xfce
+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-04-18 06:35:58 UTC (rev 5370)
+++ goodies/trunk/lightdm/debian/lightdm-gtk.install 2011-04-18 14:19:16 UTC (rev 5371)
@@ -1,2 +1,2 @@
-usr/lib/lightdm/ldm-gtk-greeter
-usr/share/lightdm/themes/gnome
+usr/lib/lightdm/lightdm-gtk-greeter
+usr/share/lightdm/themes/example-gtk-gnome
Added: goodies/trunk/lightdm/debian/lightdm-python-gtk.install
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-python-gtk.install (rev 0)
+++ goodies/trunk/lightdm/debian/lightdm-python-gtk.install 2011-04-18 14:19:16 UTC (rev 5371)
@@ -0,0 +1,2 @@
+usr/lib/lightdm/lightdm-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-04-18 06:35:58 UTC (rev 5370)
+++ goodies/trunk/lightdm/debian/lightdm-qt.install 2011-04-18 14:19:16 UTC (rev 5371)
@@ -1 +1,2 @@
-usr/lib/lightdm/ldm-qt-greeter
+usr/lib/lightdm/lightdm-qt-greeter
+usr/share/lightdm/themes/example-qt-kde
Added: goodies/trunk/lightdm/debian/lightdm-vala.install
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-vala.install (rev 0)
+++ goodies/trunk/lightdm/debian/lightdm-vala.install 2011-04-18 14:19:16 UTC (rev 5371)
@@ -0,0 +1,3 @@
+usr/share/vala/vapi/lightdm-0.vapi
+usr/lib/lightdm/lightdm-vala-gtk-greeter
+usr/share/lightdm/themes/example-vala-gtk-gnome/
Deleted: goodies/trunk/lightdm/debian/lightdm-webkit.install
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-webkit.install 2011-04-18 06:35:58 UTC (rev 5370)
+++ goodies/trunk/lightdm/debian/lightdm-webkit.install 2011-04-18 14:19:16 UTC (rev 5371)
@@ -1,2 +0,0 @@
-usr/lib/lightdm/ldm-webkit-greeter
-usr/share/lightdm/themes/webkit
Modified: goodies/trunk/lightdm/debian/patches/02_default-config.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/02_default-config.patch 2011-04-18 06:35:58 UTC (rev 5370)
+++ goodies/trunk/lightdm/debian/patches/02_default-config.patch 2011-04-18 14:19:16 UTC (rev 5371)
@@ -1,6 +1,8 @@
=== modified file 'data/lightdm.conf'
---- lightdm/data/lightdm.conf 2010-11-17 03:23:08 +0000
-+++ lightdm/data/lightdm.conf 2010-12-04 16:05:01 +0000
+Index: lightdm-0.3.0/data/lightdm.conf
+===================================================================
+--- lightdm-0.3.0.orig/data/lightdm.conf 2011-04-16 10:16:26.000000000 +0200
++++ lightdm-0.3.0/data/lightdm.conf 2011-04-18 14:44:13.498641953 +0200
@@ -9,9 +9,9 @@
#
[LightDM]
@@ -13,6 +15,15 @@
displays=default-display
#
+@@ -31,7 +31,7 @@
+ # key = Authentication key to use
+ #
+ [default-display]
+-#vt=
++vt=7
+ #layout=us
+ #greeter-theme=example-gtk-gnome
+ #greeter-user=lightdm
@@ -54,7 +54,7 @@
# hidden-shells = Shells that indicate a user cannot login
#
@@ -30,4 +41,3 @@
+enabled=false
#port=177
#key=0x0123456789ABCD
-
Modified: goodies/trunk/lightdm/debian/patches/04_fix_xauthority-path.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/04_fix_xauthority-path.patch 2011-04-18 06:35:58 UTC (rev 5370)
+++ goodies/trunk/lightdm/debian/patches/04_fix_xauthority-path.patch 2011-04-18 14:19:16 UTC (rev 5371)
@@ -1,11 +1,11 @@
-=== modified file 'src/display-manager.c'
---- lightdm/src/display-manager.c 2010-11-17 03:23:08 +0000
-+++ lightdm/src/display-manager.c 2010-12-04 15:38:08 +0000
-@@ -146,36 +146,44 @@
- session_set_env (session, "LDM_DISPLAY", string);
- g_free (string);
+Index: lightdm-0.3.0/src/display-manager.c
+===================================================================
+--- lightdm-0.3.0.orig/src/display-manager.c 2011-04-16 10:16:26.000000000 +0200
++++ lightdm-0.3.0/src/display-manager.c 2011-04-18 15:23:49.470536842 +0200
+@@ -144,14 +144,6 @@
+ }
-- authorization = xserver_get_authorization (display_get_xserver (display));
+ authorization = xserver_get_authorization (display_get_xserver (display));
- if (authorization)
- {
- gchar *path;
@@ -14,14 +14,13 @@
- session_set_authorization (session, authorization, path);
- g_free (path);
- }
--
+
if (is_greeter)
{
- gchar *filename;
+@@ -159,6 +151,14 @@
filename = g_strdup_printf ("%s-greeter.log", xserver_get_address (display_get_xserver (display)));
- string = g_build_filename (manager->priv->log_dir, filename, NULL);
+ log_filename = g_build_filename (manager->priv->log_dir, filename, NULL);
g_free (filename);
-+ authorization = xserver_get_authorization (display_get_xserver (display));
+ if (authorization)
+ {
+ gchar *path;
@@ -30,38 +29,21 @@
+ session_set_authorization (session, authorization, path);
+ g_free (path);
+ }
-+
}
else
{
-+ struct passwd *user_info = getpwnam (session_get_username (session));
-+ if (user_info)
-+ string = g_build_filename (user_info->pw_dir, ".xsession-errors", NULL);
-+ else
-+ g_warning ("Failed to get user info for user '%s'", session_get_username (session));
+@@ -172,6 +172,14 @@
+ log_filename = g_build_filename (user_info->pw_dir, ".xsession-errors", NULL);
+ else
+ g_warning ("Failed to get user info for user '%s'", session_get_username (session));
++ if (authorization)
++ {
++ gchar *path;
+
-+ authorization = xserver_get_authorization (display_get_xserver (display));
-+ if (authorization)
-+ {
-+ gchar *path;
-+
-+ path = g_build_filename(user_info->pw_dir, ".Xauthority", NULL);
-+ session_set_authorization (session, authorization, path);
-+ g_free (path);
-+ }
-+
- // FIXME: Copy old error file
- if (manager->priv->test_mode)
- string = g_strdup (".xsession-errors");
-- else
-- {
-- struct passwd *user_info = getpwnam (session_get_username (session));
-- if (user_info)
-- string = g_build_filename (user_info->pw_dir, ".xsession-errors", NULL);
-- else
-- g_warning ("Failed to get user info for user '%s'", session_get_username (session));
-- }
++ path = g_build_filename(user_info->pw_dir, ".Xauthority", NULL);
++ session_set_authorization (session, authorization, path);
++ g_free (path);
++ }
+ }
}
- g_debug ("Logging to %s", string);
- session_set_log_file (session, string);
-
+
Modified: goodies/trunk/lightdm/debian/patches/series
===================================================================
--- goodies/trunk/lightdm/debian/patches/series 2011-04-18 06:35:58 UTC (rev 5370)
+++ goodies/trunk/lightdm/debian/patches/series 2011-04-18 14:19:16 UTC (rev 5371)
@@ -1,3 +1,2 @@
-01_initgroups.patch
02_default-config.patch
04_fix_xauthority-path.patch
Modified: goodies/trunk/lightdm/debian/rules
===================================================================
--- goodies/trunk/lightdm/debian/rules 2011-04-18 06:35:58 UTC (rev 5370)
+++ goodies/trunk/lightdm/debian/rules 2011-04-18 14:19:16 UTC (rev 5371)
@@ -10,11 +10,17 @@
CXXFLAGS+=$(HARDENING_CFLAGS)
LDFLAGS+=$(HARDENING_LDFLAGS)
+export CFLAGS CXXFLAGS LDFLAGS
+
override_dh_auto_configure:
dh_auto_configure -- --with-greeter-user=lightdm --with-default-session=xfce
override_dh_installinit:
dh_installinit --noscripts
+override_dh_install:
+ find debian/tmp -name '*.la' -delete
+ dh_install --fail-missing
+
%:
dh $@
More information about the Pkg-xfce-commits
mailing list