]> rtime.felk.cvut.cz Git - sojka/debian/lightdm.git/commitdiff
merge changes from experimental
authorcorsac <corsac@0c9b3bff-18ee-0310-b944-d1aa2700132f>
Tue, 22 Apr 2014 21:33:00 +0000 (21:33 +0000)
committercorsac <corsac@0c9b3bff-18ee-0310-b944-d1aa2700132f>
Tue, 22 Apr 2014 21:33:00 +0000 (21:33 +0000)
git-svn-id: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/lightdm@8405 0c9b3bff-18ee-0310-b944-d1aa2700132f

debian/changelog
debian/liblightdm-gobject-1-0.symbols [new file with mode: 0644]
debian/liblightdm-qt-3-0.symbols [new file with mode: 0644]
debian/lightdm.install
debian/patches/01_set-default-path.patch
debian/patches/04_dont-add-pkglibexecdir-path.patch [deleted file]
debian/patches/06_allow_libpamsystemd_and_ck_together.patch
debian/patches/series
debian/rules
debian/watch

index 6e4e360c65d7bd7e8c120237f646c968e467f490..337d174027ebf5ddc80c60872dec367a13fb7577 100644 (file)
@@ -1,3 +1,65 @@
+lightdm (1.10.0-1) experimental; urgency=medium
+
+  * New upstream stable release.
+  * debian/watch updated to track 1.10 branch.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Tue, 08 Apr 2014 22:54:47 +0200
+
+lightdm (1.9.13-1) experimental; urgency=medium
+
+  * New upstream development release.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Tue, 25 Mar 2014 22:04:52 +0100
+
+lightdm (1.9.11-1) experimental; urgency=medium
+
+  * New upstream development release.
+  * debian/watch updated to track versions over 10.
+  * debian/patches:
+    - 02_fix-build-glib-before-2.40 removed, included upstream.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Thu, 13 Mar 2014 09:19:21 +0100
+
+lightdm (1.9.9-1) experimental; urgency=medium
+
+  * New upstream development release.
+  * debian/liblightdm-gobject-1-0.symbols, debian/liblightdm-qt-3-0.symbols:
+    - add a symbol file to handle library dependencies more carefully.
+  * debian/patches:
+    - 02_fix-build-glib-before-2.40 added, fix FTBFS with glib before 2.40.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Wed, 12 Mar 2014 11:00:42 +0100
+
+lightdm (1.9.8-1) experimental; urgency=medium
+
+  * New upstream development release.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Fri, 21 Feb 2014 22:05:10 +0100
+
+lightdm (1.9.6-1) experimental; urgency=medium
+
+  * New upstream development release.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Wed, 22 Jan 2014 21:18:16 +0100
+
+lightdm (1.9.5-1) experimental; urgency=medium
+
+  * New upstream development release.
+  * debian/watch updated to track 1.9 branch.
+  * debian/patches:
+    - 04_dont-add-pkglibexecdir-path dropped, gdm-flexiserver script has been
+      dropped from LightDM so the PATH addition was dropped as well.
+    - 01_set-default-path and 06_allow_libpamsystemd_and_ck_together
+      refreshed.
+  * debian/rules:
+    - stop removing gdmflexiserver since it doesn't exist anymore.
+    - configure libexecdir to be /u/l/*/lightdm.
+  * debian/lightdm.install:
+    - drop install of lightdm-set-defaults.
+    - rename lightdm-guest-session-wrapper to lightdm-guest-session.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sun, 29 Dec 2013 22:28:33 +0100
+
 lightdm (1.8.8-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/liblightdm-gobject-1-0.symbols b/debian/liblightdm-gobject-1-0.symbols
new file mode 100644 (file)
index 0000000..2284749
--- /dev/null
@@ -0,0 +1,77 @@
+liblightdm-gobject-1.so.0 liblightdm-gobject-1-0 #MINVER#
+ lightdm_get_can_hibernate@Base 1.2.2
+ lightdm_get_can_restart@Base 1.2.2
+ lightdm_get_can_shutdown@Base 1.2.2
+ lightdm_get_can_suspend@Base 1.2.2
+ lightdm_get_hostname@Base 1.2.2
+ lightdm_get_language@Base 1.2.2
+ lightdm_get_languages@Base 1.2.2
+ lightdm_get_layout@Base 1.2.2
+ lightdm_get_layouts@Base 1.2.2
+ lightdm_get_remote_sessions@Base 1.8.7
+ lightdm_get_sessions@Base 1.2.2
+ lightdm_greeter_authenticate@Base 1.2.2
+ lightdm_greeter_authenticate_as_guest@Base 1.2.2
+ lightdm_greeter_authenticate_autologin@Base 1.8.7
+ lightdm_greeter_authenticate_remote@Base 1.8.7
+ lightdm_greeter_cancel_authentication@Base 1.2.2
+ lightdm_greeter_cancel_autologin@Base 1.2.2
+ lightdm_greeter_connect_sync@Base 1.2.2
+ lightdm_greeter_ensure_shared_data_dir_sync@Base 1.9.8
+ lightdm_greeter_get_authentication_user@Base 1.2.2
+ lightdm_greeter_get_autologin_guest_hint@Base 1.2.2
+ lightdm_greeter_get_autologin_timeout_hint@Base 1.2.2
+ lightdm_greeter_get_autologin_user_hint@Base 1.2.2
+ lightdm_greeter_get_default_session_hint@Base 1.2.2
+ lightdm_greeter_get_has_guest_account_hint@Base 1.2.2
+ lightdm_greeter_get_hide_users_hint@Base 1.2.2
+ lightdm_greeter_get_hint@Base 1.2.2
+ lightdm_greeter_get_in_authentication@Base 1.2.2
+ lightdm_greeter_get_is_authenticated@Base 1.2.2
+ lightdm_greeter_get_lock_hint@Base 1.2.2
+ lightdm_greeter_get_select_guest_hint@Base 1.2.2
+ lightdm_greeter_get_select_user_hint@Base 1.2.2
+ lightdm_greeter_get_show_manual_login_hint@Base 1.2.2
+ lightdm_greeter_get_show_remote_login_hint@Base 1.8.7
+ lightdm_greeter_get_type@Base 1.2.2
+ lightdm_greeter_new@Base 1.2.2
+ lightdm_greeter_respond@Base 1.2.2
+ lightdm_greeter_set_language@Base 1.2.2
+ lightdm_greeter_start_session_sync@Base 1.2.2
+ lightdm_hibernate@Base 1.2.2
+ lightdm_language_get_code@Base 1.2.2
+ lightdm_language_get_name@Base 1.2.2
+ lightdm_language_get_territory@Base 1.2.2
+ lightdm_language_get_type@Base 1.2.2
+ lightdm_language_matches@Base 1.2.2
+ lightdm_layout_get_description@Base 1.2.2
+ lightdm_layout_get_name@Base 1.2.2
+ lightdm_layout_get_short_description@Base 1.2.2
+ lightdm_layout_get_type@Base 1.2.2
+ lightdm_restart@Base 1.2.2
+ lightdm_session_get_comment@Base 1.2.2
+ lightdm_session_get_key@Base 1.2.2
+ lightdm_session_get_name@Base 1.2.2
+ lightdm_session_get_session_type@Base 1.8.7
+ lightdm_session_get_type@Base 1.2.2
+ lightdm_set_layout@Base 1.2.2
+ lightdm_shutdown@Base 1.2.2
+ lightdm_suspend@Base 1.2.2
+ lightdm_user_get_background@Base 1.2.2
+ lightdm_user_get_display_name@Base 1.2.2
+ lightdm_user_get_has_messages@Base 1.2.2
+ lightdm_user_get_home_directory@Base 1.2.2
+ lightdm_user_get_image@Base 1.2.2
+ lightdm_user_get_language@Base 1.2.2
+ lightdm_user_get_layout@Base 1.2.2
+ lightdm_user_get_layouts@Base 1.2.2
+ lightdm_user_get_logged_in@Base 1.2.2
+ lightdm_user_get_name@Base 1.2.2
+ lightdm_user_get_real_name@Base 1.2.2
+ lightdm_user_get_session@Base 1.2.2
+ lightdm_user_get_type@Base 1.2.2
+ lightdm_user_list_get_instance@Base 1.2.2
+ lightdm_user_list_get_length@Base 1.2.2
+ lightdm_user_list_get_type@Base 1.2.2
+ lightdm_user_list_get_user_by_name@Base 1.2.2
+ lightdm_user_list_get_users@Base 1.2.2
diff --git a/debian/liblightdm-qt-3-0.symbols b/debian/liblightdm-qt-3-0.symbols
new file mode 100644 (file)
index 0000000..b8ebbc4
--- /dev/null
@@ -0,0 +1,144 @@
+liblightdm-qt-3.so.0 liblightdm-qt-3-0 #MINVER#
+ _ZN10QByteArrayD1Ev@Base 1.8.7
+ _ZN10QByteArrayD2Ev@Base 1.8.7
+ _ZN10QDBusErrorD1Ev@Base 1.8.7
+ _ZN10QDBusErrorD2Ev@Base 1.8.7
+ _ZN10QDBusReplyI7QStringED1Ev@Base 1.8.7
+ _ZN10QDBusReplyI7QStringED2Ev@Base 1.8.7
+ _ZN11SessionItemD1Ev@Base 1.8.7
+ _ZN11SessionItemD2Ev@Base 1.8.7
+ _ZN20SessionsModelPrivate12loadSessionsEN8QLightDM13SessionsModel11SessionTypeE@Base 1.8.7
+ _ZN20SessionsModelPrivateC1EPN8QLightDM13SessionsModelE@Base 1.8.7
+ _ZN20SessionsModelPrivateC2EPN8QLightDM13SessionsModelE@Base 1.8.7
+ _ZN5QHashIi10QByteArrayE11deleteNode2EPN9QHashData4NodeE@Base 1.8.7
+ _ZN5QHashIi10QByteArrayE13detach_helperEv@Base 1.8.7
+ _ZN5QHashIi10QByteArrayE13duplicateNodeEPN9QHashData4NodeEPv@Base 1.8.7
+ _ZN5QHashIi10QByteArrayED1Ev@Base 1.8.7
+ _ZN5QHashIi10QByteArrayED2Ev@Base 1.8.7
+ _ZN5QListI11SessionItemE18detach_helper_growEii@Base 1.8.7
+ _ZN5QListI11SessionItemE6appendERKS0_@Base 1.8.7
+ _ZN5QListI8UserItemE13detach_helperEi@Base 1.8.7
+ _ZN5QListI8UserItemE18detach_helper_growEii@Base 1.8.7
+ _ZN5QListI8UserItemE6appendERKS0_@Base 1.8.7
+ _ZN5QListI8UserItemED1Ev@Base 1.8.7
+ _ZN5QListI8UserItemED2Ev@Base 1.8.7
+ _ZN6QDebugD1Ev@Base 1.8.7
+ _ZN6QDebugD2Ev@Base 1.8.7
+ _ZN7QStringD1Ev@Base 1.8.7
+ _ZN7QStringD2Ev@Base 1.8.7
+ _ZN8QLightDM10UsersModel11qt_metacallEN11QMetaObject4CallEiPPv@Base 1.8.7
+ _ZN8QLightDM10UsersModel11qt_metacastEPKc@Base 1.8.7
+ _ZN8QLightDM10UsersModel16staticMetaObjectE@Base 1.8.7
+ _ZN8QLightDM10UsersModelC1EP7QObject@Base 1.8.7
+ _ZN8QLightDM10UsersModelC2EP7QObject@Base 1.8.7
+ _ZN8QLightDM10UsersModelD0Ev@Base 1.8.7
+ _ZN8QLightDM10UsersModelD1Ev@Base 1.8.7
+ _ZN8QLightDM10UsersModelD2Ev@Base 1.8.7
+ _ZN8QLightDM13SessionsModel11qt_metacallEN11QMetaObject4CallEiPPv@Base 1.8.7
+ _ZN8QLightDM13SessionsModel11qt_metacastEPKc@Base 1.8.7
+ _ZN8QLightDM13SessionsModel16staticMetaObjectE@Base 1.8.7
+ _ZN8QLightDM13SessionsModelC1ENS0_11SessionTypeEP7QObject@Base 1.8.7
+ _ZN8QLightDM13SessionsModelC1EP7QObject@Base 1.8.7
+ _ZN8QLightDM13SessionsModelC2ENS0_11SessionTypeEP7QObject@Base 1.8.7
+ _ZN8QLightDM13SessionsModelC2EP7QObject@Base 1.8.7
+ _ZN8QLightDM13SessionsModelD0Ev@Base 1.8.7
+ _ZN8QLightDM13SessionsModelD1Ev@Base 1.8.7
+ _ZN8QLightDM13SessionsModelD2Ev@Base 1.8.7
+ _ZN8QLightDM14GreeterPrivate13cb_showPromptEP14LightDMGreeterPKc17LightDMPromptTypePv@Base 1.8.7
+ _ZN8QLightDM14GreeterPrivate14cb_showMessageEP14LightDMGreeterPKc18LightDMMessageTypePv@Base 1.8.7
+ _ZN8QLightDM14GreeterPrivate19cb_autoLoginExpiredEP14LightDMGreeterPv@Base 1.8.7
+ _ZN8QLightDM14GreeterPrivate25cb_authenticationCompleteEP14LightDMGreeterPv@Base 1.8.7
+ _ZN8QLightDM14GreeterPrivateC1EPNS_7GreeterE@Base 1.8.7
+ _ZN8QLightDM14GreeterPrivateC2EPNS_7GreeterE@Base 1.8.7
+ _ZN8QLightDM14PowerInterface10canRestartEv@Base 1.8.7
+ _ZN8QLightDM14PowerInterface10canSuspendEv@Base 1.8.7
+ _ZN8QLightDM14PowerInterface11canShutdownEv@Base 1.8.7
+ _ZN8QLightDM14PowerInterface11qt_metacallEN11QMetaObject4CallEiPPv@Base 1.8.7
+ _ZN8QLightDM14PowerInterface11qt_metacastEPKc@Base 1.8.7
+ _ZN8QLightDM14PowerInterface12canHibernateEv@Base 1.8.7
+ _ZN8QLightDM14PowerInterface16staticMetaObjectE@Base 1.8.7
+ _ZN8QLightDM14PowerInterface21PowerInterfacePrivateC1Ev@Base 1.8.7
+ _ZN8QLightDM14PowerInterface21PowerInterfacePrivateC2Ev@Base 1.8.7
+ _ZN8QLightDM14PowerInterface7restartEv@Base 1.8.7
+ _ZN8QLightDM14PowerInterface7suspendEv@Base 1.8.7
+ _ZN8QLightDM14PowerInterface8shutdownEv@Base 1.8.7
+ _ZN8QLightDM14PowerInterface9hibernateEv@Base 1.8.7
+ _ZN8QLightDM14PowerInterfaceC1EP7QObject@Base 1.8.7
+ _ZN8QLightDM14PowerInterfaceC2EP7QObject@Base 1.8.7
+ _ZN8QLightDM14PowerInterfaceD0Ev@Base 1.8.7
+ _ZN8QLightDM14PowerInterfaceD1Ev@Base 1.8.7
+ _ZN8QLightDM14PowerInterfaceD2Ev@Base 1.8.7
+ _ZN8QLightDM17UsersModelPrivate12cb_userAddedEP15LightDMUserListP11LightDMUserPv@Base 1.8.7
+ _ZN8QLightDM17UsersModelPrivate14cb_userChangedEP15LightDMUserListP11LightDMUserPv@Base 1.8.7
+ _ZN8QLightDM17UsersModelPrivate14cb_userRemovedEP15LightDMUserListP11LightDMUserPv@Base 1.8.7
+ _ZN8QLightDM17UsersModelPrivate9loadUsersEv@Base 1.8.7
+ _ZN8QLightDM17UsersModelPrivateC1EPNS_10UsersModelE@Base 1.8.7
+ _ZN8QLightDM17UsersModelPrivateC2EPNS_10UsersModelE@Base 1.8.7
+ _ZN8QLightDM17UsersModelPrivateD0Ev@Base 1.8.7
+ _ZN8QLightDM17UsersModelPrivateD1Ev@Base 1.8.7
+ _ZN8QLightDM17UsersModelPrivateD2Ev@Base 1.8.7
+ _ZN8QLightDM7Greeter10showPromptE7QStringNS0_10PromptTypeE@Base 1.8.7
+ _ZN8QLightDM7Greeter11connectSyncEv@Base 1.8.7
+ _ZN8QLightDM7Greeter11qt_metacallEN11QMetaObject4CallEiPPv@Base 1.8.7
+ _ZN8QLightDM7Greeter11qt_metacastEPKc@Base 1.8.7
+ _ZN8QLightDM7Greeter11setLanguageERK7QString@Base 1.8.7
+ _ZN8QLightDM7Greeter11showMessageE7QStringNS0_11MessageTypeE@Base 1.8.7
+ _ZN8QLightDM7Greeter12authenticateERK7QString@Base 1.8.7
+ _ZN8QLightDM7Greeter16startSessionSyncERK7QString@Base 1.8.7
+ _ZN8QLightDM7Greeter16staticMetaObjectE@Base 1.8.7
+ _ZN8QLightDM7Greeter18authenticateRemoteERK7QStringS3_@Base 1.8.7
+ _ZN8QLightDM7Greeter19authenticateAsGuestEv@Base 1.8.7
+ _ZN8QLightDM7Greeter20cancelAuthenticationEv@Base 1.8.7
+ _ZN8QLightDM7Greeter21authenticateAutologinEv@Base 1.8.7
+ _ZN8QLightDM7Greeter21autologinTimerExpiredEv@Base 1.8.7
+ _ZN8QLightDM7Greeter22authenticationCompleteEv@Base 1.8.7
+ _ZN8QLightDM7Greeter23ensureSharedDataDirSyncERK7QString@Base 1.9.8
+ _ZN8QLightDM7Greeter7respondERK7QString@Base 1.8.7
+ _ZN8QLightDM7GreeterC1EP7QObject@Base 1.8.7
+ _ZN8QLightDM7GreeterC2EP7QObject@Base 1.8.7
+ _ZN8QLightDM7GreeterD0Ev@Base 1.8.7
+ _ZN8QLightDM7GreeterD1Ev@Base 1.8.7
+ _ZN8QLightDM7GreeterD2Ev@Base 1.8.7
+ _ZN8UserItemD1Ev@Base 1.8.7
+ _ZN8UserItemD2Ev@Base 1.8.7
+ _ZNK5QHashIi10QByteArrayE8findNodeERKiPj@Base 1.8.7
+ _ZNK8QLightDM10UsersModel10metaObjectEv@Base 1.8.7
+ _ZNK8QLightDM10UsersModel4dataERK11QModelIndexi@Base 1.8.7
+ _ZNK8QLightDM10UsersModel8rowCountERK11QModelIndex@Base 1.8.7
+ _ZNK8QLightDM13SessionsModel10metaObjectEv@Base 1.8.7
+ _ZNK8QLightDM13SessionsModel4dataERK11QModelIndexi@Base 1.8.7
+ _ZNK8QLightDM13SessionsModel8rowCountERK11QModelIndex@Base 1.8.7
+ _ZNK8QLightDM14PowerInterface10metaObjectEv@Base 1.8.7
+ _ZNK8QLightDM7Greeter10metaObjectEv@Base 1.8.7
+ _ZNK8QLightDM7Greeter13hideUsersHintEv@Base 1.8.7
+ _ZNK8QLightDM7Greeter14selectUserHintEv@Base 1.8.7
+ _ZNK8QLightDM7Greeter15isAuthenticatedEv@Base 1.8.7
+ _ZNK8QLightDM7Greeter15selectGuestHintEv@Base 1.8.7
+ _ZNK8QLightDM7Greeter16inAuthenticationEv@Base 1.8.7
+ _ZNK8QLightDM7Greeter17autologinUserHintEv@Base 1.8.7
+ _ZNK8QLightDM7Greeter18authenticationUserEv@Base 1.8.7
+ _ZNK8QLightDM7Greeter18autologinGuestHintEv@Base 1.8.7
+ _ZNK8QLightDM7Greeter18defaultSessionHintEv@Base 1.8.7
+ _ZNK8QLightDM7Greeter19hasGuestAccountHintEv@Base 1.8.7
+ _ZNK8QLightDM7Greeter19showManualLoginHintEv@Base 1.8.7
+ _ZNK8QLightDM7Greeter19showRemoteLoginHintEv@Base 1.8.7
+ _ZNK8QLightDM7Greeter20autologinTimeoutHintEv@Base 1.8.7
+ _ZNK8QLightDM7Greeter7getHintERK7QString@Base 1.8.7
+ _ZNK8QLightDM7Greeter8hostnameEv@Base 1.8.7
+ _ZNK8QLightDM7Greeter8lockHintEv@Base 1.8.7
+ _ZNK8UserItem11displayNameEv@Base 1.8.7
+ _ZTIN8QLightDM10UsersModelE@Base 1.8.7
+ _ZTIN8QLightDM13SessionsModelE@Base 1.8.7
+ _ZTIN8QLightDM14PowerInterfaceE@Base 1.8.7
+ _ZTIN8QLightDM17UsersModelPrivateE@Base 1.8.7
+ _ZTIN8QLightDM7GreeterE@Base 1.8.7
+ _ZTSN8QLightDM10UsersModelE@Base 1.8.7
+ _ZTSN8QLightDM13SessionsModelE@Base 1.8.7
+ _ZTSN8QLightDM14PowerInterfaceE@Base 1.8.7
+ _ZTSN8QLightDM17UsersModelPrivateE@Base 1.8.7
+ _ZTSN8QLightDM7GreeterE@Base 1.8.7
+ _ZTVN8QLightDM10UsersModelE@Base 1.8.7
+ _ZTVN8QLightDM13SessionsModelE@Base 1.8.7
+ _ZTVN8QLightDM14PowerInterfaceE@Base 1.8.7
+ _ZTVN8QLightDM17UsersModelPrivateE@Base 1.8.7
+ _ZTVN8QLightDM7GreeterE@Base 1.8.7
index ce53a44206b1958834713b09900d5cb0c5cc71b1..a88fafeef9f964d723ed0a1989f3c4149946e26d 100644 (file)
@@ -13,5 +13,4 @@ etc/apparmor.d/lightdm-guest-session
 etc/pam.d
 debian/lightdm-xsession.desktop /usr/share/xsessions
 debian/01_debian.conf /usr/share/lightdm/lightdm.conf.d
-usr/lib/*/lightdm/lightdm-set-defaults
-usr/lib/*/lightdm/lightdm-guest-session-wrapper
+usr/lib/*/lightdm/lightdm-guest-session
index 8c37557e7ff0b2adc9422268b63b5ef66d27d04d..1a3cfdf681d3e689a620e8a7bf2cc9fc6f1124e6 100644 (file)
@@ -4,7 +4,7 @@ Bug: https://bugs.launchpad.net/ubuntu/+source/lightdm/+bug/798277
 Description: Fix default PATH environment variable
 --- a/src/seat.c
 +++ b/src/seat.c
