diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index aeb4438..89b4a5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +org-mode (8.2.1-3) unstable; urgency=low + + * Conflict with older emacsen-common (Comment: #732699) + + -- Sebastien Delafond <seb@debian.org> Sun, 29 Dec 2013 17:18:44 +0100 + org-mode (8.2.1-2) unstable; urgency=low * Hrm, really recommend texlive-generic-recommended and diff --git a/debian/control b/debian/control index 5c9d455..d39a33d 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ Homepage: http://orgmode.org Package: org-mode Architecture: all Depends: ${misc:Depends}, emacs24 | emacs23 | emacs-snapshot +Conflicts: emacsen-common (< 2.0.0) Recommends: texlive-generic-recommended, texlive-latex-recommended Suggests: easypg, ditaa Description: keep notes, maintain ToDo lists, and do project planning in emacs |