Bug#1050393: Unneeded dependency on "dconf-gsettings-backend | gsettings-backend"?
Xiyue Deng writes: > Xiyue Deng writes: > >> Xiyue Deng writes: >> >>> Sean Whitton writes: >>> Hello, On Wed 27 Mar 2024 at 11:40pm -07, Xiyue Deng wrote: > Sean Whitton writes: > >> Hello, >> >> Rob, can you review the implementation in d/rules for Xiyue's patch to >> this bug, please? I'm not sure it's the straightforward way to do it. >> >> Xiyue, I think it would make sense to use emacs-common (<< 1:29.3+2-2), >> for the relationships. > > Ah indeed, I should update the versions after the Emacs 29.3 upload, > though I think you meant "1:29.3+1-2". Also, as we are just moving > files from emacs-common to emacs-pgtk, breaks/replaces is only needed > from emacs-pgtk to emacs-common but no the other way around, so I > dropped the breaks on emacs-pgtk from emacs-common. > > I have updated the patch accordingly and attached here. PTAL. Thanks. > (BTW, I'm always curious about the "+1" part of the version number. I > would expect something like "+dfsg" or "+ds" as we are dropping some > of the non-DFSG conformant files, but why "+1"? :) It's just in case the DFSG split is done incorrectly and another attempt is required -- given how complex it is. >>> >>> Ack, totally understandable. >>> >>> With the release of Emacs 1:29.3+1-2, I have rebased the patch onto it >>> and bumped the breaks/replaces version. PTAL. >> >> Rob suggested on IRC to be a bit more conservative by removing the file >> and remove the directories upwards recursively so that we can catch >> future addition to the directories more easily. The patch has been >> adjusted accordingly. PTAL. > > Friendly ping. Rob, do you have any more comments on the current approach? Rob has provided more comments which I have adapted and tested. Please see the latest patch attached. Thanks! -- Xiyue Deng >From f88392bd68206d44b3b84a9af43d5751321ed4d2 Mon Sep 17 00:00:00 2001 From: Xiyue Deng Date: Wed, 13 Mar 2024 10:22:46 -0700 Subject: [PATCH] Install GSettings schema in pgtk build only (Closes: #1050393) * In PGTK build it generates the GSettings schema file "/usr/share/glib-2.0/schemas/org.gnu.emacs.defaults.gschema.xml" which is not needed in other variant. * Move the file from emacs-common to emacs-pgtk, and adds proper breaks/replaces to ensure a smooth upgrade. * Also incorporated suggestions by Rob. Suggestions by rlb More fix --- debian/changelog | 7 +++ debian/control | 11 +-- debian/rules | 11 ++- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5d4e9f050ae..e2a31a36fcb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +emacs (1:29.3+1-3) UNRELEASED; urgency=medium + + * Team upload. + * Install GSettings schema in pgtk build only (Closes: #1050393) + + -- Xiyue Deng Wed, 13 Mar 2024 10:22:10 -0700 + emacs (1:29.3+1-2) unstable; urgency=medium * Change native-comp-async-report-warnings-errors to `silent'. diff --git a/debian/control b/debian/control index e168717089f..3c04652c769 100644 --- a/debian/control +++ b/debian/control @@ -138,8 +138,15 @@ Provides: editor, emacs, emacsen, info-browser, mail-reader, news-reader Recommends: fonts-noto-color-emoji Suggests: emacs-common-non-dfsg Conflicts: emacs-gtk, emacs-lucid, emacs-nox -Replaces: emacs-gtk, emacs-lucid, emacs-nox, emacs-bin-common (<< 1:29.2) -Breaks: emacs-bin-common (<< 1:29.2) +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 diff --git a/debian/rules b/debian/rules index 6250f60ea9b..a50d640e116 100755 --- a/debian/rules +++ b/debian/rules @@ -425,6 +425,11 @@ override_dh_auto_install: $(autogen_install_files) cp -a $(install_dir_pgtk)/* $(pkgdir_common) rm -r $(pkgdir_common)/usr/bin + # Move to emacs-pgtk; only that pkg needs it, and it causes + # a gsettings-related dependency to be added (#1050393). + rm -r $(pkgdir_common)/usr/share/glib-2.0/schemas/org.gnu.emacs.defaults.gschema.xml + # Remove and verify expectation it's empty + cd $(pkgdir_common)/usr/share && rmdir --parents glib-2.0/schemas rm \ $(pkgdir_common)/$(libexec_dir_emacs)/hexl \ $(pkgdir_common)/$(libexec_dir_emacs)/emacs-*.pdmp \ @@ -548,7 +553,7 @@ override_dh_auto_install: $(autogen_install_files) ## # emacs-pgtk -ifneq (,$(findstring emacs, $(shell dh_listpackages))) +ifneq (,$(findstring emacs-pgtk, $(shell dh_listpackages))) $(call
Bug#1050393: Unneeded dependency on "dconf-gsettings-backend | gsettings-backend"?
Xiyue Deng writes: > Xiyue Deng writes: > >> Xiyue Deng writes: >> >>> Sean Whitton writes: >>> Hello, On Wed 27 Mar 2024 at 11:40pm -07, Xiyue Deng wrote: > Sean Whitton writes: > >> Hello, >> >> Rob, can you review the implementation in d/rules for Xiyue's patch to >> this bug, please? I'm not sure it's the straightforward way to do it. >> >> Xiyue, I think it would make sense to use emacs-common (<< 1:29.3+2-2), >> for the relationships. > > Ah indeed, I should update the versions after the Emacs 29.3 upload, > though I think you meant "1:29.3+1-2". Also, as we are just moving > files from emacs-common to emacs-pgtk, breaks/replaces is only needed > from emacs-pgtk to emacs-common but no the other way around, so I > dropped the breaks on emacs-pgtk from emacs-common. > > I have updated the patch accordingly and attached here. PTAL. Thanks. > (BTW, I'm always curious about the "+1" part of the version number. I > would expect something like "+dfsg" or "+ds" as we are dropping some > of the non-DFSG conformant files, but why "+1"? :) It's just in case the DFSG split is done incorrectly and another attempt is required -- given how complex it is. >>> >>> Ack, totally understandable. >>> >>> With the release of Emacs 1:29.3+1-2, I have rebased the patch onto it >>> and bumped the breaks/replaces version. PTAL. >> >> Rob suggested on IRC to be a bit more conservative by removing the file >> and remove the directories upwards recursively so that we can catch >> future addition to the directories more easily. The patch has been >> adjusted accordingly. PTAL. > > Friendly ping. Rob, do you have any more comments on the current > approach? Friendly ping 2 :) -- Xiyue Deng
Bug#1050393: Unneeded dependency on "dconf-gsettings-backend | gsettings-backend"?
Xiyue Deng writes: > Xiyue Deng writes: > >> Sean Whitton writes: >> >>> Hello, >>> >>> On Wed 27 Mar 2024 at 11:40pm -07, Xiyue Deng wrote: >>> Sean Whitton writes: > Hello, > > Rob, can you review the implementation in d/rules for Xiyue's patch to > this bug, please? I'm not sure it's the straightforward way to do it. > > Xiyue, I think it would make sense to use emacs-common (<< 1:29.3+2-2), > for the relationships. Ah indeed, I should update the versions after the Emacs 29.3 upload, though I think you meant "1:29.3+1-2". Also, as we are just moving files from emacs-common to emacs-pgtk, breaks/replaces is only needed from emacs-pgtk to emacs-common but no the other way around, so I dropped the breaks on emacs-pgtk from emacs-common. I have updated the patch accordingly and attached here. PTAL. >>> >>> Thanks. >>> (BTW, I'm always curious about the "+1" part of the version number. I would expect something like "+dfsg" or "+ds" as we are dropping some of the non-DFSG conformant files, but why "+1"? :) >>> >>> It's just in case the DFSG split is done incorrectly and another attempt >>> is required -- given how complex it is. >> >> Ack, totally understandable. >> >> With the release of Emacs 1:29.3+1-2, I have rebased the patch onto it >> and bumped the breaks/replaces version. PTAL. > > Rob suggested on IRC to be a bit more conservative by removing the file > and remove the directories upwards recursively so that we can catch > future addition to the directories more easily. The patch has been > adjusted accordingly. PTAL. Friendly ping. Rob, do you have any more comments on the current approach? -- Xiyue Deng
Bug#1050393: Unneeded dependency on "dconf-gsettings-backend | gsettings-backend"?
Xiyue Deng writes: > Sean Whitton writes: > >> Hello, >> >> On Wed 27 Mar 2024 at 11:40pm -07, Xiyue Deng wrote: >> >>> Sean Whitton writes: >>> Hello, Rob, can you review the implementation in d/rules for Xiyue's patch to this bug, please? I'm not sure it's the straightforward way to do it. Xiyue, I think it would make sense to use emacs-common (<< 1:29.3+2-2), for the relationships. >>> >>> Ah indeed, I should update the versions after the Emacs 29.3 upload, >>> though I think you meant "1:29.3+1-2". Also, as we are just moving >>> files from emacs-common to emacs-pgtk, breaks/replaces is only needed >>> from emacs-pgtk to emacs-common but no the other way around, so I >>> dropped the breaks on emacs-pgtk from emacs-common. >>> >>> I have updated the patch accordingly and attached here. PTAL. >> >> Thanks. >> >>> (BTW, I'm always curious about the "+1" part of the version number. I >>> would expect something like "+dfsg" or "+ds" as we are dropping some >>> of the non-DFSG conformant files, but why "+1"? :) >> >> It's just in case the DFSG split is done incorrectly and another attempt >> is required -- given how complex it is. > > Ack, totally understandable. > > With the release of Emacs 1:29.3+1-2, I have rebased the patch onto it > and bumped the breaks/replaces version. PTAL. Rob suggested on IRC to be a bit more conservative by removing the file and remove the directories upwards recursively so that we can catch future addition to the directories more easily. The patch has been adjusted accordingly. PTAL. -- Xiyue Deng >From 400a3efac8f0d2ab02ba18ac4cb5ee2324bf7c23 Mon Sep 17 00:00:00 2001 From: Xiyue Deng Date: Wed, 13 Mar 2024 10:22:46 -0700 Subject: [PATCH] Install GSettings schema in pgtk build only (Closes: #1050393) * In PGTK build it generates the GSettings schema file "/usr/share/glib-2.0/schemas/org.gnu.emacs.defaults.gschema.xml" which is not needed in other variant. * Move the file from emacs-common to emacs-pgtk, and adds proper breaks/replaces to ensure a smooth upgrade. --- debian/changelog | 7 +++ debian/control | 11 +-- debian/rules | 12 +++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5d4e9f050ae..e2a31a36fcb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +emacs (1:29.3+1-3) UNRELEASED; urgency=medium + + * Team upload. + * Install GSettings schema in pgtk build only (Closes: #1050393) + + -- Xiyue Deng Wed, 13 Mar 2024 10:22:10 -0700 + emacs (1:29.3+1-2) unstable; urgency=medium * Change native-comp-async-report-warnings-errors to `silent'. diff --git a/debian/control b/debian/control index e168717089f..3c04652c769 100644 --- a/debian/control +++ b/debian/control @@ -138,8 +138,15 @@ Provides: editor, emacs, emacsen, info-browser, mail-reader, news-reader Recommends: fonts-noto-color-emoji Suggests: emacs-common-non-dfsg Conflicts: emacs-gtk, emacs-lucid, emacs-nox -Replaces: emacs-gtk, emacs-lucid, emacs-nox, emacs-bin-common (<< 1:29.2) -Breaks: emacs-bin-common (<< 1:29.2) +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 diff --git a/debian/rules b/debian/rules index 6250f60ea9b..1262e568c80 100755 --- a/debian/rules +++ b/debian/rules @@ -489,6 +489,12 @@ override_dh_auto_install: $(autogen_install_files) rm -f $(pkgdir_common)/usr/share/info/emacs/dir.old install -d $(pkgdir_common)/usr/local/share/emacs/site-lisp + + # PGTK builds a GSettings schema that is PGTK specific and + # should not be shipped in emacs-common + cd $(pkgdir_common)/usr/share \ + && rm glib-2.0/schemas/org.gnu.emacs.defaults.gschema.xml \ + && rmdir --parents glib-2.0/schemas endif ## @@ -548,7 +554,7 @@ override_dh_auto_install: $(autogen_install_files) ## # emacs-pgtk -ifneq (,$(findstring emacs, $(shell dh_listpackages))) +ifneq (,$(findstring emacs-pgtk, $(shell dh_listpackages))) $(call install_common_binpkg_bits,$(install_dir_pgtk),$(pkgdir_pgtk),emacs-pgtk,pgtk) # install desktop entries @@ -557,6 +563,10 @@ override_dh_auto_install: $(autogen_install_files) debian/emacs.desktop \ debian/emacs-term.desktop \ $(pkgdir_pgtk)/usr/share/applications/ + # install GSettings schema + install -d $(pkgdir_pgtk)/usr/share/glib-2.0 + cp -a $(install_dir_pgtk)/usr/share/glib-2.0/* \ + $(pkgdir_pgtk)/usr/share/glib-2.0 endif
Bug#1050393: Unneeded dependency on "dconf-gsettings-backend | gsettings-backend"?
Sean Whitton writes: > Hello, > > On Wed 27 Mar 2024 at 11:40pm -07, Xiyue Deng wrote: > >> Sean Whitton writes: >> >>> Hello, >>> >>> Rob, can you review the implementation in d/rules for Xiyue's patch to >>> this bug, please? I'm not sure it's the straightforward way to do it. >>> >>> Xiyue, I think it would make sense to use emacs-common (<< 1:29.3+2-2), >>> for the relationships. >> >> Ah indeed, I should update the versions after the Emacs 29.3 upload, >> though I think you meant "1:29.3+1-2". Also, as we are just moving >> files from emacs-common to emacs-pgtk, breaks/replaces is only needed >> from emacs-pgtk to emacs-common but no the other way around, so I >> dropped the breaks on emacs-pgtk from emacs-common. >> >> I have updated the patch accordingly and attached here. PTAL. > > Thanks. > >> (BTW, I'm always curious about the "+1" part of the version number. I >> would expect something like "+dfsg" or "+ds" as we are dropping some >> of the non-DFSG conformant files, but why "+1"? :) > > It's just in case the DFSG split is done incorrectly and another attempt > is required -- given how complex it is. Ack, totally understandable. With the release of Emacs 1:29.3+1-2, I have rebased the patch onto it and bumped the breaks/replaces version. PTAL. -- Xiyue Deng >From c0a4ee1d76f2206594ce9897b651bbdd22baf716 Mon Sep 17 00:00:00 2001 From: Xiyue Deng Date: Wed, 13 Mar 2024 10:22:46 -0700 Subject: [PATCH] Install GSettings schema in pgtk build only (Closes: #1050393) * In PGTK build it generates the GSettings schema file "/usr/share/glib-2.0/schemas/org.gnu.emacs.defaults.gschema.xml" which is not needed in other variant. * Move the file from emacs-common to emacs-pgtk, and adds proper breaks/replaces to ensure a smooth upgrade. --- debian/changelog | 7 +++ debian/control | 11 +-- debian/rules | 9 - 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5d4e9f050ae..e2a31a36fcb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +emacs (1:29.3+1-3) UNRELEASED; urgency=medium + + * Team upload. + * Install GSettings schema in pgtk build only (Closes: #1050393) + + -- Xiyue Deng Wed, 13 Mar 2024 10:22:10 -0700 + emacs (1:29.3+1-2) unstable; urgency=medium * Change native-comp-async-report-warnings-errors to `silent'. diff --git a/debian/control b/debian/control index e168717089f..3c04652c769 100644 --- a/debian/control +++ b/debian/control @@ -138,8 +138,15 @@ Provides: editor, emacs, emacsen, info-browser, mail-reader, news-reader Recommends: fonts-noto-color-emoji Suggests: emacs-common-non-dfsg Conflicts: emacs-gtk, emacs-lucid, emacs-nox -Replaces: emacs-gtk, emacs-lucid, emacs-nox, emacs-bin-common (<< 1:29.2) -Breaks: emacs-bin-common (<< 1:29.2) +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 diff --git a/debian/rules b/debian/rules index 6250f60ea9b..205c45dff65 100755 --- a/debian/rules +++ b/debian/rules @@ -425,6 +425,9 @@ override_dh_auto_install: $(autogen_install_files) cp -a $(install_dir_pgtk)/* $(pkgdir_common) rm -r $(pkgdir_common)/usr/bin + # PGTK builds a GSettings schema that is PGTK specific and + # should not be shipped in emacs-common + rm -r $(pkgdir_common)/usr/share/glib-2.0 rm \ $(pkgdir_common)/$(libexec_dir_emacs)/hexl \ $(pkgdir_common)/$(libexec_dir_emacs)/emacs-*.pdmp \ @@ -548,7 +551,7 @@ override_dh_auto_install: $(autogen_install_files) ## # emacs-pgtk -ifneq (,$(findstring emacs, $(shell dh_listpackages))) +ifneq (,$(findstring emacs-pgtk, $(shell dh_listpackages))) $(call install_common_binpkg_bits,$(install_dir_pgtk),$(pkgdir_pgtk),emacs-pgtk,pgtk) # install desktop entries @@ -557,6 +560,10 @@ override_dh_auto_install: $(autogen_install_files) debian/emacs.desktop \ debian/emacs-term.desktop \ $(pkgdir_pgtk)/usr/share/applications/ + # install GSettings schema + install -d $(pkgdir_pgtk)/usr/share/glib-2.0 + cp -a $(install_dir_pgtk)/usr/share/glib-2.0/* \ + $(pkgdir_pgtk)/usr/share/glib-2.0 endif ## -- 2.39.2
Bug#1050393: Unneeded dependency on "dconf-gsettings-backend | gsettings-backend"?
Hello, On Wed 27 Mar 2024 at 11:40pm -07, Xiyue Deng wrote: > Sean Whitton writes: > >> Hello, >> >> Rob, can you review the implementation in d/rules for Xiyue's patch to >> this bug, please? I'm not sure it's the straightforward way to do it. >> >> Xiyue, I think it would make sense to use emacs-common (<< 1:29.3+2-2), >> for the relationships. > > Ah indeed, I should update the versions after the Emacs 29.3 upload, > though I think you meant "1:29.3+1-2". Also, as we are just moving > files from emacs-common to emacs-pgtk, breaks/replaces is only needed > from emacs-pgtk to emacs-common but no the other way around, so I > dropped the breaks on emacs-pgtk from emacs-common. > > I have updated the patch accordingly and attached here. PTAL. Thanks. > (BTW, I'm always curious about the "+1" part of the version number. I > would expect something like "+dfsg" or "+ds" as we are dropping some > of the non-DFSG conformant files, but why "+1"? :) It's just in case the DFSG split is done incorrectly and another attempt is required -- given how complex it is. -- Sean Whitton
Bug#1050393: Unneeded dependency on "dconf-gsettings-backend | gsettings-backend"?
Sean Whitton writes: > Hello, > > Rob, can you review the implementation in d/rules for Xiyue's patch to > this bug, please? I'm not sure it's the straightforward way to do it. > > Xiyue, I think it would make sense to use emacs-common (<< 1:29.3+2-2), > for the relationships. Ah indeed, I should update the versions after the Emacs 29.3 upload, though I think you meant "1:29.3+1-2". Also, as we are just moving files from emacs-common to emacs-pgtk, breaks/replaces is only needed from emacs-pgtk to emacs-common but no the other way around, so I dropped the breaks on emacs-pgtk from emacs-common. I have updated the patch accordingly and attached here. PTAL. (BTW, I'm always curious about the "+1" part of the version number. I would expect something like "+dfsg" or "+ds" as we are dropping some of the non-DFSG conformant files, but why "+1"? :) > > Thanks both. -- Xiyue Deng From 2eeb19bc6b532c5b32ae1b523c29c6c3387701e4 Mon Sep 17 00:00:00 2001 From: Xiyue Deng Date: Wed, 13 Mar 2024 10:22:46 -0700 Subject: [PATCH] Install GSettings schema in pgtk build only (Closes: #1050393) * In PGTK build it generates the GSettings schema file "/usr/share/glib-2.0/schemas/org.gnu.emacs.defaults.gschema.xml" which is not needed in other variant. * Move the file from emacs-common to emacs-pgtk, and adds proper breaks/replaces to ensure a smooth upgrade. --- debian/changelog | 7 +++ debian/control | 11 +-- debian/rules | 9 - 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6ffab5c7af8..18c502de26d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +emacs (1:29.3+1-2) UNRELEASED; urgency=medium + + * Team upload. + * Install GSettings schema in pgtk build only (Closes: #1050393) + + -- Xiyue Deng Wed, 13 Mar 2024 10:22:10 -0700 + emacs (1:29.3+1-1) unstable; urgency=high * Merge upstream version 29.3. Thanks to David Bremner for the diff --git a/debian/control b/debian/control index e168717089f..2cb0ab16239 100644 --- a/debian/control +++ b/debian/control @@ -138,8 +138,15 @@ Provides: editor, emacs, emacsen, info-browser, mail-reader, news-reader Recommends: fonts-noto-color-emoji Suggests: emacs-common-non-dfsg Conflicts: emacs-gtk, emacs-lucid, emacs-nox -Replaces: emacs-gtk, emacs-lucid, emacs-nox, emacs-bin-common (<< 1:29.2) -Breaks: emacs-bin-common (<< 1:29.2) +Replaces: + emacs-gtk, + emacs-lucid, + emacs-nox, + emacs-bin-common (<< 1:29.2), + emacs-common (<< 1:29.3+1-2~), +Breaks: + emacs-bin-common (<< 1:29.2), + emacs-common (<< 1:29.3+1-2~), 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 diff --git a/debian/rules b/debian/rules index 38965316f3d..8448d7c9be3 100755 --- a/debian/rules +++ b/debian/rules @@ -425,6 +425,9 @@ override_dh_auto_install: $(autogen_install_files) cp -a $(install_dir_pgtk)/* $(pkgdir_common) rm -r $(pkgdir_common)/usr/bin + # PGTK builds a GSettings schema that is PGTK specific and + # should not be shipped in emacs-common + rm -r $(pkgdir_common)/usr/share/glib-2.0 rm \ $(pkgdir_common)/$(libexec_dir_emacs)/hexl \ $(pkgdir_common)/$(libexec_dir_emacs)/emacs-*.pdmp \ @@ -548,7 +551,7 @@ override_dh_auto_install: $(autogen_install_files) ## # emacs-pgtk -ifneq (,$(findstring emacs, $(shell dh_listpackages))) +ifneq (,$(findstring emacs-pgtk, $(shell dh_listpackages))) $(call install_common_binpkg_bits,$(install_dir_pgtk),$(pkgdir_pgtk),emacs-pgtk,pgtk) # install desktop entries @@ -557,6 +560,10 @@ override_dh_auto_install: $(autogen_install_files) debian/emacs.desktop \ debian/emacs-term.desktop \ $(pkgdir_pgtk)/usr/share/applications/ + # install GSettings schema + install -d $(pkgdir_pgtk)/usr/share/glib-2.0 + cp -a $(install_dir_pgtk)/usr/share/glib-2.0/* \ + $(pkgdir_pgtk)/usr/share/glib-2.0 endif ## -- 2.39.2 signature.asc Description: PGP signature
Bug#1050393: Unneeded dependency on "dconf-gsettings-backend | gsettings-backend"?
Hello, Rob, can you review the implementation in d/rules for Xiyue's patch to this bug, please? I'm not sure it's the straightforward way to do it. Xiyue, I think it would make sense to use emacs-common (<< 1:29.3+2-2), for the relationships. Thanks both. -- Sean Whitton signature.asc Description: PGP signature
Bug#1050393: Unneeded dependency on "dconf-gsettings-backend | gsettings-backend"?
Xiyue Deng writes:
> Xiyue Deng writes:
>
>> Control: tags -1 patch
>>
>> Hi,
>>
>> It looks like the gsettings-backend dependency was introduced since
>> Emacs 29.1. Tried to debug this a little, and it looks like the
>> dependencies was pulled in through ${misc:Depends} due to the GSettings
>> schema file[1]. With helps from folks on IRC, we found that this file
>> was installed only in PGTK mode[2], so technically this is not required
>> by other modes and should be safe to be moved from emacs-common to
>> emacs-pgtk.
>>
>> I have prepared a MR[3] (patch also attached) as an attempt and verified
>> that it moved the "dconf-gsettings-backend | gsettings-backend" from
>> emacs-common to emacs-pgtk. I'll try to use this locally with emacs-nox
>> to further verify that it doesn't cause any issues.
>>
>> Meanwhile, would be great to have people review the patch. TIA!
>>
>> [1] Search for
>> "/usr/share/glib-2.0/schemas/org.gnu.emacs.defaults.gschema.xml" on
>> https://packages.debian.org/sid/all/emacs-common/filelist
>>
>> [2]
>> https://salsa.debian.org/rlb/deb-emacs/-/blob/deb/emacs/d/sid/master/Makefile.in?ref_type=heads#L1334-1337
>>
>> [3] https://salsa.debian.org/rlb/deb-emacs/-/merge_requests/12
>
> I have made a few updates to the merge request, and please see the
> updated patch attached. Do refer to the merge request[1] for the latest
> updates.
>
> [1] https://salsa.debian.org/rlb/deb-emacs/-/merge_requests/12
I have attached the refreshed patches after the release of 29.3+1-1. TIA!
(Note that merge requests were closed so the salsa link is no longer valid.)
--
Xiyue Deng
>From 2ce769b9ea45d72ed54d6168875626b10c8e7321 Mon Sep 17 00:00:00 2001
From: Xiyue Deng
Date: Wed, 13 Mar 2024 10:22:46 -0700
Subject: [PATCH] Install GSettings schema in pgtk build only (Closes:
#1050393)
* In PGTK build it generates the GSettings schema file
"/usr/share/glib-2.0/schemas/org.gnu.emacs.defaults.gschema.xml" which
is not needed in other variant.
* Move the file from emacs-common to emacs-pgtk, and adds proper
breaks/replaces/conflicts to ensure a smooth upgrade.
---
debian/changelog | 7 +++
debian/control | 12 ++--
debian/rules | 9 -
3 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6ffab5c7af8..18c502de26d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+emacs (1:29.3+1-2) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Install GSettings schema in pgtk build only (Closes: #1050393)
+
+ -- Xiyue Deng Wed, 13 Mar 2024 10:22:10 -0700
+
emacs (1:29.3+1-1) unstable; urgency=high
* Merge upstream version 29.3. Thanks to David Bremner for the
diff --git a/debian/control b/debian/control
index e168717089f..0c6fab0bfeb 100644
--- a/debian/control
+++ b/debian/control
@@ -138,8 +138,15 @@ Provides: editor, emacs, emacsen, info-browser, mail-reader, news-reader
Recommends: fonts-noto-color-emoji
Suggests: emacs-common-non-dfsg
Conflicts: emacs-gtk, emacs-lucid, emacs-nox
-Replaces: emacs-gtk, emacs-lucid, emacs-nox, emacs-bin-common (<< 1:29.2)
-Breaks: emacs-bin-common (<< 1:29.2)
+Replaces:
+ emacs-gtk,
+ emacs-lucid,
+ emacs-nox,
+ emacs-bin-common (<< 1:29.2),
+ emacs-common (<< 1:29.2+1-3~),
+Breaks:
+ emacs-bin-common (<< 1:29.2),
+ emacs-common (<< 1:29.2+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
@@ -184,6 +191,7 @@ Breaks:
emacs-gtk (<< 1:25),
emacs-lucid (<< 1:25),
emacs-nox (<< 1:25),
+ emacs-pgtk (<< 1:29.2+1-3~),
Replaces:
emacs-bin-common (<< 1:28)
Description: GNU Emacs editor's shared, architecture independent infrastructure
diff --git a/debian/rules b/debian/rules
index 38965316f3d..8448d7c9be3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -425,6 +425,9 @@ override_dh_auto_install: $(autogen_install_files)
cp -a $(install_dir_pgtk)/* $(pkgdir_common)
rm -r $(pkgdir_common)/usr/bin
+ # PGTK builds a GSettings schema that is PGTK specific and
+ # should not be shipped in emacs-common
+ rm -r $(pkgdir_common)/usr/share/glib-2.0
rm \
$(pkgdir_common)/$(libexec_dir_emacs)/hexl \
$(pkgdir_common)/$(libexec_dir_emacs)/emacs-*.pdmp \
@@ -548,7 +551,7 @@ override_dh_auto_install: $(autogen_install_files)
##
# emacs-pgtk
-ifneq (,$(findstring emacs, $(shell dh_listpackages)))
+ifneq (,$(findstring emacs-pgtk, $(shell dh_listpackages)))
$(call install_common_binpkg_bits,$(install_dir_pgtk),$(pkgdir_pgtk),emacs-pgtk,pgtk)
# install desktop entries
@@ -557,6 +560,10 @@ override_dh_auto_install: $(autogen_install_files)
debian/emacs.desktop \
debian/emacs-term.desktop \
$(pkgdir_pgtk)/usr/share/applications/
+ # install GSettings schema
+ install
Bug#1050393: Unneeded dependency on "dconf-gsettings-backend | gsettings-backend"?
Xiyue Deng writes:
> Control: tags -1 patch
>
> Hi,
>
> It looks like the gsettings-backend dependency was introduced since
> Emacs 29.1. Tried to debug this a little, and it looks like the
> dependencies was pulled in through ${misc:Depends} due to the GSettings
> schema file[1]. With helps from folks on IRC, we found that this file
> was installed only in PGTK mode[2], so technically this is not required
> by other modes and should be safe to be moved from emacs-common to
> emacs-pgtk.
>
> I have prepared a MR[3] (patch also attached) as an attempt and verified
> that it moved the "dconf-gsettings-backend | gsettings-backend" from
> emacs-common to emacs-pgtk. I'll try to use this locally with emacs-nox
> to further verify that it doesn't cause any issues.
>
> Meanwhile, would be great to have people review the patch. TIA!
>
> [1] Search for
> "/usr/share/glib-2.0/schemas/org.gnu.emacs.defaults.gschema.xml" on
> https://packages.debian.org/sid/all/emacs-common/filelist
>
> [2]
> https://salsa.debian.org/rlb/deb-emacs/-/blob/deb/emacs/d/sid/master/Makefile.in?ref_type=heads#L1334-1337
>
> [3] https://salsa.debian.org/rlb/deb-emacs/-/merge_requests/12
I have made a few updates to the merge request, and please see the
updated patch attached. Do refer to the merge request[1] for the latest
updates.
[1] https://salsa.debian.org/rlb/deb-emacs/-/merge_requests/12
--
Xiyue Deng
>From 5fbec288a2c0c3fa54e100362155268ed40373e3 Mon Sep 17 00:00:00 2001
From: Xiyue Deng
Date: Wed, 13 Mar 2024 10:22:46 -0700
Subject: [PATCH] Install GSettings schema in pgtk build only (Closes:
#1050393)
* In PGTK build it generates the GSettings schema file
"/usr/share/glib-2.0/schemas/org.gnu.emacs.defaults.gschema.xml" which
is not needed in other variant.
* Move the file from emacs-common to emacs-pgtk, and adds proper
breaks/replaces/conflicts to ensure a smooth upgrade.
---
debian/changelog | 7 +++
debian/control | 12 ++--
debian/rules | 9 -
3 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c53984fc648..960672b6297 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+emacs (1:29.2+1-3) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Install GSettings schema in pgtk build only (Closes: #1050393)
+
+ -- Xiyue Deng Wed, 13 Mar 2024 10:22:10 -0700
+
emacs (1:29.2+1-2) unstable; urgency=medium
* Fix Breaks/Replaces by prepending missing epoch (Closes: #1064851)
diff --git a/debian/control b/debian/control
index e168717089f..0c6fab0bfeb 100644
--- a/debian/control
+++ b/debian/control
@@ -138,8 +138,15 @@ Provides: editor, emacs, emacsen, info-browser, mail-reader, news-reader
Recommends: fonts-noto-color-emoji
Suggests: emacs-common-non-dfsg
Conflicts: emacs-gtk, emacs-lucid, emacs-nox
-Replaces: emacs-gtk, emacs-lucid, emacs-nox, emacs-bin-common (<< 1:29.2)
-Breaks: emacs-bin-common (<< 1:29.2)
+Replaces:
+ emacs-gtk,
+ emacs-lucid,
+ emacs-nox,
+ emacs-bin-common (<< 1:29.2),
+ emacs-common (<< 1:29.2+1-3~),
+Breaks:
+ emacs-bin-common (<< 1:29.2),
+ emacs-common (<< 1:29.2+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
@@ -184,6 +191,7 @@ Breaks:
emacs-gtk (<< 1:25),
emacs-lucid (<< 1:25),
emacs-nox (<< 1:25),
+ emacs-pgtk (<< 1:29.2+1-3~),
Replaces:
emacs-bin-common (<< 1:28)
Description: GNU Emacs editor's shared, architecture independent infrastructure
diff --git a/debian/rules b/debian/rules
index 38965316f3d..8448d7c9be3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -425,6 +425,9 @@ override_dh_auto_install: $(autogen_install_files)
cp -a $(install_dir_pgtk)/* $(pkgdir_common)
rm -r $(pkgdir_common)/usr/bin
+ # PGTK builds a GSettings schema that is PGTK specific and
+ # should not be shipped in emacs-common
+ rm -r $(pkgdir_common)/usr/share/glib-2.0
rm \
$(pkgdir_common)/$(libexec_dir_emacs)/hexl \
$(pkgdir_common)/$(libexec_dir_emacs)/emacs-*.pdmp \
@@ -548,7 +551,7 @@ override_dh_auto_install: $(autogen_install_files)
##
# emacs-pgtk
-ifneq (,$(findstring emacs, $(shell dh_listpackages)))
+ifneq (,$(findstring emacs-pgtk, $(shell dh_listpackages)))
$(call install_common_binpkg_bits,$(install_dir_pgtk),$(pkgdir_pgtk),emacs-pgtk,pgtk)
# install desktop entries
@@ -557,6 +560,10 @@ override_dh_auto_install: $(autogen_install_files)
debian/emacs.desktop \
debian/emacs-term.desktop \
$(pkgdir_pgtk)/usr/share/applications/
+ # install GSettings schema
+ install -d $(pkgdir_pgtk)/usr/share/glib-2.0
+ cp -a $(install_dir_pgtk)/usr/share/glib-2.0/* \
+ $(pkgdir_pgtk)/usr/share/glib-2.0
endif
##
--
Bug#1050393: Unneeded dependency on "dconf-gsettings-backend | gsettings-backend"?
Control: tags -1 patch
Hi,
It looks like the gsettings-backend dependency was introduced since
Emacs 29.1. Tried to debug this a little, and it looks like the
dependencies was pulled in through ${misc:Depends} due to the GSettings
schema file[1]. With helps from folks on IRC, we found that this file
was installed only in PGTK mode[2], so technically this is not required
by other modes and should be safe to be moved from emacs-common to
emacs-pgtk.
I have prepared a MR[3] (patch also attached) as an attempt and verified
that it moved the "dconf-gsettings-backend | gsettings-backend" from
emacs-common to emacs-pgtk. I'll try to use this locally with emacs-nox
to further verify that it doesn't cause any issues.
Meanwhile, would be great to have people review the patch. TIA!
[1] Search for
"/usr/share/glib-2.0/schemas/org.gnu.emacs.defaults.gschema.xml" on
https://packages.debian.org/sid/all/emacs-common/filelist
[2]
https://salsa.debian.org/rlb/deb-emacs/-/blob/deb/emacs/d/sid/master/Makefile.in?ref_type=heads#L1334-1337
[3] https://salsa.debian.org/rlb/deb-emacs/-/merge_requests/12
--
Xiyue Deng
>From f52a28d269f9e9698347c3a7a4c7d3cc531c166c Mon Sep 17 00:00:00 2001
From: Xiyue Deng
Date: Wed, 13 Mar 2024 10:22:46 -0700
Subject: [PATCH] Install GSettings schema in pgtk build only (Closes:
#1050393)
* In PGTK build it generates the GSettings schema file
"/usr/share/glib-2.0/schemas/org.gnu.emacs.defaults.gschema.xml" which
is not needed in other variant.
* Move the file from emacs-common to emacs-pgtk, and adds proper
breaks/replaces/conflicts to ensure a smooth upgrade.
---
debian/changelog | 7 +++
debian/control | 10 --
debian/rules | 9 -
3 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c53984fc648..960672b6297 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+emacs (1:29.2+1-3) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Install GSettings schema in pgtk build only (Closes: #1050393)
+
+ -- Xiyue Deng Wed, 13 Mar 2024 10:22:10 -0700
+
emacs (1:29.2+1-2) unstable; urgency=medium
* Fix Breaks/Replaces by prepending missing epoch (Closes: #1064851)
diff --git a/debian/control b/debian/control
index e168717089f..a2b65b26329 100644
--- a/debian/control
+++ b/debian/control
@@ -138,8 +138,13 @@ Provides: editor, emacs, emacsen, info-browser, mail-reader, news-reader
Recommends: fonts-noto-color-emoji
Suggests: emacs-common-non-dfsg
Conflicts: emacs-gtk, emacs-lucid, emacs-nox
-Replaces: emacs-gtk, emacs-lucid, emacs-nox, emacs-bin-common (<< 1:29.2)
-Breaks: emacs-bin-common (<< 1:29.2)
+Replaces:
+ emacs-gtk,
+ emacs-lucid,
+ emacs-nox,
+ emacs-bin-common (<< 1:29.2),
+ emacs-common (<< 1:29.2+1-3),
+Breaks: emacs-bin-common (<< 1:29.2), emacs-common (<< 1:29.2+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
@@ -184,6 +189,7 @@ Breaks:
emacs-gtk (<< 1:25),
emacs-lucid (<< 1:25),
emacs-nox (<< 1:25),
+ emacs-pgtk (<< 1:29.2+1-3),
Replaces:
emacs-bin-common (<< 1:28)
Description: GNU Emacs editor's shared, architecture independent infrastructure
diff --git a/debian/rules b/debian/rules
index 38965316f3d..8448d7c9be3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -425,6 +425,9 @@ override_dh_auto_install: $(autogen_install_files)
cp -a $(install_dir_pgtk)/* $(pkgdir_common)
rm -r $(pkgdir_common)/usr/bin
+ # PGTK builds a GSettings schema that is PGTK specific and
+ # should not be shipped in emacs-common
+ rm -r $(pkgdir_common)/usr/share/glib-2.0
rm \
$(pkgdir_common)/$(libexec_dir_emacs)/hexl \
$(pkgdir_common)/$(libexec_dir_emacs)/emacs-*.pdmp \
@@ -548,7 +551,7 @@ override_dh_auto_install: $(autogen_install_files)
##
# emacs-pgtk
-ifneq (,$(findstring emacs, $(shell dh_listpackages)))
+ifneq (,$(findstring emacs-pgtk, $(shell dh_listpackages)))
$(call install_common_binpkg_bits,$(install_dir_pgtk),$(pkgdir_pgtk),emacs-pgtk,pgtk)
# install desktop entries
@@ -557,6 +560,10 @@ override_dh_auto_install: $(autogen_install_files)
debian/emacs.desktop \
debian/emacs-term.desktop \
$(pkgdir_pgtk)/usr/share/applications/
+ # install GSettings schema
+ install -d $(pkgdir_pgtk)/usr/share/glib-2.0
+ cp -a $(install_dir_pgtk)/usr/share/glib-2.0/* \
+ $(pkgdir_pgtk)/usr/share/glib-2.0
endif
##
--
2.39.2
Bug#1050393: Unneeded dependency on "dconf-gsettings-backend | gsettings-backend"?
Hello, On Wed 06 Sep 2023 at 12:18pm +02, Axel Beckert wrote: > No, this is a rather severe degradation of emacs-nox's usability and > needs to be fixed, either by splitting off these components into a new > package emacs-common-pgtk or simlar if Wayland causes such problems > for other variants or by solving it in another way which causes less > issues for the other variants, too —- like e.g. putting these > dependencies in other packages with emacs-common just sporting them in > Recommends or Suggests. I think there are two acceptable solutions: - move the dependency over to the relevant flavour packages, i.e. all of emacs-gtk, emacs-pgtk etc., depending on what actually needs it - move emacsclient out of emacs-bin-common altogether, and install one version in each flavour package. -- Sean Whitton signature.asc Description: PGP signature
Bug#1050393: Unneeded dependency on "dconf-gsettings-backend | gsettings-backend"?
Control: severity -1 important Hi, John Zaitseff wrote: > The latest (Sid) version of emacs-common now depends on > "dconf-gsettings-backend | gsettings-backend", which in turn > eventually installs dbus-daemon -- which is problematic in a Debian > build chroot environment. Can that dependency be downgraded to > Recommends or Suggests? Or put the dependency back into those packages which actually require dbus. Because the current dependency setup causes dbus and other completely unnecessary desktop stuff to be pulled in on servers and VMs where just emacs-nox is installed despite emacs-nox is meant for non desktop systems. (And please remember that the "d" in "dbus" stands for "desktop".) John Zaitseff wrote: > After a bit of digging around through the package source code, this > is as a result of using the binaries from the "pgtk" build of Emacs > for common binaries -- since "other builds' emacsclients cannot > connect to pgtk under Wayland". *sigh* > Given that that is a good reason, IMHO, for using the binaries in > that way, feel free to close this bug report. No, this is a rather severe degradation of emacs-nox's usability and needs to be fixed, either by splitting off these components into a new package emacs-common-pgtk or simlar if Wayland causes such problems for other variants or by solving it in another way which causes less issues for the other variants, too —- like e.g. putting these dependencies in other packages with emacs-common just sporting them in Recommends or Suggests. Regards, Axel -- ,''`. | Axel Beckert , https://people.debian.org/~abe/ : :' : | Debian Developer, ftp.ch.debian.org Admin `. `' | 4096R: 2517 B724 C5F6 CA99 5329 6E61 2FF9 CD59 6126 16B5 `-| 1024D: F067 EA27 26B9 C3FC 1486 202E C09E 1D89 9593 0EDE
Bug#1050393: Unneeded dependency on "dconf-gsettings-backend | gsettings-backend"?
I wrote: > The latest (Sid) version of emacs-common now depends on > "dconf-gsettings-backend | gsettings-backend", which in turn > eventually installs dbus-daemon -- which is problematic in a > Debian build chroot environment. Can that dependency be > downgraded to Recommends or Suggests? After a bit of digging around through the package source code, this is as a result of using the binaries from the "pgtk" build of Emacs for common binaries -- since "other builds' emacsclients cannot connect to pgtk under Wayland". Given that that is a good reason, IMHO, for using the binaries in that way, feel free to close this bug report. I'll just have to live with installing dbus-daemon in chroot environments... Yours truly, John Zaitseff -- John Zaitseff ╭───╮ Email: j.zaits...@zap.org.au The ZAP Group │ Z │ GnuPG: 0x0D254111C4EE569B Australia Inc. ╰───╯ https://www.zap.org.au/~john/
Bug#1050393: Unneeded dependency on "dconf-gsettings-backend | gsettings-backend"?
Package: emacs-common Version: 1:29.1+1-4 The latest (Sid) version of emacs-common now depends on "dconf-gsettings-backend | gsettings-backend", which in turn eventually installs dbus-daemon -- which is problematic in a Debian build chroot environment. Can that dependency be downgraded to Recommends or Suggests? Yours truly, John Zaitseff -- John Zaitseff ╭───╮ Email: j.zaits...@zap.org.au The ZAP Group │ Z │ GnuPG: 0x0D254111C4EE569B Australia Inc. ╰───╯ https://www.zap.org.au/~john/
