diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/.gitignore | 4 | ||||
| -rw-r--r-- | debian/changelog | 74 | ||||
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/control | 28 | ||||
| -rw-r--r-- | debian/copyright | 5 | ||||
| -rw-r--r-- | debian/patches/0001-typos-and-grammar.patch | 45 | ||||
| -rw-r--r-- | debian/patches/0002-Avoiding-having-git-as-a-building-dependency.patch | 25 | ||||
| -rw-r--r-- | debian/patches/0003-Debian-yas-installed-snippets-dir.patch | 41 | ||||
| -rw-r--r-- | debian/patches/0004-no-timestamp-in-html-head.patch | 24 | ||||
| -rw-r--r-- | debian/patches/series | 4 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | debian/yasnippet.maintscript | 1 |
12 files changed, 94 insertions, 161 deletions
diff --git a/debian/.gitignore b/debian/.gitignore deleted file mode 100644 index adbea6e..0000000 --- a/debian/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/*.debhelper.log -/*.substvars -/files -/yasnippet/ diff --git a/debian/changelog b/debian/changelog index ff7b9ba..b686761 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,77 @@ +yasnippet (0.13.0-2) unstable; urgency=medium + + * Team upload. + * Depend on elpa-htmlize instead of emacs-goodies-el. (Closes: #898579) + * Lowercase short descriptions + * Declare Standards-Version: 4.1.5. (No additional changes needed) + * debian/rules: Load htmlize before attempting to build docs. + - Needed to fontify src blocks. + * Restore build-dep on yasnippet-snippets for self-tests. + - Solves "Prepared just-in-time loading of snippets + (but no snippets found)" + - While it is not needed for tests to pass, elpa-yasnippet-snippets + enhances the quality of those tests. + * debian/control: Add minor enhancements to the comments. + + -- Nicholas D Steeves <nsteeves@gmail.com> Wed, 01 Aug 2018 22:10:25 -0400 + +yasnippet (0.13.0-1) unstable; urgency=medium + + * Team upload. + * New upstream release. + * debian/control: + - Recommend elpa-yasnippet-snippets rather than yasnippet-snippets. + - Drop yasnippet-snippets from Build-Depends; it does not seem to be + needed for self-tests to pass. + - Switch Vcs from alioth to salsa. + - Switch to debhelper 11. + - Update Maintainer team name and email address. + - Drop emacs24 from Enhances. + * Declare compat level 11. + * Drop 0003-Debian-yas-installed-snippets-dir.patch + - Uses obsolete yas-installed-snippets-dir. + - Now elpa-yasnippets-snippets defines yasnippet-snippets-dir. + * Declare Standards-Version: 4.1.4. + - debian/control: Drop Built-Using because §7.8 says it should be used + "exactly when there are license or DFSG requirements to retain full + source code", and such requirements are not present in yasnippet. + + -- Nicholas D Steeves <nsteeves@gmail.com> Sun, 13 May 2018 15:22:01 -0400 + +yasnippet (0.12.2-2) unstable; urgency=medium + + * Remove obsolete conffile /etc/emacs/site-start.d/50yasnippet.el + (Closes: #884621). + Thanks H.-Dirk Schmitt for noting the problem. + * Priority extra->optional. + * Declare compliance with Debian Policy 4.1.2. + + -- Sean Whitton <spwhitton@spwhitton.name> Fri, 22 Dec 2017 10:07:25 +0000 + +yasnippet (0.12.2-1) unstable; urgency=medium + + * New upstream release. + * Tidy Copyright: fields & bump copyright years. + * Add a build-conflict with elpa-org. + See https://github.com/joaotavora/yasnippet/issues/852 + * Bump std-ver to 4.1.0 (no changes required). + + -- Sean Whitton <spwhitton@spwhitton.name> Sat, 02 Sep 2017 13:21:36 -0700 + +yasnippet (0.12.1-1) unstable; urgency=medium + + * New upstream release (Closes: #771159). + * Drop 0001-typos-and-grammar.patch + Merged upstream. + * Drop 0002-Avoiding-having-git-as-a-building-dependency.patch + Obsoleted by upstream's switch to use SOURCE_DATE_EPOCH. + * Refresh 0003-Debian-yas-installed-snippets-dir.patch + * Drop 0004-no-timestamp-in-html-head.patch + Merged upstream. + * Bump standards version to 4.0.0 (no changes required). + + -- Sean Whitton <spwhitton@spwhitton.name> Mon, 24 Jul 2017 15:18:42 -0700 + yasnippet (0.11.0-2) unstable; urgency=medium * Add missing Vcs-* fields. diff --git a/debian/compat b/debian/compat index f599e28..b4de394 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +11 diff --git a/debian/control b/debian/control index 7686b99..c7dca53 100644 --- a/debian/control +++ b/debian/control @@ -1,39 +1,41 @@ Source: yasnippet Section: lisp -Priority: extra -Maintainer: Debian Emacs addons team <pkg-emacsen-addons@lists.alioth.debian.org> +Priority: optional +Maintainer: Debian Emacsen team <debian-emacsen@lists.debian.org> Uploaders: Barak A. Pearlmutter <bap@debian.org>, Alberto Luaces Fernández <aluaces@udc.es>, Sean Whitton <spwhitton@spwhitton.name>, Build-Depends: - debhelper (>= 10), + debhelper (>= 11~), dh-elpa, - emacs-goodies-el, - yasnippet-snippets, -Standards-Version: 3.9.8 + elpa-htmlize, + elpa-yasnippet-snippets +# See changelog entry 0.13.0-2 for why we build-depend on snippets. +# For an explanation of the build conflict on elpa-org, +# see https://github.com/joaotavora/yasnippet/issues/852 +Build-Conflicts: elpa-org +Standards-Version: 4.1.5 Homepage: https://github.com/joaotavora/yasnippet Testsuite: autopkgtest-pkg-elpa -Vcs-Git: https://anonscm.debian.org/git/pkg-emacsen/pkg/yasnippet.git -Vcs-Browser: https://anonscm.debian.org/git/pkg-emacsen/pkg/yasnippet.git +Vcs-Browser: https://salsa.debian.org/emacsen-team/yasnippet +Vcs-Git: https://salsa.debian.org/emacsen-team/yasnippet.git Package: elpa-yasnippet Architecture: all Depends: ${elpa:Depends}, ${misc:Depends}, -Built-Using: ${misc:Built-Using} Recommends: - yasnippet-snippets, + elpa-yasnippet-snippets, Enhances: emacs, - emacs24, emacs25, Breaks: yasnippet (<< 0.11.0), Provides: yasnippet, -Description: Template system for Emacs +Description: template system for Emacs YASnippet (yet another snippet extension for Emacs) is a template system for Emacs. It allows you to type an abbreviation and automatically expand the abbreviation into function templates. @@ -46,7 +48,7 @@ Architecture: all Depends: elpa-yasnippet, ${misc:Depends}, -Description: Transition Package, yasnippet to elpa-yasnippet +Description: transition Package, yasnippet to elpa-yasnippet The yasnippet emacs addon has been elpafied. This dummy package helps ease transition from yasnippet to elpa-yasnippet, and may safely be removed. diff --git a/debian/copyright b/debian/copyright index b9d0ce9..a91fb79 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,15 +4,14 @@ Source: https://github.com/capitaomorte/yasnippet Files: * License: GPL-3+ -Copyright: 2008-2013 Free Software Foundation, Inc. - Authors: pluskid <pluskid@gmail.com>, João Távora <joaotavora@gmail.com> - Maintainer: João Távora <joaotavora@gmail.com> +Copyright: (C) 2008-2017 Free Software Foundation, Inc. Files: debian/* License: GPL-3+ Copyright: 2009 Julián Hernández Gómez <julianhernandez@gmail.com> 2015 Alberto Luaces <aluaces@udc.es>, Barak A. Pearlmutter <bap@debian.org> 2016 Sean Whitton <spwhitton@spwhitton.name>, Barak A. Pearlmutter <bap@debian.org> + 2017 Sean Whitton <spwhitton@spwhitton.name> License: GPL-3+ . diff --git a/debian/patches/0001-typos-and-grammar.patch b/debian/patches/0001-typos-and-grammar.patch deleted file mode 100644 index 70bd0af..0000000 --- a/debian/patches/0001-typos-and-grammar.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: "Barak A. Pearlmutter" <barak+git@pearlmutter.net> -Date: Mon, 12 Oct 2015 19:29:44 +0100 -Subject: typos and grammar - ---- - doc/faq.org | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/doc/faq.org b/doc/faq.org -index 79249e8..f40cae8 100644 ---- a/doc/faq.org -+++ b/doc/faq.org -@@ -4,14 +4,14 @@ - - * Why is there an extra newline? - --If you have a newline at the end of the snippet definition file, then --YASnippet will add a newline when you expanding a snippet. Please don't --add a newline at the end if you don't want it when you saving the --snippet file. -+If there is a newline at the end of a snippet definition file, -+YASnippet will add a newline when expanding that snippet. When editing -+or saving a snippet file, please be careful not to accidentally add a -+terminal newline. - --Note some editors will automatically add a newline for you. In Emacs, if --you set =require-final-newline= to =t=, it will add the final newline --for you automatically. -+Note that some editors will automatically add a newline for you. In -+Emacs, if you set =require-final-newline= to =t=, it will add the -+final newline automatically. - - * Why doesn't TAB expand a snippet? - -@@ -27,8 +27,8 @@ code to your =.emacs= /before/ loading YASnippet: - where =the-major-mode= is the major mode in which [[sym:yas-minor-mode][=yas-minor-mode=]] isn't - enabled by default. - --From YASnippet 0.6 you can also use the command =M-x yas-global-mode= to --turn on YASnippet automatically for /all/ major modes. -+The command =M-x yas-global-mode= turns YASnippet on automatically for -+/all/ major modes. - - If [[sym:yas-minor-mode][=yas-minor-mode=]] is on but the snippet still not expanded. Then try - to see what command is bound to the =TAB= key: press =C-h k= and then diff --git a/debian/patches/0002-Avoiding-having-git-as-a-building-dependency.patch b/debian/patches/0002-Avoiding-having-git-as-a-building-dependency.patch deleted file mode 100644 index fd0a40e..0000000 --- a/debian/patches/0002-Avoiding-having-git-as-a-building-dependency.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Alberto Luaces <aluaces@udc.es> -Date: Fri, 15 May 2015 20:28:25 +0200 -Subject: Avoiding having git as a building dependency. - ---- - doc/yas-doc-helper.el | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/doc/yas-doc-helper.el b/doc/yas-doc-helper.el -index 8459eb7..61059ee 100755 ---- a/doc/yas-doc-helper.el -+++ b/doc/yas-doc-helper.el -@@ -128,11 +128,7 @@ - - (let* ((dir (if load-file-name (file-name-directory load-file-name) - default-directory)) -- (rev (with-temp-file (expand-file-name "html-revision" dir) -- (or (when (eq (call-process "git" nil t nil -- "rev-parse" "--verify" "HEAD") 0) -- (buffer-string)) -- (princ yas--version (current-buffer))))) -+ (rev "0.9.0-beta") - (proj-plist - `(,@(when (fboundp 'org-html-publish-to-html) - '(:publishing-function org-html-publish-to-html)) diff --git a/debian/patches/0003-Debian-yas-installed-snippets-dir.patch b/debian/patches/0003-Debian-yas-installed-snippets-dir.patch deleted file mode 100644 index 7bb5888..0000000 --- a/debian/patches/0003-Debian-yas-installed-snippets-dir.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Sean Whitton <spwhitton@spwhitton.name> -Date: Sun, 27 Nov 2016 22:05:41 -0700 -Subject: Debian-yas-installed-snippets-dir - -This replaces the old emacsen-startup script. - -Forwarded: not-needed ---- - yasnippet.el | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/yasnippet.el b/yasnippet.el -index a6977d1..22477cc 100644 ---- a/yasnippet.el -+++ b/yasnippet.el -@@ -153,9 +153,9 @@ - :group 'editing) - - (defvar yas-installed-snippets-dir nil) --(setq yas-installed-snippets-dir -- (when load-file-name -- (expand-file-name "snippets" (file-name-directory load-file-name)))) -+(let ((snippets-directory "/usr/share/yasnippet-snippets")) -+ (when (file-exists-p snippets-directory) -+ (setq yas-installed-snippets-dir snippets-directory))) - - (defconst yas--default-user-snippets-dir - (expand-file-name "snippets" user-emacs-directory)) -@@ -197,7 +197,11 @@ created with `yas-new-snippet'. " - (stringp (symbol-value e))) - (symbol-value e)) - (t -- (error "[yas] invalid element %s in `yas-snippet-dirs'" e))))) -+ (error "[yas] invalid element %s in `yas-snippet-dirs' -+ -+Perhaps you need to install the yasnippet-snippets Debian package, -+or remove %s from `yas-snippet-dirs' -+before loading yasnippet." e e))))) - - (defcustom yas-new-snippet-default "\ - # -*- mode: snippet -*- diff --git a/debian/patches/0004-no-timestamp-in-html-head.patch b/debian/patches/0004-no-timestamp-in-html-head.patch deleted file mode 100644 index 769487c..0000000 --- a/debian/patches/0004-no-timestamp-in-html-head.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Sean Whitton <spwhitton@spwhitton.name> -Date: Fri, 9 Dec 2016 21:28:56 -0700 -Subject: no timestamp in html head - -Makes the documentation build reproducible. - -Forwarded: https://github.com/joaotavora/yasnippet/pull/757 ---- - doc/org-setup.inc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/doc/org-setup.inc b/doc/org-setup.inc -index 6ad09c9..60b9382 100644 ---- a/doc/org-setup.inc -+++ b/doc/org-setup.inc -@@ -4,7 +4,7 @@ - - #+LINK: sym file:snippet-reference.org::#%s - --#+OPTIONS: author:nil num:nil -+#+OPTIONS: author:nil num:nil timestamp:nil - #+AUTHOR: - # org < 8.0 use +STYLE, after use +HTML_HEAD - #+STYLE: <link rel="stylesheet" type="text/css" href="stylesheets/manual.css" /> diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 9d6a280..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,4 +0,0 @@ -0001-typos-and-grammar.patch -0002-Avoiding-having-git-as-a-building-dependency.patch -0003-Debian-yas-installed-snippets-dir.patch -0004-no-timestamp-in-html-head.patch diff --git a/debian/rules b/debian/rules index 4b7ff67..01eeea8 100755 --- a/debian/rules +++ b/debian/rules @@ -4,4 +4,4 @@ dh $@ --with elpa override_dh_auto_build: - HOME=$$(pwd) emacs -Q -L . --batch -l doc/yas-doc-helper.el -f yas--generate-html-batch + HOME=$$(pwd) emacs -Q -L /usr/share/emacs/site-lisp/elpa-src/htmlize-* -L . --batch -l htmlize -l doc/yas-doc-helper.el -f yas--generate-html-batch diff --git a/debian/yasnippet.maintscript b/debian/yasnippet.maintscript new file mode 100644 index 0000000..55a6bde --- /dev/null +++ b/debian/yasnippet.maintscript @@ -0,0 +1 @@ +rm_conffile /etc/emacs/site-start.d/50yasnippet.el |