Bug#780042: unblock: emacs24/24.4+1-5
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please consider emacs24 24.4.1+1-5 for jessie. As compared to the
current 4.1 version, this release should fix two bugs.
* Add a "Breaks" for an older version of apel that newer versions of
Emacs can't compile:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=775564
* Add a "Conflicts" for an obsolete package that was breaking newer
Gnus:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=767949
This version also adjusts the 4.1 NMU patch (to startup.el) to match the
other patches (including the Debian NEWS header, etc). The content
should be identical.
The changelog entry:
emacs24 (24.4+1-5) unstable; urgency=medium
* emacs24-common: conflict with obsolete gnus-bonus-el package.
Thanks to Hilko Bengen for reporting the problem. (Closes: 767949)
* Add "Breaks: apel (<< 10.8+0.20120427-4)" to emacs24-common to fix
a byte-compilation problem with older versions of the package.
Thanks to Łukasz Stelmach for the report and Sébastien Villemot
for tracking down the correct version. (Closes: 775564)
-- Rob Browning <rlb@defaultvalue.org> Sat, 07 Mar 2015 13:25:57 -0600
And the debdiff (which excludes the automatically generated
debian/control):
diff -Nru emacs24-24.4+1/debian/.git-dpm emacs24-24.4+1/debian/.git-dpm
--- emacs24-24.4+1/debian/.git-dpm 2014-10-25 14:40:41.000000000 -0500
+++ emacs24-24.4+1/debian/.git-dpm 2015-03-07 13:33:35.000000000 -0600
@@ -1,6 +1,6 @@
# see git-dpm(1) from git-dpm package
-ab7f768c51efc79f100d01ce4f3d6c5bad12be32
-ab7f768c51efc79f100d01ce4f3d6c5bad12be32
+be3e084c88ddd5292f485fd59216d016fec6ba99
+be3e084c88ddd5292f485fd59216d016fec6ba99
fa54b24bfb46d6799598ccd7639c5ad7c02df252
fa54b24bfb46d6799598ccd7639c5ad7c02df252
emacs24_24.4+1.orig.tar.bz2
diff -Nru emacs24-24.4+1/debian/changelog emacs24-24.4+1/debian/changelog
--- emacs24-24.4+1/debian/changelog 2014-12-09 09:25:45.000000000 -0600
+++ emacs24-24.4+1/debian/changelog 2015-03-07 13:33:35.000000000 -0600
@@ -1,3 +1,15 @@
+emacs24 (24.4+1-5) unstable; urgency=medium
+
+ * emacs24-common: conflict with obsolete gnus-bonus-el package.
+ Thanks to Hilko Bengen for reporting the problem. (Closes: 767949)
+
+ * Add "Breaks: apel (<< 10.8+0.20120427-4)" to emacs24-common to fix
+ a byte-compilation problem with older versions of the package.
+ Thanks to Łukasz Stelmach for the report and Sébastien Villemot
+ for tracking down the correct version. (Closes: 775564)
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 07 Mar 2015 13:25:57 -0600
+
emacs24 (24.4+1-4.1) unstable; urgency=medium
* Non-maintainer upload.
--- emacs24-24.4+1/debian/control.in 2014-10-25 14:41:42.000000000 -0500
+++ emacs24-24.4+1/debian/control.in 2015-03-07 13:33:35.000000000 -0600
@@ -99,7 +99,8 @@
Architecture: all
Depends: emacsen-common (>= 2.0.8), dpkg (>= 1.15.4) | install-info, ${shlibs:Depends}, ${misc:Depends}
Suggests: @DEB_FLAVOR@-el, @DEB_FLAVOR@-common-non-dfsg
-Conflicts: @DEB_FLAVOR@-el (<< ${Source-Version}), cedet, eieio, speedbar
+Conflicts: @DEB_FLAVOR@-el (<< ${Source-Version}), cedet, eieio, speedbar, gnus-bonus-el
+Breaks: apel (<< 10.8+0.20120427-4)
Description: GNU Emacs editor's shared, architecture independent infrastructure
GNU Emacs is the extensible self-documenting text editor.
This package contains the architecture independent infrastructure
diff -Nru emacs24-24.4+1/debian/patches/0009-Nil-load-path-elements-shouldn-t-crash-Emacs.patch emacs24-24.4+1/debian/patches/0009-Nil-load-path-elements-shouldn-t-crash-Emacs.patch
--- emacs24-24.4+1/debian/patches/0009-Nil-load-path-elements-shouldn-t-crash-Emacs.patch 1969-12-31 18:00:00.000000000 -0600
+++ emacs24-24.4+1/debian/patches/0009-Nil-load-path-elements-shouldn-t-crash-Emacs.patch 2015-03-07 13:33:35.000000000 -0600
@@ -0,0 +1,41 @@
+From be3e084c88ddd5292f485fd59216d016fec6ba99 Mon Sep 17 00:00:00 2001
+From: Glenn Morris <rgm@gnu.org>
+Date: Sun, 9 Nov 2014 23:12:37 -0800
+Subject: Nil load-path elements shouldn't crash Emacs
+
+This upstream patches has been added:
+
+ * lisp/startup.el (command-line): Handle nil elements in load-path.
+
+Origin: upstream, http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=edfdb22f674312389ccf5d5e37efa4d3f1516994
+Bug-Debian: http://bugs/debian.org/768751
+Added-by: Rob Browning <rlb@defaultvalue.org>
+---
+ lisp/ChangeLog | 4 ++++
+ lisp/startup.el | 1 +
+ 2 files changed, 5 insertions(+)
+
+diff --git a/lisp/ChangeLog b/lisp/ChangeLog
+index 781b3ab..b162ebc 100644
+--- a/lisp/ChangeLog
++++ b/lisp/ChangeLog
+@@ -1,3 +1,7 @@
++2014-11-10 Glenn Morris <rgm@gnu.org>
++
++ * startup.el (command-line): Handle nil elements in load-path.
++
+ 2014-10-20 Glenn Morris <rgm@gnu.org>
+
+ * Version 24.4 released.
+diff --git a/lisp/startup.el b/lisp/startup.el
+index c4f9f79..1ef2556 100644
+--- a/lisp/startup.el
++++ b/lisp/startup.el
+@@ -1336,6 +1336,7 @@ the `--debug-init' option to view a complete error backtrace."
+ (let (warned)
+ (dolist (dir load-path)
+ (and (not warned)
++ (stringp dir)
+ (string-match-p "/[._]emacs\\.d/?\\'" dir)
+ (string-equal (file-name-as-directory (expand-file-name dir))
+ (expand-file-name user-emacs-directory))
diff -Nru emacs24-24.4+1/debian/patches/0009-lisp-startup.el-command-line.patch emacs24-24.4+1/debian/patches/0009-lisp-startup.el-command-line.patch
--- emacs24-24.4+1/debian/patches/0009-lisp-startup.el-command-line.patch 2014-12-09 09:26:58.000000000 -0600
+++ emacs24-24.4+1/debian/patches/0009-lisp-startup.el-command-line.patch 1969-12-31 18:00:00.000000000 -0600
@@ -1,20 +0,0 @@
-From edfdb22f674312389ccf5d5e37efa4d3f1516994 Mon Sep 17 00:00:00 2001
-From: Glenn Morris <rgm@gnu.org>
-Date: Sun, 9 Nov 2014 23:12:37 -0800
-Subject: [PATCH] * lisp/startup.el (command-line): Handle nil elements in
- load-path.
-
----
- lisp/startup.el | 1 +
- 1 file changed, 1 insertions(+)
-
---- a/lisp/startup.el
-+++ b/lisp/startup.el
-@@ -1336,6 +1336,7 @@
- (let (warned)
- (dolist (dir load-path)
- (and (not warned)
-+ (stringp dir)
- (string-match-p "/[._]emacs\\.d/?\\'" dir)
- (string-equal (file-name-as-directory (expand-file-name dir))
- (expand-file-name user-emacs-directory))
diff -Nru emacs24-24.4+1/debian/patches/series emacs24-24.4+1/debian/patches/series
--- emacs24-24.4+1/debian/patches/series 2014-12-09 09:26:50.000000000 -0600
+++ emacs24-24.4+1/debian/patches/series 2015-03-07 13:33:35.000000000 -0600
@@ -6,4 +6,4 @@
0006-Look-for-NEWS-in-order-to-find-etc-rather-than-GNU.patch
0007-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch
0008-A-race-to-create-info-has-been-eliminated.patch
-0009-lisp-startup.el-command-line.patch
+0009-Nil-load-path-elements-shouldn-t-crash-Emacs.patch
Thanks
--
Rob Browning
rlb @defaultvalue.org and @debian.org
GPG as of 2011-07-10 E6A9 DA3C C9FD 1FF8 C676 D2C4 C0F0 39E9 ED1B 597A
GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4
Reply to: