summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Delafond <seb@debian.org>2013-12-29 17:18:44 +0100
committerS├ębastien Delafond <sdelafond@gmail.com>2014-07-13 13:35:30 +0200
commit489f1deda8d0ec93810c342b427c1920b8c47cbb (patch)
treea708ef0416d7c7317d283aeb4a7ee69dedd86ac7
parentdbba00b1e33d16e2eb85ed8bb771658fe049d50e (diff)
Imported Debian patch 8.2.1-3
-rw-r--r--debian/changelog6
-rw-r--r--debian/control1
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