-@@ -267,7 +267,10 @@ run_script (Seat *seat, DisplayServer *d
+@@ -274,7 +274,10 @@ run_script (Seat *seat, DisplayServer *d
          process_set_env (script, "PATH", g_getenv ("PATH"));
      }
      else
@@ -18,7 +18,7 @@ Description: Fix default PATH environment variable
      {
 --- a/src/session-child.c
 +++ b/src/session-child.c
-@@ -355,7 +355,10 @@ session_child_run (int argc, char **argv
+@@ -354,7 +354,10 @@ session_child_run (int argc, char **argv
          else
          {
              /* Set POSIX variables */
diff --git a/debian/patches/04_dont-add-pkglibexecdir-path.patch b/debian/patches/04_dont-add-pkglibexecdir-path.patch
deleted file mode 100644 (file)
index 27e98fb..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Yves-Alexis Perez <corsac@debian.org>
-Description: don't add PKGLIBEXEC_DIR to the user PATH
---- a/src/session-child.c
-+++ b/src/session-child.c
-@@ -479,11 +479,6 @@ session_child_run (int argc, char **argv
-         g_free (value);
-     }
--    /* Put our tools directory in the path as a hack so we can use the legacy gdmflexiserver interface */
--    path = pam_getenv (pam_handle, "PATH");
--    if (path)
--        pam_putenv (pam_handle, g_strdup_printf ("PATH=%s:%s", PKGLIBEXEC_DIR, path));
--
-     /* Catch terminate signal and pass it to the child */
-     signal (SIGTERM, signal_cb);
index 4887560eedb552d56490385ef27c016e36f8a05f..897a08179c76f40411257a0899a11dc5ef045fee 100644 (file)
@@ -1,6 +1,6 @@
---- a/src/session.c    2013-10-30 21:41:46.000000000 +0100
-+++ b/src/session.c    2013-11-28 19:59:37.218510065 +0100
-@@ -766,8 +766,8 @@
+--- a/src/session.c
++++ b/src/session.c
+@@ -781,8 +781,8 @@ session_real_run (Session *session)
  
      if (login1_is_running ())
          session->priv->login1_session = read_string_from_child (session);
@@ -11,7 +11,7 @@
  }
  
  void
-@@ -778,7 +778,7 @@
+@@ -793,7 +793,7 @@ session_lock (Session *session)
      {
          if (session->priv->login1_session)
              login1_lock_session (session->priv->login1_session);
@@ -20,7 +20,7 @@
              ck_lock_session (session->priv->console_kit_cookie);
      }
  }
-@@ -791,7 +791,7 @@
+@@ -806,7 +806,7 @@ session_unlock (Session *session)
      {
          if (session->priv->login1_session)
              login1_unlock_session (session->priv->login1_session);
@@ -29,9 +29,9 @@
              ck_unlock_session (session->priv->console_kit_cookie);
      }
  }
---- a/src/session-child.c      2013-11-28 20:24:07.000000000 +0100
-+++ b/src/session-child.c      2013-11-28 20:01:55.738515458 +0100
-@@ -476,8 +476,8 @@
+--- a/src/session-child.c
++++ b/src/session-child.c
+@@ -476,8 +476,8 @@ session_child_run (int argc, char **argv
          write_string (login1_session);
      }
  
@@ -42,7 +42,7 @@
          /* Open a Console Kit session */
          g_variant_builder_init (&ck_parameters, G_VARIANT_TYPE ("(a(sv))"));
          g_variant_builder_open (&ck_parameters, G_VARIANT_TYPE ("a(sv)"));
-@@ -506,7 +506,7 @@
+@@ -506,7 +506,7 @@ session_child_run (int argc, char **argv
              pam_putenv (pam_handle, value);
              g_free (value);
          }
index 52f14d8be4a1e1df155943fad5c43d3be2782844..cf8297cbd9e9e0221a78d9bb5672abec1ff0451d 100644 (file)
@@ -1,5 +1,3 @@
 01_set-default-path.patch
-02_fix-apparmor-profile.patch
-04_dont-add-pkglibexecdir-path.patch
 05_debianize-pam-files.patch
 06_allow_libpamsystemd_and_ck_together.patch
index 3fbb5e8888e5915d177a566942d31977c0db0b60..38831bfed886d37918a6117e746957cdd134496e 100755 (executable)
@@ -1,12 +1,13 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/pkg-info.mk
+include /usr/share/dpkg/architecture.mk
+
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
 override_dh_auto_configure:
-       dh_auto_configure -- --with-greeter-user=lightdm --with-user-session=lightdm-xsession --enable-introspection=yes --disable-silent-rules
+       dh_auto_configure -- --with-greeter-user=lightdm --with-user-session=lightdm-xsession --enable-introspection=yes --disable-silent-rules --libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH)/$(DEB_SOURCE)/
 
 override_dh_installchangelogs:
        dh_installchangelogs -- NEWS
@@ -16,7 +17,6 @@ override_dh_installinit:
 
 override_dh_install:
        find debian/tmp -name '*.la' -delete
-       find debian/tmp/usr/lib/ -name gdmflexiserver -delete
        find debian/tmp/etc/apparmor.d -type f -exec chmod 0644 '{}' \;
        dh_install --fail-missing -X etc/init/lightdm.conf
 
index 9189dccb8d62d055bc237412d907262cf81385bf..330e64a81f7f4ab29b7175500309f2b7c4e1deed 100644 (file)
@@ -1,3 +1,3 @@
 version=3
-https://launchpad.net/lightdm/1.8 \
-https://launchpad.net/lightdm/.*/lightdm-(\d\.\d\.\d)\.tar\.(?:gz|bz2|xz)
+https://launchpad.net/lightdm/1.10 \
+https://launchpad.net/lightdm/.*/lightdm-(\d\.\d+\.\d+)\.tar\.(?:gz|bz2|xz)