diff options
| author | Sebastien Delafond <seb@debian.org> | 2014-06-13 13:20:31 +0200 |
|---|---|---|
| committer | Sébastien Delafond <sdelafond@gmail.com> | 2014-07-13 13:35:34 +0200 |
| commit | 2d3359e41007641d7a8e5b088d9286aef64d99e7 (patch) | |
| tree | 61ce84dac761e0621913843f7b8d7b02202b4823 /debian | |
| parent | bc6d49d7f92105a118915fdd4918a90b57b848bd (diff) | |
| parent | 77ddd382df838e38504b822e729250b2a6dd9b63 (diff) | |
Imported Debian patch 8.2.6-1
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/emacsen-compat | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 32dfc41..c0548b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +org-mode (8.2.6-1) unstable; urgency=medium + + * New upstream release (Closes: #644238) + * Depend on emacsen-common >= 2.0.8, and add debian/emacsen-compat + + -- Sebastien Delafond <seb@debian.org> Fri, 13 Jun 2014 13:20:31 +0200 + org-mode (8.2.5h-2) unstable; urgency=low * Bring back dependency on emacsen-common diff --git a/debian/control b/debian/control index eebead8..637785e 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Homepage: http://orgmode.org Package: org-mode Architecture: all -Depends: ${misc:Depends}, emacsen-common (>= 2.0.0), emacs24 | emacs23 | emacs-snapshot +Depends: ${misc:Depends}, emacsen-common (>= 2.0.8), emacs24 | emacs23 | emacs-snapshot Conflicts: emacsen-common (<< 2.0.0) Recommends: texlive-generic-recommended, texlive-latex-recommended Suggests: easypg, ditaa diff --git a/debian/emacsen-compat b/debian/emacsen-compat new file mode 100644 index 0000000..573541a --- /dev/null +++ b/debian/emacsen-compat @@ -0,0 +1 @@ +0 |