diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/NEWS.debian | 7 | ||||
| -rw-r--r-- | debian/changelog | 30 | ||||
| -rw-r--r-- | debian/control | 6 | ||||
| -rw-r--r-- | debian/copyright | 30 | ||||
| -rw-r--r-- | debian/doc-base | 11 | ||||
| -rwxr-xr-x | debian/rules | 6 |
6 files changed, 43 insertions, 47 deletions
diff --git a/debian/NEWS.debian b/debian/NEWS.debian new file mode 100644 index 0000000..49a1994 --- /dev/null +++ b/debian/NEWS.debian @@ -0,0 +1,7 @@ +org-mode (8.0.6-1) unstable; urgency=low + + To fix Debian bug #709494, and keep org-mode in the main section, the + documentation has been removed from this package and moved to + org-mode-doc, to be found soon in the non-free section. + + -- Sebastien Delafond <seb@debian.org> Mon, 15 Jul 2013 13:51:17 +0200 diff --git a/debian/changelog b/debian/changelog index 8282ac5..5899a07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,33 @@ +org-mode (8.0.7-1) unstable; urgency=low + + * New upstream release + + -- Sebastien Delafond <seb@debian.org> Sun, 11 Aug 2013 16:27:56 +0200 + +org-mode (8.0.6-3) unstable; urgency=low + + * Remove copyright notice for the Org documentation, since it now lives + in its own org-mode-doc package in non-free + + -- Sebastien Delafond <seb@debian.org> Tue, 16 Jul 2013 10:55:16 +0200 + +org-mode (8.0.6-2) unstable; urgency=low + + * Add emacs-snapshot as an acceptable dependency, not just a build + dependency (Closes: #712187) + + -- Sebastien Delafond <seb@debian.org> Tue, 16 Jul 2013 08:56:59 +0200 + +org-mode (8.0.6-1) unstable; urgency=low + + * New upstream release + * Remove non-free documentation (Closes: #709494), and mention that in + NEWS.Debian + * Add emacs-snapshot as an acceptable version of emacs (Closes: #712187) + * Bumped up Standards-Version + + -- Sebastien Delafond <seb@debian.org> Mon, 15 Jul 2013 13:51:17 +0200 + org-mode (7.9.2-1) unstable; urgency=low * New upstream release diff --git a/debian/control b/debian/control index 16b2545..fc20d6e 100644 --- a/debian/control +++ b/debian/control @@ -3,13 +3,13 @@ Section: misc Priority: optional Maintainer: Sebastien Delafond <seb@debian.org> Build-Depends: debhelper (>= 6) -Build-Depends-Indep: texinfo, texlive-latex-base, emacs | emacs24 | emacs23 -Standards-Version: 3.9.3 +Build-Depends-Indep: emacs | emacs24 | emacs23 | emacs-snapshot +Standards-Version: 3.9.4 Homepage: http://orgmode.org Package: org-mode Architecture: all -Depends: ${misc:Depends}, emacs24 | emacs23 +Depends: ${misc:Depends}, emacs24 | emacs23 | emacs-snapshot Suggests: remember-el, easypg, ditaa Description: keep notes, maintain ToDo lists, and do project planning in emacs Org-mode is a mode for keeping notes, maintaining ToDo lists, and diff --git a/debian/copyright b/debian/copyright index ea8771b..4761f8e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -58,35 +58,5 @@ Copyright: Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - org-mode's documentation: - ========================= - - orgcard.tex - ----------- - - % Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004, 2005, - % 2006, 2007, 2008, 2009 Free Software Foundation, Inc. - - % This file is part of GNU Emacs. - - % GNU Emacs is free software: you can redistribute it and/or modify - % it under the terms of the GNU General Public License as published by - % the Free Software Foundation, either version 3 of the License, or - % (at your option) any later version. - - - The Org Manual - -------------- - - Debian exercises the following copyright license grant from the - file ‘org_dual_license.texi’ in the source: - - Copyright © 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation - - Permission is also granted to copy, distribute and/or modify this document - under the terms of the GNU General Public License (GPL). - You should have received a copy of the GNU General Public License - along with GNU Emacs. If not, see http://www.gnu.org/licenses/. - On Debian systems, the complete text of version 3 of the GNU General Public License can be found in ‘/usr/share/common-licenses/GPL-3’. diff --git a/debian/doc-base b/debian/doc-base deleted file mode 100644 index 0ea41f0..0000000 --- a/debian/doc-base +++ /dev/null @@ -1,11 +0,0 @@ -Document: org-mode -Title: Org Manual -Abstract: This manual describes what org-mode is, and how to use it -Section: Editors - -Format: PDF -Files: /usr/share/doc/org-mode/*.pdf.gz - -Format: info -Index: /usr/share/info/org.gz -Files: /usr/share/info/org.gz diff --git a/debian/rules b/debian/rules index e136dd6..9b1cac5 100755 --- a/debian/rules +++ b/debian/rules @@ -23,7 +23,7 @@ install: build cp -r etc $(CURDIR)/debian/org-mode/usr/share/emacs/site-lisp/org-mode # cp xemacs/*.el $(CURDIR)/debian/org-mode/usr/share/xemacs/site-lisp/org-mode cp -r contrib $(CURDIR)/debian/org-mode/usr/share/org-mode/ - make doc +# make doc rm -f $(DOC_TMP_FILES) find $(CURDIR)/debian/org-mode/usr/share/org-mode/ -type f -exec chmod 644 "{}" \; find $(CURDIR)/debian/org-mode/usr/share/emacs/site-lisp/org-mode -type f -exec chmod 644 "{}" \; @@ -34,11 +34,11 @@ binary-indep: install dh_testdir dh_testroot dh_installchangelogs - dh_installdocs doc/* + dh_installdocs rm -f $(CURDIR)/debian/org-mode/usr/share/doc/org-mode/*texi* dh_installemacsen -v dh_fixperms - dh_installinfo doc/org +# dh_installinfo doc/org dh_compress dh_installdeb dh_gencontrol |