Sean Whitton <spwhitton@spwhitton.name> writes: > Hello, > > On Mon 15 May 2023 at 09:21PM +02, Paul Gevers wrote: > >> Hmm, OK. Can you please share the debdiff? Unless I see very weird >> things, I'll approve it. > > Thanks. David Bremner is hoping to work on this shortly. Please find attached a debdiff. I added the generated binary packge to a personal repo and tried installing a couple packages that depend on elpa-org (elpa-ol-notmuch and elpa-org-contrib) and they both seemed happy enough. I also ran piuparts (log attached). Unfortunately in the last step I seem to have triggered a piuparts bug. 1m1.2s ERROR: FAIL: Package purging left files on system: /root/.ssh/ not owned /var/cache/private/ not owned /var/lib/private/ not owned /var/lib/systemd/coredump/ not owned /var/lib/systemd/pstore/ not owned /var/log/private/ not owned FWIW I get the same behaviour from running "piuparts --apt emacs", so I don't think this is a regression.
diff -Nru org-mode-9.5.2+dfsh/debian/changelog org-mode-9.5.2+dfsh/debian/changelog
--- org-mode-9.5.2+dfsh/debian/changelog 2022-01-04 14:02:17.000000000 -0400
+++ org-mode-9.5.2+dfsh/debian/changelog 2023-05-16 19:58:05.000000000 -0300
@@ -1,3 +1,12 @@
+org-mode (9.5.2+dfsh-5) unstable; urgency=medium
+
+ * Team upload.
+ * Convert to empty dependency package which depends on emacs. This
+ allows package which depend on elpa-org to use the version shipped
+ with emacs (>=28.2) (Closes: #1035650).
+
+ -- David Bremner <bremner@debian.org> Tue, 16 May 2023 19:58:05 -0300
+
org-mode (9.5.2+dfsh-4) unstable; urgency=medium
* Team upload.
diff -Nru org-mode-9.5.2+dfsh/debian/control org-mode-9.5.2+dfsh/debian/control
--- org-mode-9.5.2+dfsh/debian/control 2021-12-27 15:06:14.000000000 -0400
+++ org-mode-9.5.2+dfsh/debian/control 2023-05-16 19:58:05.000000000 -0300
@@ -11,8 +11,8 @@
Package: elpa-org
Architecture: all
-Depends: ${elpa:Depends}, ${misc:Depends}, elpa-htmlize
-Recommends: emacs (>= 46.0)
+Depends: ${misc:Depends}, elpa-htmlize,
+ emacs (>= 1:28.2~)
Suggests: org-mode-doc, ditaa, texlive-latex-extra, texlive-fonts-recommended, texinfo
Enhances: emacs
Breaks: org-mode (<< 9.0.9+dfsg-2)
@@ -32,6 +32,9 @@
BBDB entries, and any files related to the projects. For printing and
sharing of notes, an Org-mode file can be exported as a structured
ASCII file, HTML, and LaTeX.
+ .
+ This is currently a dependency package. The actual org-mode files are
+ supplied by emacs.
Package: org-mode
Architecture: all
diff -Nru org-mode-9.5.2+dfsh/debian/rules org-mode-9.5.2+dfsh/debian/rules
--- org-mode-9.5.2+dfsh/debian/rules 2022-01-04 13:59:01.000000000 -0400
+++ org-mode-9.5.2+dfsh/debian/rules 2023-05-16 19:58:05.000000000 -0300
@@ -3,19 +3,11 @@
include /usr/share/dpkg/pkg-info.mk
%:
- dh $@ --with elpa
+ dh $@
override_dh_auto_build:
- emacs -Q --batch --chdir=lisp -L . \
- -l org-compat.el -l ../mk/org-fixup.el \
- --eval "(let ((v (replace-regexp-in-string \
- \"\\\\+.+\\\\'\" \
- \"\" \
- \"$(DEB_VERSION_UPSTREAM)\"))) \
- (org-make-org-version v v))"
override_dh_auto_clean:
- rm -f lisp/org-version.el
override_dh_auto_test:
Attachment:
piuparts.log
Description: Binary data