From bc6d49d7f92105a118915fdd4918a90b57b848bd Mon Sep 17 00:00:00 2001 From: Sebastien Delafond Date: Mon, 19 May 2014 22:47:22 +0200 Subject: Imported Debian patch 8.2.5h-2 --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index beb7d69..32dfc41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +org-mode (8.2.5h-2) unstable; urgency=low + + * Bring back dependency on emacsen-common + + -- Sebastien Delafond Mon, 19 May 2014 22:47:22 +0200 + org-mode (8.2.5h-1) unstable; urgency=low * New upstream release diff --git a/debian/control b/debian/control index 4b22732..eebead8 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Homepage: http://orgmode.org Package: org-mode Architecture: all -Depends: ${misc:Depends}, emacs24 | emacs23 | emacs-snapshot +Depends: ${misc:Depends}, emacsen-common (>= 2.0.0), emacs24 | emacs23 | emacs-snapshot Conflicts: emacsen-common (<< 2.0.0) Recommends: texlive-generic-recommended, texlive-latex-recommended Suggests: easypg, ditaa -- cgit v1.2.3