feat: update emacs to 1:29.4+1-4

[deepin-community-bot]

This pull request is requested by @UTsweetyfish.

Basic Information

Old Version: 1:29.1+1-5
New Version: 1:29.4+1-4

Patch series

--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,6 @@
 0013-Rename-to-inhibit-automatic-native-compilation.patch
 0014-Patch-project-vc-recognizes-git-test-for-Debian-buil.patch
 0015-Change-native-comp-async-jobs-number-default-to-1.patch
+0016-Change-native-comp-async-report-warnings-errors-to-s.patch
+0017-Mark-dired-test-bug27243-02-as-unstable-for-now.patch
+0018-Disable-flymake-included-c-header-files-test-to-fix-.patch

[github-actions]

TAG Bot

TAG: 1%29.4+1-4
EXISTED: no
DISTRIBUTION: unstable

[deepin-ci-robot]

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

[UTsweetyfish]

diff --git a/debian/control b/debian/control
index 2d2a96a2..57ad8a36 100644
--- a/debian/control
+++ b/debian/control
@@ -74,9 +74,10 @@ Depends:
  ${shlibs:Depends},
 Provides: editor, emacs, emacsen, info-browser, mail-reader, news-reader
 Recommends: fonts-noto-color-emoji
-Suggests: emacs-common-non-dfsg
+Suggests: emacs-common-non-dfsg, emacs-editing-major-modes
 Conflicts: emacs-gtk, emacs-pgtk, emacs-nox
-Replaces: emacs-gtk, emacs-pgtk, emacs-nox
+Replaces: emacs-gtk, emacs-pgtk, emacs-nox, emacs-bin-common (<< 1:29.2)
+Breaks: emacs-bin-common (<< 1:29.2)
 Description: GNU Emacs editor (with Lucid GUI support)
  GNU Emacs is the extensible self-documenting text editor.  This
  package contains a version of Emacs with support for a graphical user
@@ -96,9 +97,10 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
 Provides: editor, emacs, emacsen, info-browser, mail-reader, news-reader
-Suggests: emacs-common-non-dfsg
+Suggests: emacs-common-non-dfsg, emacs-editing-major-modes
 Conflicts: emacs-gtk, emacs-pgtk, emacs-lucid
-Replaces: emacs-gtk, emacs-pgtk, emacs-lucid
+Replaces: emacs-gtk, emacs-pgtk, emacs-lucid, emacs-bin-common (<< 1:29.2)
+Breaks: emacs-bin-common (<< 1:29.2)
 Description: GNU Emacs editor (without GUI support)
  GNU Emacs is the extensible self-documenting text editor.  This
  package contains a version of Emacs compiled without support for X,
@@ -113,9 +115,10 @@ Depends:
  ${shlibs:Depends},
 Provides: editor, emacs, emacsen, info-browser, mail-reader, news-reader
 Recommends: fonts-noto-color-emoji
-Suggests: emacs-common-non-dfsg
+Suggests: emacs-common-non-dfsg, emacs-editing-major-modes
 Conflicts: emacs-pgtk, emacs-lucid, emacs-nox
-Replaces: emacs-pgtk, emacs-lucid, emacs-nox
+Replaces: emacs-pgtk, emacs-lucid, emacs-nox, emacs-bin-common (<< 1:29.2)
+Breaks: emacs-bin-common (<< 1:29.2)
 Description: GNU Emacs editor (with GTK+ GUI support)
  GNU Emacs is the extensible self-documenting text editor.  This
  package contains a version of Emacs with a graphical user interface
@@ -133,9 +136,17 @@ Depends:
  ${shlibs:Depends},
 Provides: editor, emacs, emacsen, info-browser, mail-reader, news-reader
 Recommends: fonts-noto-color-emoji
-Suggests: emacs-common-non-dfsg
+Suggests: emacs-common-non-dfsg, emacs-editing-major-modes
 Conflicts: emacs-gtk, emacs-lucid, emacs-nox
-Replaces: emacs-gtk, emacs-lucid, emacs-nox
+Replaces:
+ emacs-gtk,
+ emacs-lucid,
+ emacs-nox,
+ emacs-bin-common (<< 1:29.2),
+ emacs-common (<< 1:29.3+1-3~),
+Breaks:
+ emacs-bin-common (<< 1:29.2),
+ emacs-common (<< 1:29.3+1-3~),
 Description: GNU Emacs editor (with GTK+ Wayland GUI support)
  GNU Emacs is the extensible self-documenting text editor.  This
  package contains a version of Emacs with a graphical user interface
@@ -148,6 +159,11 @@ Description: GNU Emacs editor (with GTK+ Wayland GUI support)
 Package: emacs-bin-common
 Architecture: any
 Depends: emacs-common (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+Breaks:
+ emacs-gtk (<< 1:29.2),
+ emacs-pgtk (<< 1:29.2),
+ emacs-lucid (<< 1:29.2),
+ emacs-nox (<< 1:29.2),
 Recommends: mailutils
 Description: GNU Emacs editor's shared, architecture dependent files
  GNU Emacs is the extensible self-documenting text editor.
@@ -158,7 +174,7 @@ Package: emacs-common
 Architecture: all
 Depends: emacs-el, emacsen-common (>= 3.0.0), install-info, ${misc:Depends}
 #Recommends: emacs-el
-Suggests: emacs-common-non-dfsg, ncurses-term
+Suggests: emacs-common-non-dfsg, emacs-editing-major-modes, ncurses-term
 Conflicts:
  cedet,
  eieio,

[UTsweetyfish]

/integrate

[github-actions]

AutoIntegrationPr Bot
auto integrate with pr url: deepin-community/Repository-Integration#2374
PrNumber: 2374
PrBranch: auto-integration-12376161751

[UTsweetyfish]

deepin-community/sig-deepin-security#19

[deepin-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: UTsweetyfish

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• https:/raw.githubusercontent.com/deepin-community/template-repository/master/debian/deepin/OWNERS [UTsweetyfish]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment