]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Merge packaging with saucy latest
authorRobert Ancell <robert.ancell@canonical.com>
Wed, 19 Jun 2013 01:24:22 +0000 (13:24 +1200)
committerRobert Ancell <robert.ancell@canonical.com>
Wed, 19 Jun 2013 01:24:22 +0000 (13:24 +1200)
debian/changelog
debian/control
debian/liblightdm-qt-dev.install [moved from debian/liblightdm-qt-3-dev.install with 100% similarity]
debian/lightdm.postinst
debian/patches/01_transition_ubuntu2d_ubuntu_desktop.patch
debian/patches/03_launch_dbus.patch
debian/patches/04_language_handling.patch [new file with mode: 0644]
debian/patches/04_language_options.patch [deleted file]
debian/patches/05_add_xserver_core_option.patch
debian/patches/series
debian/rules

index f8b75cdffa8ccd102a8f6d320095245177475185..7ad8f5d2e9a148218b1fda485ffb359842649caa 100644 (file)
@@ -1,5 +1,60 @@
-lightdm (1.7.0-0ubuntu1~ppa1) saucy; urgency=low
+lightdm (1.7.2-0ubuntu1) saucy; urgency=low
 
+  * New upstream release:
+    - Fix .pc file for liblightdm-qt5-3
+    - Add a new option "autologin-in-background" which lets an autologin happen
+      in a second display while still showing the greeter.
+    - Stop if fail to create default seat
+    - Add option to set seat type in lightdm-set-defaults
+    - Stop using g_file_set_contents - it can leave intermediate files around
+    - Make tests work without installing them
+    - Fix distcheck
+  * debian/patches/06_fix_qt_pcfiles.patch:
+  * debian/patches/07_lp1189948.patch:
+    - Applied upstream
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Mon, 17 Jun 2013 14:08:46 +1200
+
+lightdm (1.7.0-0ubuntu6) saucy; urgency=low
+
+  * install apparmor abstractions as 064 (LP: #1189948)
+    - debian/patches/07_lp1189948.patch: adjust Makefile.am and Makefile.in
+      to use install --mode=0644
+    - debian/lightdm.postinst: chmod apparmor abstractions to 0644 on upgrade
+
+ -- Jamie Strandboge <jamie@ubuntu.com>  Tue, 11 Jun 2013 14:11:34 -0500
+
+lightdm (1.7.0-0ubuntu5) saucy; urgency=low
+
+  * Drop XS-Testsuite header. We don't actually have any autopkgtests right
+    now (they are commented out in debian/tests/control and are broken).
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 06 Jun 2013 06:58:11 +0200
+
+lightdm (1.7.0-0ubuntu4) saucy; urgency=low
+
+  * Install some files in liblightdm-qt-dev, so it's somewhat useful.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 24 May 2013 00:31:31 -0600
+
+lightdm (1.7.0-0ubuntu3) saucy; urgency=low
+
+  * Switch to unversioned -dev package for liblightdm-qt to match Debian and
+    avoid having to change other packages synced from Debian
+  * Swtich Conflicts to Breaks and add liblightdm-qt-3-dev to Breaks/Replaces
+
+ -- Scott Kitterman <scott@kitterman.com>  Fri, 24 May 2013 00:37:06 -0400
+
+lightdm (1.7.0-0ubuntu2) saucy; urgency=low
+
+  * Cherry-pick patches from upstream to fix liblightdm-qt{,5} pcfiles. 
+  * Refresh patches to apply cleanly 
+
+ -- Iain Lane <iain.lane@canonical.com>  Tue, 07 May 2013 17:36:29 +0100
+
+lightdm (1.7.0-0ubuntu1) saucy; urgency=low
+
+  [ Robert Ancell ]
   * New upstream release:
     - Use logind instead of ConsoleKit if it is available
     - Use Q_SLOTS and Q_SIGNALS instead of slots and signals.
@@ -10,11 +65,16 @@ lightdm (1.7.0-0ubuntu1~ppa1) saucy; urgency=low
     - liblightdm-qt-2 -> liblightdm-qt-3
   * debian/patches/06_qt_no_keywords.patch:
     - Applied upstream
-  * NOTE: The locale changes do not match the patches to accounts service.
-    This package should be patched to match what the Ubuntu accounts service
-    provides.
+    
+  [ Gunnar Hjalmarsson ]
+  * debian/patches/04_language_options.patch:
+    - Applied upstream
+  * debian/patches/04_language_handling.patch:
+    - Set LANGUAGE instead of LANG, since the Language property in
+      accountsservice as patched for Ubuntu does not contain a valid
+      locale name.
 
- -- Robert Ancell <robert.ancell@canonical.com>  Tue, 30 Apr 2013 11:30:58 -0700
+ -- Robert Ancell <robert.ancell@canonical.com>  Thu, 02 May 2013 10:20:02 -0700
 
 lightdm (1.6.0-0ubuntu2.1) raring-proposed; urgency=low
 
index 5536821ed936593c888d0bdf4965705c68b018cc..d32fd8f7bd30a9efc6e9f61036042c9a8f850880 100644 (file)
@@ -24,8 +24,8 @@ Build-Depends: debhelper (>= 7.0.50~),
                dh-translations,
                gtk-doc-tools,
                yelp-tools,
-               dbus
-XS-Testsuite: autopkgtest
+               dbus,
+               python-gi
 Homepage: https://launchpad.net/lightdm
 
 Package: lightdm
@@ -101,14 +101,14 @@ Description: LightDM GObject client library (development files)
  This package contains header files and development information, which
  is useful for building LightDM greeters and user switchers.
 
-Package: liblightdm-qt-3-dev
+Package: liblightdm-qt-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
          liblightdm-qt-3-0 (= ${binary:Version}),
          libqt4-dev
-Conflicts: liblightdm-qt-1-dev (>= 1.1.1)
-Replaces: liblightdm-qt-1-dev (>= 1.1.1)
+Breaks: liblightdm-qt-1-dev (>= 1.1.1), liblightdm-qt-3-dev
+Replaces: liblightdm-qt-1-dev (>= 1.1.1), liblightdm-qt-3-dev
 Description: LightDM Qt client library (development files)
  A Qt based library for LightDM clients to use to interface with LightDM.
  .
index 53c9e44a56a8b18126b15b6a84ecdd1627320e70..c61da08280844a27b26592fe394b9fe5051a08a4 100644 (file)
@@ -79,6 +79,20 @@ if [ -z "$2" ]; then
     fi
 fi
 
+case "$1" in
+    configure)
+        # LP: #1189948
+        if dpkg --compare-versions "$2" lt "1.7.0-0ubuntu6" ; then
+            if [ -f /etc/apparmor.d/abstractions/lightdm ]; then
+                chmod 0644 /etc/apparmor.d/abstractions/lightdm || true
+            fi
+            if [ -f /etc/apparmor.d/abstractions/lightdm_chromium-browser ]; then
+                chmod 0644 /etc/apparmor.d/abstractions/lightdm_chromium-browser || true
+            fi
+        fi
+        ;;
+esac
+
 #DEBHELPER#
 
 exit 0
