diff -Nru muse-el-3.20+dfsg/debian/changelog muse-el-3.20+dfsg/debian/changelog --- muse-el-3.20+dfsg/debian/changelog 2018-01-07 23:14:58.000000000 +0000 +++ muse-el-3.20+dfsg/debian/changelog 2019-07-08 18:07:43.000000000 +0000 @@ -1,3 +1,28 @@ +muse-el (3.20+dfsg-5) unstable; urgency=medium + + * Update Maintainer to use the Debian Emacsen Team's new email address. + * Uncapitalise short description, and fix ancient typos. + * Use secure URL for copyright-format. + * Revert section change to lisp. Editors was correct, and the Debian + archive currently classifies this package as such. + * Add lintian override for elpa-muse' wrong-section-according-to-package-name + * Switch Vcs links from alioth to salsa. + * Switch to debhelper-compat 12 and drop debian/compat. + * Drop the muse-el dummy transitional package. + * Add Provides: muse-el to elpa-muse, for the benefit of users who only + know this package by that name. + * Update my copyright years. + * Change Build-Depends-Indep: emacs25-nox to emacs-nox (unversioning). + * debian/rules: + - Delete unused remnants of boilerplate. + - Override dh_auto_install, which is now installing files to + debian/elpa-muse/usr/local, to do nothing. + * Update Breaks and Replaces for 3.20+dfsg-5. + * Drop emacs25 from Enhances, because it doesn't exist in Buster. + * Declare Standards-Version: 4.4.0. (No additional changes needed) + + -- Nicholas D Steeves Mon, 08 Jul 2019 14:07:43 -0400 + muse-el (3.20+dfsg-4) unstable; urgency=medium * Declare Standards-Version: 4.1.3. (No additional changes needed) diff -Nru muse-el-3.20+dfsg/debian/compat muse-el-3.20+dfsg/debian/compat --- muse-el-3.20+dfsg/debian/compat 2018-01-07 23:14:58.000000000 +0000 +++ muse-el-3.20+dfsg/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru muse-el-3.20+dfsg/debian/control muse-el-3.20+dfsg/debian/control --- muse-el-3.20+dfsg/debian/control 2018-01-07 23:14:58.000000000 +0000 +++ muse-el-3.20+dfsg/debian/control 2019-07-08 18:07:43.000000000 +0000 @@ -1,35 +1,36 @@ Source: muse-el -Section: lisp +Section: editors Priority: optional -Maintainer: Debian Emacs addons team +Maintainer: Debian Emacsen team Uploaders: Nicholas D Steeves -Build-Depends: debhelper (>= 11), dh-elpa +Build-Depends: debhelper-compat (= 12) + , dh-elpa Build-Depends-Indep: texinfo , texlive , texlive-latex-extra - , emacs25-nox -Standards-Version: 4.1.3 + , emacs-nox +Standards-Version: 4.4.0 Homepage: https://www.gnu.org/software/emacs-muse/index.html -Vcs-Git: https://anonscm.debian.org/git/pkg-emacsen/pkg/muse-el.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-emacsen/pkg/muse-el.git/ +Vcs-Git: https://salsa.debian.org/emacsen-team/muse-el.git +Vcs-Browser: https://salsa.debian.org/emacsen-team/muse-el Package: elpa-muse Architecture: all Depends: ${misc:Depends} , ${elpa:Depends} , elpa-htmlize -# ^ elpa-htmlize needed for emacsen-common postinst to +# ^ elpa-htmlize is needed for emacsen-common postinst to # successfully bytecompile htmlize-hack.el Recommends: emacs (>= 46.0) , doc-base , texlive-latex-base Enhances: emacs - , emacs25 -Breaks: muse-el (<< 3.20+dfsg-1) -Replaces: muse-el (<< 3.20+dfsg-1) -Description: Author and publish projects using Wiki-like markup +Breaks: muse-el (<< 3.20+dfsg-5) +Replaces: muse-el (<< 3.20+dfsg-5) +Provides: muse-el +Description: author and publish projects using Wiki-like markup Emacs Muse is an authoring and publishing environment for Emacs. It - simplifies the process of writings documents and publishing them to + simplifies the process of writing documents and publishing them to various output formats, such as DocBook, LaTeX, (X)HTML, TexInfo, and PDF. It can even produce content suitable for blogging, such as Blosxom-style .txt files and RDF or RSS 2.0 feeds, using the @@ -38,11 +39,3 @@ Muse consists of two main parts: an enhanced text-mode for authoring documents and navigating within Muse projects, and a set of publishing styles for generating different kinds of output. - -Package: muse-el -Architecture: all -Depends: ${misc:Depends}, elpa-muse -Description: Transition Package, muse-el to elpa-muse - The Muse emacs addon has been elpafied. This dummy package - helps ease the transition from muse-el to elpa-muse and - is safe to remove. diff -Nru muse-el-3.20+dfsg/debian/copyright muse-el-3.20+dfsg/debian/copyright --- muse-el-3.20+dfsg/debian/copyright 2018-01-07 23:14:58.000000000 +0000 +++ muse-el-3.20+dfsg/debian/copyright 2019-07-08 18:07:43.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Source: git://repo.or.cz/muse-el.git Files-Excluded: texi/muse.texi @@ -55,7 +55,7 @@ 2005-2008 Michael W. Olson 2010 Julien Danjou 2012 David Prévot - 2016-2017 Nicholas D Steeves + 2016-2019 Nicholas D Steeves License: GPL-2+ License: GPL-2+ diff -Nru muse-el-3.20+dfsg/debian/elpa-muse.lintian-overrides muse-el-3.20+dfsg/debian/elpa-muse.lintian-overrides --- muse-el-3.20+dfsg/debian/elpa-muse.lintian-overrides 2018-01-07 23:14:58.000000000 +0000 +++ muse-el-3.20+dfsg/debian/elpa-muse.lintian-overrides 2019-07-08 18:07:43.000000000 +0000 @@ -12,3 +12,8 @@ elpa-muse binary: privacy-breach-generic usr/share/doc/elpa-muse/examples/mwolson/* +# Initially I planned to change to section: lisp, but I've reverted +# this commit, because editors is correct, and the Debian archive +# currently (correctly) classifies this package as such. + +elpa-muse binary: wrong-section-according-to-package-name diff -Nru muse-el-3.20+dfsg/debian/rules muse-el-3.20+dfsg/debian/rules --- muse-el-3.20+dfsg/debian/rules 2018-01-07 23:14:58.000000000 +0000 +++ muse-el-3.20+dfsg/debian/rules 2019-07-08 18:07:43.000000000 +0000 @@ -1,8 +1,5 @@ #!/usr/bin/make -f -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - %: dh $@ --with elpa @@ -10,6 +7,8 @@ make examples make autoloads +override_dh_auto_install: + override_dh_installchangelogs: cat ChangeLog ChangeLog.5 ChangeLog.4 ChangeLog.3 ChangeLog.2 ChangeLog.1 > debian/.debhelper/changelog dh_installchangelogs debian/.debhelper/changelog