Update packaging

7 files changed, 108 insertions, 18 deletions

diff --git a/debian/changelog b/debian/changelog
index 81515f92..e4d59dde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,66 @@
+lightdm (1.7.9-0ubuntu1) saucy; urgency=low
+
+  * New upstream release:
+    - Correctly set XDG_VTNR for unity sessions that are not autologin.
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Tue, 30 Jul 2013 18:35:21 +0100
+
+lightdm (1.7.8-0ubuntu1) saucy; urgency=low
+
+  * New upstream release:
+    - Add support for Mir sessions and greeters.
+    - Set XDG_VTNR for unity sessions.
+    - Fix desktop-session-start upstart signal not being emitted since 1.7.5.
+    - Fix greeter log broken in 1.7.5.
+  * debian/liblightdm-gobject-1-0.symbols:
+    - Updated
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Tue, 30 Jul 2013 15:27:58 +0100
+
+lightdm (1.7.7-0ubuntu2) saucy; urgency=low
+
+  * debian/lightdm.init:
+    - Use correct path to daemon (LP: #1204713)
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Thu, 25 Jul 2013 14:25:48 +1200
+
+lightdm (1.7.7-0ubuntu1) saucy; urgency=low
+
+  * New upstream release:
+    - Fix uninitialized pointer introduced in 1.7.3
+    - Enable compile warnings and fix code generating warnings
+  * debian/patches/50_ubuntu_fix_uninitialised_pointer.patch:
+    - Applied upstream:
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Tue, 23 Jul 2013 11:23:47 +1200
+
+lightdm (1.7.6-0ubuntu2) saucy; urgency=low
+
+  * src/main.c: fix up an unitialised pointer in configuration directory
+    handling.  (LP: #1203711)
+
+ -- Andy Whitcroft <apw@canonical.com>  Mon, 22 Jul 2013 11:36:05 +0100
+
+lightdm (1.7.6-0ubuntu1) saucy; urgency=low
+
+  * New upstream release:
+    [ 1.7.6 ]
+    - Restore greeter hints that were regressed in 1.7.5.
+    - Don't run greeters through session wrapper - regression in 1.7.5    
+    [ 1.7.5 ]
+    - Quit Plymouth correctly when using the unity seat type (LP: #1192051)
+    - Release the VT when the system compositor fails to start
+    - Load sessions and greeters from /usr/share/lightdm/sessions and
+      /usr/share/lightdm/greeters. The existing directories are checked
+      if the sessions are not in these directories.
+    - Refactor the Display class so that it merges with the Seat class
+    - Support running the greeter and session in different display servers
+      instead of re-using the same one during a login.
+    - Add more regression tests
+    - Documentation fixes
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Mon, 22 Jul 2013 17:13:19 +1200
+
 lightdm (1.7.4-0ubuntu1) saucy; urgency=low
 
   * New upstream release:
diff --git a/debian/control b/debian/control
index 7d2b72a7..587bd56a 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,6 @@ Build-Depends: debhelper (>= 7.0.50~),
                gtk-doc-tools,
                yelp-tools,
                dbus,
-               python-gi,
 Homepage: https://launchpad.net/lightdm
 
 Package: lightdm
@@ -37,8 +36,7 @@ Depends: ${misc:Depends},
          adduser,
          libglib2.0-bin,
          dbus,
-         plymouth (>= 0.8.8-0ubuntu6.1),
-         unity-system-compositor,
+         plymouth (>= 0.8.8-0ubuntu6.1)
 Recommends: xserver-xorg,
             unity-greeter | lightdm-greeter | lightdm-kde-greeter
 Conflicts: liblightdm-gobject-0-0,
diff --git a/debian/liblightdm-gobject-1-0.symbols b/debian/liblightdm-gobject-1-0.symbols
index 43ad6a62..680d14a0 100644
--- a/debian/liblightdm-gobject-1-0.symbols
+++ b/debian/liblightdm-gobject-1-0.symbols
@@ -51,6 +51,7 @@ liblightdm-gobject-1.so.0 liblightdm-gobject-1-0 #MINVER#
  lightdm_session_get_comment@Base 0.9.2
  lightdm_session_get_key@Base 0.9.2
  lightdm_session_get_name@Base 0.9.2
+ lightdm_session_get_session_type@Base 1.7.8
  lightdm_session_get_type@Base 0.9.2
  lightdm_set_layout@Base 0.9.2
  lightdm_shutdown@Base 0.9.2
diff --git a/debian/lightdm.init b/debian/lightdm.init
index 091e3a37..b2b58c70 100644
--- a/debian/lightdm.init
+++ b/debian/lightdm.init
@@ -42,7 +42,7 @@ HEED_DEFAULT_DISPLAY_MANAGER=
 DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
-DAEMON=/usr/bin/lightdm
+DAEMON=/usr/sbin/lightdm
 PIDFILE=/var/run/lightdm.pid
 
 if [ -r /etc/default/locale ]; then
@@ -61,7 +61,7 @@ case "$1" in
   start)
     if [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] &&
        [ -e $DEFAULT_DISPLAY_MANAGER_FILE ] &&
-       [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "/usr/bin/lightdm" ]; then
+       [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "/usr/bin/lightdm" -a "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "/usr/sbin/lightdm" ]; then
       echo "Not starting X display manager (lightdm); it is not the default" \
         "display manager."
     else
diff --git a/debian/patches/04_language_handling.patch b/debian/patches/04_language_handling.patch
index 964cc3ee..4f9aa207 100644
--- a/debian/patches/04_language_handling.patch
+++ b/debian/patches/04_language_handling.patch
@@ -2,10 +2,10 @@ Description: Adjustments due to handling of languages
 Forwarded: not-needed
 Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
 
-Index: lightdm-1.7.4/liblightdm-gobject/language.c
+Index: lightdm-1.7.5/liblightdm-gobject/language.c
 ===================================================================
---- lightdm-1.7.4.orig/liblightdm-gobject/language.c	2013-07-01 15:49:32.086864815 +1200
-+++ lightdm-1.7.4/liblightdm-gobject/language.c	2013-07-01 15:49:32.082864815 +1200
+--- lightdm-1.7.5.orig/liblightdm-gobject/language.c	2013-07-22 11:11:11.049310128 +1200
++++ lightdm-1.7.5/liblightdm-gobject/language.c	2013-07-22 11:11:11.045310128 +1200
 @@ -40,7 +40,7 @@
  static void
  update_languages (void)
@@ -15,16 +15,40 @@ Index: lightdm-1.7.4/liblightdm-gobject/language.c
      gchar *stdout_text = NULL, *stderr_text = NULL;
      gint exit_status;
      gboolean result;
-Index: lightdm-1.7.4/src/display.c
+Index: lightdm-1.7.5/tests/scripts/language-env.conf
 ===================================================================
---- lightdm-1.7.4.orig/src/display.c	2013-07-01 15:49:32.086864815 +1200
-+++ lightdm-1.7.4/src/display.c	2013-07-01 15:49:32.082864815 +1200
-@@ -754,7 +754,7 @@
-     language = user_get_language (user);
-     if (language != NULL && language != '\0')
+--- lightdm-1.7.5.orig/tests/scripts/language-env.conf	2013-07-22 11:11:11.049310128 +1200
++++ lightdm-1.7.5/tests/scripts/language-env.conf	2013-07-22 11:11:11.045310128 +1200
+@@ -22,8 +22,8 @@
+ #?SESSION-X-0 CONNECT-XSERVER
+ 
+ # Check environment variables
+-#?*SESSION-X-0 READ-ENV NAME=LANG
+-#?SESSION-X-0 READ-ENV NAME=LANG VALUE=en_AU
++#?*SESSION-X-0 READ-ENV NAME=LANGUAGE
++#?SESSION-X-0 READ-ENV NAME=LANGUAGE VALUE=en_AU
+ #?*SESSION-X-0 READ-ENV NAME=GDM_LANG
+ #?SESSION-X-0 READ-ENV NAME=GDM_LANG VALUE=en_AU
+ 
+Index: lightdm-1.7.5/src/seat.c
+===================================================================
+--- lightdm-1.7.5.orig/src/seat.c	2013-07-22 09:38:03.000000000 +1200
++++ lightdm-1.7.5/src/seat.c	2013-07-22 11:11:23.677310505 +1200
+@@ -734,7 +734,7 @@
+         session_set_env (session, "GDMSESSION", session_name);
+         if (language && language[0] != '\0')
+         {
+-            session_set_env (session, "LANG", language);
++            session_set_env (session, "LANGUAGE", language);
+             session_set_env (session, "GDM_LANG", language);
+         }
+         session_set_pam_service (session, AUTOLOGIN_SERVICE);
+@@ -898,7 +898,7 @@
+     session_set_env (session, "GDMSESSION", session_name);
+     if (language && language[0] != '\0')
      {
--        session_set_env (display->priv->session, "LANG", language);
-+        session_set_env (display->priv->session, "LANGUAGE", language);
-         session_set_env (display->priv->session, "GDM_LANG", language);
+-        session_set_env (session, "LANG", language);
++        session_set_env (session, "LANGUAGE", language);
+         session_set_env (session, "GDM_LANG", language);
      }
  
diff --git a/debian/rules b/debian/rules
index 8330f581..662a0806 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,8 +13,9 @@ override_dh_autoreconf:
 override_dh_auto_configure:
 	dh_auto_configure -- --with-greeter-user=lightdm --with-user-session=ubuntu --enable-gtk-doc
 
-# Disable tests - they're not working in the PPA
 override_dh_auto_test:
+	# lightdm must be installed in prefix before tests will succeed, so we run
+	# them as a dep8 test instead of during build
 
 override_dh_install:
 	rm -r debian/tmp/usr/share/help/C/
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 00000000..a59dfd0b
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,3 @@
+#Tests: upstream-tests
+#Depends: @, python-gi, xauth
+#Restrictions: build-needed needs-root