update changelog

debian/changelog

@@ -1,3 +1,12 @@
+ukui-screensaver (4.10.0.0-ok2~1117) nile; urgency=medium
+
+  * BUG号：无
+  * 需求号：无
+  * 其他修改说明：Task# 165549 登录锁屏重构
+  * 其他修改影响说明：登录锁屏全功能
+
+ -- Yang Min <yangmin@kylinos.cn>  Fri, 17 Nov 2023 09:43:48 +0800
+
 ukui-screensaver (4.10.0.0-ok1~0914) nile; urgency=medium
 
   * BUG号：无

debian/control

@@ -35,7 +35,10 @@ Build-Depends: debhelper-compat (= 12),
                libavcodec-dev,
                libavformat-dev,
                qtmultimedia5-dev,
-	       libkysdk-systime-dev
+	       libkysdk-systime-dev,
+               liblightdm-qt5-3-dev,
+               libsystemd-dev,
+               libssl-dev
 Standards-Version: 4.5.0
 Rules-Requires-Root: no
 Homepage: https://www.github.com/ukui/ukui-screensaver
@@ -46,10 +49,11 @@ Package: ukui-screensaver
 Architecture: any
 Depends: ethtool,
          mate-desktop-common,
-         ukui-session-manager,
+         ukui-session-manager(>=4.0.0.0-ok12),
          libpam-biometric(>=3.20.0.10),
          ukui-input-gather(>=1.0.0.2),
 	 layer-shell-qt,
+         gstreamer1.0-libav,
          ${misc:Depends},
          ${shlibs:Depends}
 Replaces: ukui-screensaver-common (<< 2.0.0)

debian/copyright

@@ -8,32 +8,14 @@ Files: CMakeLists.txt
        data/*
        man/*
        debian/*
-       screensaver/*
-       Common/*
        .gitattributes
-       KylinNM/*
        .config.h.in
-       screensaver-focus-helper/*
-       set4kScale/*
 Copyright: 2018, Tianjin KYLIN Information Technology Co., Ltd.
            2019, Tianjin KYLIN Information Technology Co., Ltd.
            2020, Tianjin KYLIN Information Technology Co., Ltd.
            2021, Tianjin KYLIN Information Technology Co., Ltd.
            2022, Tianjin KYLIN Information Technology Co., Ltd.
-License: GPL-3+
-
-Files: src/xeventmonitor.h
-       src/xeventmonitor.cpp
-Copyright: 2011 ~ 2017 Deepin, Inc.
-           2011 ~ 2017 Wang Yong
-           2018, Tianjin KYLIN Information Technology Co., Ltd.
-License: GPL-3+
-
-Files: BiometricAuth/*
-       VirtualKeyboard/*
-Copyright: 2018, Tianjin KYLIN Information Technology Co., Ltd.
-           2021, Tianjin KYLIN Information Technology Co., Ltd.
-           2022, Tianjin KYLIN Information Technology Co., Ltd.
+           2023, Tianjin KYLIN Information Technology Co., Ltd.
 License: GPL-3+
 
 License: GPL-3+

debian/patches/series

@@ -0,0 +1 @@
+0001-update-changelog.patch

debian/ukui-screensaver.install

@@ -0,0 +1,8 @@
+data/ukui-greeter/95-ukui-greeter.conf /usr/share/lightdm/lightdm.conf.d/
+data/ukui-greeter/lightdm-session-setup.sh /usr/lib/lightdm/
+data/ukui-greeter/ukui-greeter.desktop /usr/share/xgreeters/
+data/desktop/kwin.desktop /usr/share/ukui/ukui-session-manager/simpledesk/
+data/desktop/ukui-screensaver.desktop /usr/share/ukui/ukui-session-manager/simpledesk/
+data/desktop/ukui-kglobal.desktop /usr/share/ukui/ukui-session-manager/simpledesk/
+data/desktop/ukui-settings-daemon.desktop /usr/share/ukui/ukui-session-manager/simpledesk/
+

debian/ukui-screensaver.preinst

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+#set -e
+
+echo "run ukui-screensaver.preinst"
+
+path_conf="/usr/share/lightdm/lightdm.conf.d/95-ukui-greeter.conf"
+dpkg-divert --package ukui-screensaver --rename --divert "$path_conf"".old" --add $path_conf
+path_sh="/usr/lib/lightdm/lightdm-session-setup.sh "
+dpkg-divert --package ukui-screensaver --rename --divert "$path_sh"".old" --add $path_sh
+path_desktop="/usr/share/xgreeters/ukui-greeter.desktop"
+dpkg-divert --package ukui-screensaver --rename --divert "$path_desktop"".old" --add $path_desktop
+mkdir -p /usr/share/ukui/ukui-session-manager/simpledesk
+#remove_greeter(){
+#   dpkg -P ukui-greeter
+#}
+
+#remove_greeter()