Final debian packaging fixes

diff --git a/debian/control b/debian/control
index 587bd56a5de0006965f0b8c2894ffd7e6d5521e2..72ad870d5f15228a94f704b15ba27fd5ca9fc15f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -25,10 +25,13 @@ Build-Depends: debhelper (>= 7.0.50~),
                yelp-tools,
                dbus,
 Homepage: https://launchpad.net/lightdm
+# If you aren't a member of ~lightdm-team but need to upload packaging changes,
+# just go ahead.  ~lightdm-team will notice and sync up the code again.
+Vcs-Bzr: https://code.launchpad.net/~lightdm-team/lightdm/trunk
 
 Package: lightdm
 Architecture: any
-Pre-Depends: dpkg (>= 1.15.7.2)
+Pre-Depends: dpkg (>= 1.15.7.2),
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libpam-runtime (>= 0.76-14),
@@ -36,11 +39,11 @@ Depends: ${misc:Depends},
          adduser,
          libglib2.0-bin,
          dbus,
-         plymouth (>= 0.8.8-0ubuntu6.1)
+         plymouth (>= 0.8.8-0ubuntu6.1),
 Recommends: xserver-xorg,
-            unity-greeter | lightdm-greeter | lightdm-kde-greeter
+            unity-greeter | lightdm-greeter | lightdm-kde-greeter,
 Conflicts: liblightdm-gobject-0-0,
-           liblightdm-qt-0-0
+           liblightdm-qt-0-0,
 Provides: x-display-manager
 Description: Display Manager
  LightDM is a X display manager that:

diff --git a/debian/patches/04_language_handling.patch b/debian/patches/04_language_handling.patch
index 4f9aa207d9e86b533e9cf20e4cd5c36771827dd7..1babc4fa542727307732b51d8ad8458886ade355 100644 (file)
--- 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.5/liblightdm-gobject/language.c
+Index: debian-packaging/liblightdm-gobject/language.c
 ===================================================================
---- 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
+--- debian-packaging.orig/liblightdm-gobject/language.c        2013-08-19 15:50:47.471549008 +1200
++++ debian-packaging/liblightdm-gobject/language.c     2013-08-19 15:50:47.463549008 +1200
 @@ -40,7 +40,7 @@
  static void
  update_languages (void)
@@ -15,10 +15,10 @@ Index: lightdm-1.7.5/liblightdm-gobject/language.c
      gchar *stdout_text = NULL, *stderr_text = NULL;
      gint exit_status;
      gboolean result;
-Index: lightdm-1.7.5/tests/scripts/language-env.conf
+Index: debian-packaging/tests/scripts/language-env.conf
 ===================================================================
---- 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
+--- debian-packaging.orig/tests/scripts/language-env.conf      2013-08-19 15:50:47.471549008 +1200
++++ debian-packaging/tests/scripts/language-env.conf   2013-08-19 15:50:47.463549008 +1200
 @@ -22,8 +22,8 @@
  #?SESSION-X-0 CONNECT-XSERVER
  
@@ -30,11 +30,11 @@ Index: lightdm-1.7.5/tests/scripts/language-env.conf
  #?*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
+Index: debian-packaging/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 @@
+--- debian-packaging.orig/src/seat.c   2013-08-19 15:50:47.471549008 +1200
++++ debian-packaging/src/seat.c        2013-08-19 15:50:47.467549008 +1200
+@@ -782,7 +782,7 @@
          session_set_env (session, "GDMSESSION", session_name);
          if (language && language[0] != '\0')
          {
@@ -43,7 +43,7 @@ Index: lightdm-1.7.5/src/seat.c
              session_set_env (session, "GDM_LANG", language);
          }
          session_set_pam_service (session, AUTOLOGIN_SERVICE);
-@@ -898,7 +898,7 @@
+@@ -958,7 +958,7 @@
      session_set_env (session, "GDMSESSION", session_name);
      if (language && language[0] != '\0')
      {

diff --git a/debian/rules b/debian/rules
index 662a0806dcfa5b964545e50f3161d792139e7ecb..7c7d8eedc3edef08ad87cce9a4cdc854f8873409 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -14,8 +14,7 @@ override_dh_auto_configure:
        dh_auto_configure -- --with-greeter-user=lightdm --with-user-session=ubuntu --enable-gtk-doc
 
 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
+       DEBUG=1 dh_auto_test || { cat tests/test-suite.log; exit 1; }
 
 override_dh_install:
        rm -r debian/tmp/usr/share/help/C/