diff -Nru ukui-session-manager-1.1.2/debian/changelog ukui-session-manager-1.1.2/debian/changelog --- ukui-session-manager-1.1.2/debian/changelog 2018-04-10 07:58:33.000000000 +0000 +++ ukui-session-manager-1.1.2/debian/changelog 2018-04-10 07:58:33.000000000 +0000 @@ -1,12 +1,12 @@ -ukui-session-manager (1.1.2-0ubuntu1) bionic; urgency=medium +ukui-session-manager (1.1.2-1) unstable; urgency=medium * Use $(DEB_HOST_MULTIARCH) to replace the hard code in desktop - file. (LP: #1762124) - * Fix the wrong logout button type. (LP: #1762117) + file. + * Fix the wrong logout button type. -- handsome_feng Tue, 10 Apr 2018 15:58:33 +0800 -ukui-session-manager (1.1.1-0ubuntu1) bionic; urgency=medium +ukui-session-manager (1.1.1-1) unstable; urgency=medium * Use ukui-settings-daemon to replace mate-settings-daemon. * Use ukwm to replace marco. @@ -15,7 +15,7 @@ -- handsome_feng Sun, 01 Apr 2018 15:38:01 +0800 -ukui-session-manager (1.1.0-0ubuntu1) bionic; urgency=medium +ukui-session-manager (1.1.0-1) unstable; urgency=medium * Redesign the logout dialog and shutdown dialog. * Update dbus and systemd user-session to get all user-defined environment @@ -26,21 +26,22 @@ -- handsome_feng Tue, 27 Feb 2018 09:14:37 +0800 -ukui-session-manager (1.0.2-0ubuntu1) artful; urgency=medium +ukui-session-manager (1.0.2-2) unstable; urgency=medium - * Also launch 'OnlyShowIn=MATE' apps. + * Add d/settings from previous default settings package. - -- handsome_feng Wed, 13 Sep 2017 10:27:19 +0800 + -- Aron Xu Mon, 06 Nov 2017 10:32:42 +0800 -ukui-session-manager (1.0.1-0ubuntu1) artful; urgency=medium +ukui-session-manager (1.0.2-1) unstable; urgency=medium - * Replace deprecated upower functions with ConsoleKit2 equivatents. - * Set GNOME_DESKTOP_SESSION_ID=this-is-deprecated (LP: #1681848) + * Team upload + * New upstream release + * Also launch 'OnlyShowIn=MATE' apps. - -- handsome_feng Mon, 26 Jun 2017 17:17:02 +0800 + -- handsome_feng Wed, 13 Sep 2017 10:27:19 +0800 -ukui-session-manager (1.0.0-0ubuntu1) zesty; urgency=medium +ukui-session-manager (1.0.1-1) unstable; urgency=medium - * Initial release (LP: #1664256) + * Initial release (Closes: #872969) - -- handsome_feng Sun, 05 Mar 2017 15:03:42 +0800 + -- Aron Xu Sat, 26 Aug 2017 17:17:02 +0800 diff -Nru ukui-session-manager-1.1.2/debian/control ukui-session-manager-1.1.2/debian/control --- ukui-session-manager-1.1.2/debian/control 2018-04-10 07:58:33.000000000 +0000 +++ ukui-session-manager-1.1.2/debian/control 2018-04-10 07:58:33.000000000 +0000 @@ -1,11 +1,10 @@ Source: ukui-session-manager Section: x11 Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Kylin Team -Uploaders: handsome_feng , - yilei , -Standards-Version: 4.1.4 +Maintainer: Kylin Team +Uploaders: Aron Xu , + handsome_feng , +Standards-Version: 4.1.5 Build-Depends: debhelper (>= 11), dpkg-dev (>= 1.16.1.1), intltool, @@ -39,7 +38,6 @@ ukui-panel, mate-polkit, ukui-settings-daemon, -Suggests: ubuntukylin-default-settings (>= 1.3.17), Provides: x-session-manager, Description: Session manager of the UKUI desktop environment This package contains a session that can be started from a display diff -Nru ukui-session-manager-1.1.2/debian/settings/etc/profile.d/debian-ukui-default-settings_gtk-accessibility.sh ukui-session-manager-1.1.2/debian/settings/etc/profile.d/debian-ukui-default-settings_gtk-accessibility.sh --- ukui-session-manager-1.1.2/debian/settings/etc/profile.d/debian-ukui-default-settings_gtk-accessibility.sh 1970-01-01 00:00:00.000000000 +0000 +++ ukui-session-manager-1.1.2/debian/settings/etc/profile.d/debian-ukui-default-settings_gtk-accessibility.sh 2018-04-10 07:58:33.000000000 +0000 @@ -0,0 +1,25 @@ +# Copyright (C) 2014-2015, Martin Wimpress +# Copyright (C) 2015, Mike Gabriel +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# . +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# . +# On Debian systems, the complete text of the GNU General Public +# License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +if [ "x$DESKTOP_SESSION" = "xukui" ] || [ "x$XDG_SESSION_DESKTOP" = "xukui" ]; then + # Ensure GTK accessibility modules are active. + if [ -z "$GTK_MODULES" ] ; then + GTK_MODULES=gail:atk-bridge + else + GTK_MODULES="$GTK_MODULES:gail:atk-bridge" + fi + export GTK_MODULES +fi diff -Nru ukui-session-manager-1.1.2/debian/settings/etc/X11/Xsession.d/99ukui-environment ukui-session-manager-1.1.2/debian/settings/etc/X11/Xsession.d/99ukui-environment --- ukui-session-manager-1.1.2/debian/settings/etc/X11/Xsession.d/99ukui-environment 1970-01-01 00:00:00.000000000 +0000 +++ ukui-session-manager-1.1.2/debian/settings/etc/X11/Xsession.d/99ukui-environment 2018-04-10 07:58:33.000000000 +0000 @@ -0,0 +1,20 @@ +# This file is sourced by Xsession(5), not executed. + +if [ "x$DESKTOP_SESSION" = "xukui" ] || [ "x$XDG_SESSION_DESKTOP" == "xukui" ]; then + if [ -z "$GTK_MODULES" ] ; then + GTK_MODULES="canberra-gtk-module:topmenu-gtk-module" + else + GTK_MODULES="$GTK_MODULES:canberra-gtk-module:topmenu-gtk-module" + fi + export GTK_MODULES + + # Disable GTK3 overlay scrollbars + export GTK_OVERLAY_SCROLLING=0 + + # QT apps to use GTK styling + export QT_QPA_PLATFORMTHEME=gtk2 + + # Change to GDK_SCALE=2 for experimental HiDPI support. + # Requires reboot. + export GDK_SCALE=1 +fi diff -Nru ukui-session-manager-1.1.2/debian/settings/usr/share/glib-2.0/schemas/ukui-session.gschema.override ukui-session-manager-1.1.2/debian/settings/usr/share/glib-2.0/schemas/ukui-session.gschema.override --- ukui-session-manager-1.1.2/debian/settings/usr/share/glib-2.0/schemas/ukui-session.gschema.override 1970-01-01 00:00:00.000000000 +0000 +++ ukui-session-manager-1.1.2/debian/settings/usr/share/glib-2.0/schemas/ukui-session.gschema.override 2018-04-10 07:58:33.000000000 +0000 @@ -0,0 +1,5 @@ +[org.mate.panel] +default-layout='ukui' + +[org.mate.Marco.global-keybindings] +run-command-terminal='t' diff -Nru ukui-session-manager-1.1.2/debian/ukui-session-manager.install ukui-session-manager-1.1.2/debian/ukui-session-manager.install --- ukui-session-manager-1.1.2/debian/ukui-session-manager.install 2018-04-10 07:58:33.000000000 +0000 +++ ukui-session-manager-1.1.2/debian/ukui-session-manager.install 2018-04-10 07:58:33.000000000 +0000 @@ -1 +1,2 @@ debian/55ukui-session_ukuirc etc/X11/Xsession.d +debian/settings/* /