diff options
| author | Sebastien Delafond <seb@debian.org> | 2014-05-19 22:47:22 +0200 |
|---|---|---|
| committer | Sébastien Delafond <sdelafond@gmail.com> | 2014-07-13 13:35:33 +0200 |
| commit | bc6d49d7f92105a118915fdd4918a90b57b848bd (patch) | |
| tree | 9d201e6855a315c4c84eb7ac5b30d99b2b76114b /debian | |
| parent | 5733d1acfd8d6c5be0336a4544c4a4b45b6b42ce (diff) | |
Imported Debian patch 8.2.5h-2
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 7 insertions, 1 deletions
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 <seb@debian.org> 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 |