index d0f9919335e276842042ac1f034e1ba1dfa63642..8d4dcf7262542f85b85a9ad8d71ce0ffa2927c94 100644 (file)
@@ -2,11 +2,11 @@
 #              starting from quantal. llvmpipe is used in case no hardware
 #              acceleration is available.
 === modified file 'liblightdm-gobject/user.c'
-Index: lightdm-unity/liblightdm-gobject/user.c
+Index: lightdm-1.5.1/liblightdm-gobject/user.c
 ===================================================================
---- lightdm-unity.orig/liblightdm-gobject/user.c       2013-05-31 14:43:13.321193415 +1200
-+++ lightdm-unity/liblightdm-gobject/user.c    2013-05-31 14:43:13.313193415 +1200
-@@ -1307,6 +1307,12 @@
+--- lightdm-1.5.1.orig/liblightdm-gobject/user.c       2013-03-08 11:18:21.877614772 +1300
++++ lightdm-1.5.1/liblightdm-gobject/user.c    2013-03-08 11:18:21.873614772 +1300
+@@ -1313,6 +1313,12 @@
      load_dmrc (user);
      load_accounts_service (user); // overrides dmrc values
  
index a6f3f70508a5822d23f17613aef4232c0ea2d877..08f929cf92fe1d94ea6699be226c1b1cf015148f 100644 (file)
@@ -1,8 +1,8 @@
 === modified file 'src/display.c'
-Index: lightdm-unity/src/display.c
+Index: b/src/display.c
 ===================================================================
---- lightdm-unity.orig/src/display.c   2013-05-31 14:43:17.293193278 +1200
-+++ lightdm-unity/src/display.c        2013-05-31 14:43:17.293193278 +1200
+--- a/src/display.c
++++ b/src/display.c
 @@ -637,6 +637,8 @@
      }
  }
