new upstream release

* refresh patches
* drop webkit greeter, add pygtk and vala one
* use --fail-missing
* remove .la files

git-svn-id: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/lightdm@5371 0c9b3bff-18ee-0310-b944-d1aa2700132f

diff --git a/debian/changelog b/debian/changelog
index 0e989500778102f5f8521707cbefcc4aff7e1763..881692e7c5ea0c47678d7a4e1acaa26fd8c8e1b4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-lightdm (0.2.3-1) unstable; urgency=low
+lightdm (0.3.0-1) UNRELEASED; urgency=low
 
   * Initial release.                                            closes: #615591
 

diff --git a/debian/control b/debian/control
index 51c22cc12f06c46763374c0753fc372c5efdcec7..098fa88b68f706da701f5ca66fc9a84dfa401332 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,9 +7,9 @@ Uploaders: Evgeni Golov <evgeni@debian.org>,
  Simon Huggins <huggie@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,28 +19,46 @@ Package: lightdm
 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 (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 (webkit greeter)
- This package contains the webkit greeter for the lightdm display manager
+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

diff --git a/debian/lightdm-gtk.install b/debian/lightdm-gtk.install
index d6ea59fa9ac855a9ed817c48cccb67046a437e57..c3fe698b4ab10d9b41a36e8c72220760ba225229 100644 (file)
--- a/debian/lightdm-gtk.install
+++ b/debian/lightdm-gtk.install
@@ -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

diff --git a/debian/lightdm-python-gtk.install b/debian/lightdm-python-gtk.install
new file mode 100644 (file)
index 0000000..2a79a33
--- /dev/null
+++ b/debian/lightdm-python-gtk.install
@@ -0,0 +1,2 @@
+usr/lib/lightdm/lightdm-python-gtk-greeter
+usr/share/lightdm/themes/example-python-gtk-gnome

diff --git a/debian/lightdm-qt.install b/debian/lightdm-qt.install
index af1895b76b08a3742042b40eae1d2561f691b4b3..ca8e6d235cc2e1774e908aa12b128c47ffa5f725 100644 (file)
--- a/debian/lightdm-qt.install
+++ b/debian/lightdm-qt.install
@@ -1 +1,2 @@
-usr/lib/lightdm/ldm-qt-greeter
+usr/lib/lightdm/lightdm-qt-greeter
+usr/share/lightdm/themes/example-qt-kde

diff --git a/debian/lightdm-vala.install b/debian/lightdm-vala.install
new file mode 100644 (file)
index 0000000..d9cd8e1
--- /dev/null
+++ b/debian/lightdm-vala.install
@@ -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/

diff --git a/debian/lightdm-webkit.install b/debian/lightdm-webkit.install
deleted file mode 100644 (file)
index eb6c3dc..0000000
--- a/debian/lightdm-webkit.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/lightdm/ldm-webkit-greeter
-usr/share/lightdm/themes/webkit

diff --git a/debian/patches/02_default-config.patch b/debian/patches/02_default-config.patch
index 565502d4d7a3b55937d9182eac61b08a6ef682d3..d207b6825f4a9b7d9e7c9afcfa135df3b6568916 100644 (file)
--- a/debian/patches/02_default-config.patch
+++ b/debian/patches/02_default-config.patch
@@ -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
-

diff --git a/debian/patches/04_fix_xauthority-path.patch b/debian/patches/04_fix_xauthority-path.patch
index c1243e39a0554869fce32e1c1db1e5004c6eca42..03752a522f095732e4ae6146cd15d147a2acf7e1 100644 (file)
--- a/debian/patches/04_fix_xauthority-path.patch
+++ b/debian/patches/04_fix_xauthority-path.patch
@@ -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));
-+
-+        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);
-+        }
+@@ -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;
 +
-         // 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);
-
+   

diff --git a/debian/patches/series b/debian/patches/series
index 78a536717af10b9c67b7cd41ed77b30a0156e2a8..77a9837bb7a0608656c4ae4d2c78bbcb3159b3cc 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-01_initgroups.patch
 02_default-config.patch
 04_fix_xauthority-path.patch

diff --git a/debian/rules b/debian/rules
index 35848c1b0e8a525b331ef507d1749ef3bc32a123..1ef2764cf2ee4d626925390395797b8d55500fbf 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -10,11 +10,17 @@ CFLAGS+=$(HARDENING_CFLAGS)
 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 $@