diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2017-01-19 15:37:19 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2017-01-19 15:37:19 -0700 |
commit | 93b8fd46eba4711e2735e15dbe00859af51ce00d (patch) | |
tree | 64b604c16e27430f9f8316b82f0236dc6bee2289 /debian | |
parent | 9b2dced21adf738a10aa02edf34b4ce272d8f987 (diff) | |
parent | e26a74596105f702ba7fcbe15bdf41f59b75555f (diff) |
Merge tag 'debian/1.6' into jessie-bpo
uploaded to unstable
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 28 | ||||
-rw-r--r-- | debian/control | 4 |
2 files changed, 30 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index ed2b292..074d684 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,31 @@ +dh-elpa (1.6) unstable; urgency=medium + + * Add an "exit 0" to xemacs case of remove script (Closes: #850036). + + -- David Bremner <bremner@debian.org> Sun, 08 Jan 2017 09:28:52 -0400 + +dh-elpa (1.5) unstable; urgency=high + + * Add built-in packages to ${elpa:Depends} if they are also packaged + separately in Debian (e.g. let-alist and seq). + + -- Sean Whitton <spwhitton@spwhitton.name> Sun, 01 Jan 2017 21:16:24 +0000 + +dh-elpa (1.4) unstable; urgency=medium + + * Add note to dh_elpa_test manpage about disabling its override of + dh_auto_test. + * Update Emacs dependency and build-dependency: + Previously: emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~) + Now: emacs25-nox | emacs25 | emacs24-nox | emacs24 + - emacsXY-lucid has "Provides: emacsXY". + - Update for emacs25, but retain emacs24 for the sake of backports. + - Retain emacs24-nox for the sake of the backports buildds. + * dh_elpa_test ignores files containing ERT tests in .git. + In particular, don't try to load files in .git/dgit/unpack/fake. + + -- Sean Whitton <spwhitton@spwhitton.name> Mon, 19 Dec 2016 07:32:34 +0000 + dh-elpa (1.3~bpo8+1) jessie-backports; urgency=medium * Rebuild for jessie-backports. diff --git a/debian/control b/debian/control index c27963e..fe5d74f 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Uploaders: Sean Whitton <spwhitton@spwhitton.name>, Build-Depends: debhelper (>= 9.20151004), - emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~), + emacs25-nox | emacs25 | emacs24-nox | emacs24, Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-emacsen/pkg/dh-elpa.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-emacsen/pkg/dh-elpa.git/ @@ -18,7 +18,7 @@ Built-Using: ${misc:Built-Using} Depends: debhelper (>= 9.20151004), libdebian-source-perl | dh-make-perl, - emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~), + emacs25-nox | emacs25 | emacs24-nox | emacs24, libarray-utils-perl, libconfig-tiny-perl, libfile-find-rule-perl, |