diff --git a/debian/patches/04_language_handling.patch b/debian/patches/04_language_handling.patch
new file mode 100644 (file)
index 0000000..99d7824
--- /dev/null
@@ -0,0 +1,30 @@
+Description: Adjustments due to handling of languages
+Forwarded: not-needed
+Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
+
+Index: b/liblightdm-gobject/language.c
+===================================================================
+--- a/liblightdm-gobject/language.c
++++ b/liblightdm-gobject/language.c
+@@ -40,7 +40,7 @@
+ static void
+ update_languages (void)
+ {
+-    gchar *command = "locale -a";
++    gchar *command = "/usr/share/language-tools/language-options";
+     gchar *stdout_text = NULL, *stderr_text = NULL;
+     gint exit_status;
+     gboolean result;
+Index: b/src/display.c
+===================================================================
+--- a/src/display.c
++++ b/src/display.c
+@@ -734,7 +734,7 @@
+     language = user_get_language (user);
+     if (language != NULL && language != '\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);
+     }
diff --git a/debian/patches/04_language_options.patch b/debian/patches/04_language_options.patch
deleted file mode 100644 (file)
index 223fe7e..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Replace 'locale -a' output with accountsservice's list of language options.
-Forwarded: not-needed
-Author: Gunnar Hjalmarsson <ubuntu@gunnar.cc>
-
-Index: lightdm-1.5.1/liblightdm-gobject/language.c
-===================================================================
---- lightdm-1.5.1.orig/liblightdm-gobject/language.c   2013-03-08 11:18:25.733614639 +1300
-+++ lightdm-1.5.1/liblightdm-gobject/language.c        2013-03-08 11:18:25.733614639 +1300
-@@ -40,7 +40,7 @@
- static void
- update_languages (void)
- {
--    gchar *command = "locale -a";
-+    gchar *command = "/usr/share/language-tools/language-options";
-     gchar *stdout_text = NULL, *stderr_text = NULL;
-     gint exit_status;
-     gboolean result;
index 89d1674410ab8c74c6e3737ebe5c95209aad3b76..37ccc61151967b56b8275ebdd086effaacbbd488 100644 (file)
@@ -1,8 +1,8 @@
-Index: lightdm-unity/src/xserver-local.c
+Index: lightdm-1.5.1/src/xserver-local.c
 ===================================================================
---- lightdm-unity.orig/src/xserver-local.c     2013-05-31 14:43:19.661193196 +1200
-+++ lightdm-unity/src/xserver-local.c  2013-05-31 14:43:19.661193196 +1200
-@@ -483,6 +483,9 @@
+--- lightdm-1.5.1.orig/src/xserver-local.c     2013-03-08 11:18:26.989614595 +1300
++++ lightdm-1.5.1/src/xserver-local.c  2013-03-08 11:18:26.989614595 +1300
+@@ -441,6 +441,9 @@
      if (server->priv->layout)
          g_string_append_printf (command, " -layout %s", server->priv->layout);
  
@@ -12,11 +12,11 @@ Index: lightdm-unity/src/xserver-local.c
      gethostname (hostname, 1024);
      number = g_strdup_printf ("%d", xserver_get_display_number (XSERVER (server)));
      if (!server->priv->xdmcp_key)
-Index: lightdm-unity/tests/src/X.c
+Index: lightdm-1.5.1/tests/src/X.c
 ===================================================================
---- lightdm-unity.orig/tests/src/X.c   2013-05-31 14:43:19.661193196 +1200
-+++ lightdm-unity/tests/src/X.c        2013-05-31 14:43:19.661193196 +1200
-@@ -238,6 +238,9 @@
+--- lightdm-1.5.1.orig/tests/src/X.c   2013-03-08 11:18:26.989614595 +1300
++++ lightdm-1.5.1/tests/src/X.c        2013-03-08 11:18:26.989614595 +1300
+@@ -297,6 +297,9 @@
          else if (strcmp (arg, "-nr") == 0)
          {
          }
@@ -26,7 +26,7 @@ Index: lightdm-unity/tests/src/X.c
          else if (strcmp (arg, "-background") == 0)
          {
              /* Ignore arg */
-@@ -284,6 +287,7 @@
+@@ -333,6 +336,7 @@
                          "-nolisten protocol     Don't listen on protocol\n"
                          "-background [none]     Create root window with no background\n"
                          "-nr                    (Ubuntu-specific) Synonym for -background none\n"
index 9da75249828921cc4a5a594fed46ac2ab6f564d8..06295f4078677bc86d3a39c46b6e72fa27f1953d 100644 (file)
@@ -1,4 +1,4 @@
 01_transition_ubuntu2d_ubuntu_desktop.patch
-03_launch_dbus.patch
-04_language_options.patch
+#03_launch_dbus.patch
+04_language_handling.patch
 05_add_xserver_core_option.patch
index 8267e47d8d506c9e12efc9032eb49b4bd29b5e3b..db948bf7307855171dd951b736f64d3c7bc52d65 100755 (executable)
@@ -13,10 +13,6 @@ override_dh_autoreconf:
 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
-
 override_dh_install:
        #Remove .la and .a files.
        find debian/tmp/usr/lib/ -name *.a |xargs rm