From 67986e539286966e9756a097bef9c696351d0d19 Mon Sep 17 00:00:00 2001 From: Sebastien Delafond Date: Wed, 2 Aug 2017 14:33:46 -0400 Subject: Switch to dh-elpa (Closes: #829288, #610699) --- debian/changelog | 4 +++- debian/compat | 2 +- debian/control | 26 +++++++++++++------- debian/dirs | 1 - debian/elpa | 3 +++ debian/emacsen-compat | 1 - debian/emacsen-install | 58 --------------------------------------------- debian/emacsen-remove | 13 ---------- debian/emacsen-startup | 25 ------------------- debian/links | 1 - debian/org-mode.maintscript | 1 + debian/org-pkg.el | 2 ++ debian/rules | 55 +++++------------------------------------- 13 files changed, 34 insertions(+), 158 deletions(-) delete mode 100644 debian/dirs create mode 100644 debian/elpa delete mode 100644 debian/emacsen-compat delete mode 100644 debian/emacsen-install delete mode 100644 debian/emacsen-remove delete mode 100644 debian/emacsen-startup delete mode 100644 debian/links create mode 100644 debian/org-mode.maintscript create mode 100644 debian/org-pkg.el (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6ccddaa..10cc1e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,9 @@ org-mode (9.0.9+dfsg-1) unstable; urgency=medium Files-Excluded to strip non-dfsg source * New upstream version 9.0.9+dfsg - -- Sebastien Delafond Tue, 04 Jul 2017 17:46:50 +0200 + [ Sebastien Delafond ] + + -- Sebastien Delafond Wed, 02 Aug 2017 14:47:03 -0400 org-mode (9.0.3-2) unstable; urgency=medium diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 6ad20e0..431d6af 100644 --- a/debian/control +++ b/debian/control @@ -1,21 +1,24 @@ Source: org-mode -Section: misc +Section: lisp Priority: optional Maintainer: Sebastien Delafond -Build-Depends: debhelper (>= 6) -Build-Depends-Indep: emacs | emacs25 | emacs24 | emacs-snapshot +Build-Depends: debhelper (>= 10), dh-elpa Standards-Version: 3.9.8 Homepage: http://orgmode.org Vcs-Git: https://anonscm.debian.org/git/collab-maint/org-mode.git Vcs-Browser: https://anonscm.debian.org/git/collab-maint/org-mode.git -Package: org-mode +Package: elpa-org Architecture: all -Depends: ${misc:Depends}, emacsen-common (>= 2.0.8), emacs25 | emacs24 | emacs-snapshot -Conflicts: emacsen-common (<< 2.0.0) -Recommends: texlive-generic-recommended, texlive-latex-recommended +Depends: ${elpa:Depends}, ${misc:Depends} +Recommends: emacs (>= 46.0) Suggests: org-mode-doc, ditaa, texlive-latex-extra, texlive-fonts-recommended -Description: keep notes, maintain ToDo lists, and do project planning in emacs +Enhances: emacs, + emacs24, + emacs25 +Breaks: org-mode (<< 9.0.9+dfsg-2) +Provides: org-mode, elpa-org-plus-contrib +Description: Keep notes, maintain ToDo lists, and do project planning in emacs Org-mode is a mode for keeping notes, maintaining ToDo lists, and doing project planning with a fast and effective plain-text system. . @@ -30,3 +33,10 @@ Description: keep notes, maintain ToDo lists, and do project planning in emacs BBDB entries, and any files related to the projects. For printing and sharing of notes, an Org-mode file can be exported as a structured ASCII file, HTML, and LaTeX. + +Package: org-mode +Architecture: all +Depends: ${misc:Depends}, elpa-org +Description: Transition Package, org-mode to elpa-org + The Org emacs addon has been elpafied. This dummy package + helps ease transition from org-mode to elpa-org. \ No newline at end of file diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index 18601bf..0000000 --- a/debian/dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/emacs/site-lisp/org-mode diff --git a/debian/elpa b/debian/elpa new file mode 100644 index 0000000..f44c775 --- /dev/null +++ b/debian/elpa @@ -0,0 +1,3 @@ +lisp/*.el +contrib/lisp/*.el +debian/org-pkg.el diff --git a/debian/emacsen-compat b/debian/emacsen-compat deleted file mode 100644 index 573541a..0000000 --- a/debian/emacsen-compat +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/debian/emacsen-install b/debian/emacsen-install deleted file mode 100644 index 48b69e6..0000000 --- a/debian/emacsen-install +++ /dev/null @@ -1,58 +0,0 @@ -#! /bin/sh -e -# /usr/lib/emacsen-common/packages/install/org-mode - -# Written by Jim Van Zandt , borrowing heavily -# from the install scripts for gettext by Santiago Vila -# and octave by Dirk Eddelbuettel . - -FLAVOR=$1 -PACKAGE=org-mode -STAMPFILE=org-wl.elc -LOG=$(tempfile -pelc_ -s.log -m644) - -case ${FLAVOR} in - emacs) exit 0 ;; # generic emacs package - emacs21) exit 0 ;; # not supported anymore as of 6.26a-3 - emacs22) exit 0 ;; # not supported anymore as of 8.x - emacs23) exit 0 ;; # not supported anymore as of 8.x - xemacs*) exit 0 ;; # not supported anymore as of 7.x -esac - -echo "install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}, logged in ${LOG}" - -FLAVORTEST=$(echo $FLAVOR | cut -c-6) -SITEFLAG="--no-site-file" -FILES="/usr/share/emacs/site-lisp/${PACKAGE}/*.el" -DATAFILES="/usr/share/emacs/site-lisp/${PACKAGE}/etc/styles/*.xml" -DATADIR="/usr/share/${FLAVOR}/site-lisp/${PACKAGE}/etc/styles" - -mkdir -p ${DATADIR} -cd ${DATADIR} -for i in ${DATAFILES}; do - ln -fs $i -done - -ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} -install -m 755 -d ${ELCDIR} -cd ${ELCDIR} -for i in ${FILES}; do - ln -fs $i -done -if [ -n "$EXCLUDE_FILES" ] ; then - rm -f ${ELCDIR}/${EXCLUDE_FILES} -fi - -FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile" - -cat << EOF > path.el -(setq load-path (cons "." load-path)) -(setq byte-compile-warnings nil) -EOF - -echo ${FLAVOR} ${FLAGS} *.el > ${LOG} -${FLAVOR} ${FLAGS} *.el >> ${LOG} 2>& 1 -egrep -s -e "While compiling|\*\*" ${LOG} || /bin/true -echo install/${PACKAGE}: Deleting ${LOG} -rm -f path.el* - -exit 0 diff --git a/debian/emacsen-remove b/debian/emacsen-remove deleted file mode 100644 index d5a208c..0000000 --- a/debian/emacsen-remove +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -e -# /usr/lib/emacsen-common/packages/remove/org-mode - -FLAVOR=$1 -PACKAGE=org-mode - -case ${FLAVOR} in - emacs) exit 0 ;; # generic emacs package - emacs21) exit 0 ;; # not supported anymore as of 6.26a-3 -esac - -echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR} -rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE} diff --git a/debian/emacsen-startup b/debian/emacsen-startup deleted file mode 100644 index 8767160..0000000 --- a/debian/emacsen-startup +++ /dev/null @@ -1,25 +0,0 @@ -;; -*-emacs-lisp-*- -;; -;; Emacs startup file, e.g. /etc/emacs/site-start.d/50org-mode.el -;; for the Debian org-mode package -;; -;; Originally contributed by Nils Naumann -;; Modified by Dirk Eddelbuettel -;; Adapted for dh-make by Jim Van Zandt - -;; The org-mode package follows the Debian/GNU Linux 'emacsen' policy and -;; byte-compiles its elisp files for each 'emacs flavor' (emacs19, -;; xemacs19, emacs20, xemacs20...). The compiled code is then -;; installed in a subdirectory of the respective site-lisp directory. -;; We have to add this to the load-path: -(let ((package-dir (concat "/usr/share/" - (symbol-name debian-emacs-flavor) - "/site-lisp/org-mode"))) - -;; If package-dir does not exist, the org-mode package must have -;; removed but not purged, and we should skip the setup. - (when (file-directory-p package-dir) - (debian-pkg-add-load-path-item package-dir) - (require 'org-install) - (add-to-list 'auto-mode-alist '("\\.org\\(-mode\\)?\\'" . org-mode)) - (setq org-ditaa-jar-path "/usr/bin/ditaa"))) diff --git a/debian/links b/debian/links deleted file mode 100644 index 4a8c5de..0000000 --- a/debian/links +++ /dev/null @@ -1 +0,0 @@ -/usr/share/ditaa/ditaa.jar /usr/share/org-mode/scripts/ditaa.jar diff --git a/debian/org-mode.maintscript b/debian/org-mode.maintscript new file mode 100644 index 0000000..d1702dd --- /dev/null +++ b/debian/org-mode.maintscript @@ -0,0 +1 @@ +rm_conffile /etc/emacs/site-start.d/50org-mode.el diff --git a/debian/org-pkg.el b/debian/org-pkg.el new file mode 100644 index 0000000..0d77bc9 --- /dev/null +++ b/debian/org-pkg.el @@ -0,0 +1,2 @@ +(define-package "org" + "9.0.9" "Outline-based notes management and organizer" ()) diff --git a/debian/rules b/debian/rules index 52adbe3..f346797 100755 --- a/debian/rules +++ b/debian/rules @@ -1,53 +1,10 @@ -#! /usr/bin/make -f +#!/usr/bin/make -f -DOC_TMP_FILES := doc/org.aux doc/org.cp doc/org.cps doc/org.fn \ - doc/org.fns doc/org.ky doc/org.kys \ - doc/org.log doc/org.pg doc/org.toc doc/org.tp \ +%: + dh $@ --with elpa -DOC_FILES := doc/*pdf +override_dh_auto_build: -clean: - dh_testdir - dh_testroot - dh_clean - rm -f $(DOC_FILES) $(DOC_TMP_FILES) +override_dh_auto_clean: -build build-indep build-arch: - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - cp lisp/* $(CURDIR)/debian/org-mode/usr/share/emacs/site-lisp/org-mode - 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 - 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 "{}" \; - find $(CURDIR)/debian/org-mode/usr/share/org-mode/ -name .DS_Store -exec rm -f "{}" \; - find $(CURDIR)/debian/org-mode/usr/share/org-mode/ -name .gitignore -exec rm -f "{}" \; - -binary-indep: install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_link - rm -f $(CURDIR)/debian/org-mode/usr/share/doc/org-mode/*texi* - dh_installemacsen -v - dh_fixperms -# dh_installinfo doc/org - dh_compress - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-arch: build-arch - -binary: binary-indep binary-arch - -.PHONY: build clean build-indep build-arch binary binary-indep binary-arch +override_dh_auto_install: -- cgit v1.2.3