diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2017-09-20 10:38:05 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2017-09-20 10:38:05 -0700 |
commit | 512e72f52c769eb942bbc8d59f487dbdd4f1990a (patch) | |
tree | 4a08d4440b8499ab3de8e00f809c5ad7a767dfd2 | |
parent | 19a0c727af7052eac963ee61802fc2e58bf481c0 (diff) |
depend on elpa-htmlize instead of installing bundled htmlize.eldebian/9.0.9+dfsg-4
-rw-r--r-- | debian/changelog | 8 | ||||
-rw-r--r-- | debian/control | 2 | ||||
-rwxr-xr-x | debian/rules | 6 |
3 files changed, 15 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 68ae9b1..0b24c08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +org-mode (9.0.9+dfsg-4) unstable; urgency=low + + * Team upload. + * Depend on elpa-htmlize. + * Add override to avoid installing bundled version of htmlize. + + -- Sean Whitton <spwhitton@spwhitton.name> Wed, 20 Sep 2017 10:37:48 -0700 + org-mode (9.0.9+dfsg-3) unstable; urgency=medium * Switch to team maintenance: Debian Emacs addons team <pkg-emacsen-addons@lists.alioth.debian.org> diff --git a/debian/control b/debian/control index f5ef082..61b5e5b 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Vcs-Browser: https://anonscm.debian.org/git/pkg-emacsen/pkg/org-mode.git Package: elpa-org Architecture: all -Depends: ${elpa:Depends}, ${misc:Depends} +Depends: ${elpa:Depends}, ${misc:Depends}, elpa-htmlize Recommends: emacs (>= 46.0) Suggests: org-mode-doc, ditaa, texlive-latex-extra, texlive-fonts-recommended Enhances: emacs, diff --git a/debian/rules b/debian/rules index f346797..4299c07 100755 --- a/debian/rules +++ b/debian/rules @@ -8,3 +8,9 @@ override_dh_auto_build: override_dh_auto_clean: override_dh_auto_install: + +# don't install bundled version of htmlize.el; depend on elpa-htmlize +# instead. See Debian Policy 4.13 +override_dh_elpa: + dh_elpa + rm debian/elpa-org/usr/share/emacs/site-lisp/elpa-src/org-*/htmlize.el |