主线修改代码同步

debian/changelog

@@ -1,3 +1,13 @@
+yhkylin-backup-tools (4.1.0.1-ok5) yangtze; urgency=medium
+
+  * BUG 号：162643 【备份还原】所有提示框中右下角显示为Ok
+            162558 【HWE】【备份还原】英文和字体最大环境下，备份界面文字显示不全
+  * 需求号：无
+  * 其它改动：主线版本代码修改同步到开源社区
+  * 其它改动影响域：全域
+
+ -- Kevin Duan <zhaominyong@kylinos.cn>  Wed, 22 Mar 2023 10:05:30 +0800
+
 yhkylin-backup-tools (4.1.0.1-ok4) yangtze; urgency=medium
 
   * BUG 号：无

debian/patches/series

@@ -1,3 +1,4 @@
 0001-changelog.patch
 0002-.patch
 0003-.patch
+0004-.patch

debian/yhkylin-backup-tools.install

@@ -10,4 +10,5 @@ backup-daemon/data/initramfs-tools/hooks/kybackup-hooks		usr/share/initramfs-too
 backup-daemon/data/initramfs-tools/scripts/local-bottom/kybackup         usr/share/initramfs-tools/scripts/init-bottom
 backup-daemon/data/initramfs-tools/conf-hooks.d/kybackup        usr/share/initramfs-tools/conf-hooks.d
 kybackup/yhkylin-backup-tools.desktop                           usr/share/applications/
-data/kybackup/*                                                 usr/share/kylin-user-guide/data/guide/kybackup
+backup-daemon/backup-daemon.desktop                             usr/share/applications/
+data/kybackup/*                                                 usr/share/kylin-user-guide/data/guide/yhkylin-backup-tools/

debian/yhkylin-backup-tools.postinst

@@ -1,8 +1,14 @@
 #!/bin/bash
+# kybackup脚本从local-bottom迁移到init-bottom下面
 if [ -e "/usr/share/initramfs-tools/scripts/local-bottom/kybackup" ]; then
     rm -f /usr/share/initramfs-tools/scripts/local-bottom/kybackup > /dev/null 2>&1
 fi
 
+# kybackup改为yhkylin-backup-tools
+if [ -e "/usr/share/kylin-user-guide/data/guide/kybackup" ]; then
+    rm -rf /usr/share/kylin-user-guide/data/guide/kybackup > /deb/null 2>&1
+fi
+
 boot_is_ro=false
 bootefi_is_ro=false
 remount_boot_rw() {