← Back to branch summary

~ubuntu-branches/debian/sid/emacs24/sid

« back to all changes in this revision

Viewing changes to debian/patches/0006-Look-for-NEWS-in-order-to-find-etc-rather-than-GNU.patch

  • Committer: Package Import Robot
  • Author(s): Rob Browning
  • Date: 2015-06-17 00:06:26 UTC
  • mfrom: (1.1.4)
  • Revision ID: package-import@ubuntu.com-20150617000626-uxmby0fbe538wwry
Tags: 24.5+1-1
* Merge upstream version 24.5 (shift from the bzr->git mirror to the
  new official upstream git repository for the source).
  Remove redundant patches:
    0008-A-race-to-create-info-has-been-eliminated.patch
    0009-Nil-load-path-elements-shouldn-t-crash-Emacs.patch

* Update debian/copyright* for 24.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0006-Look-for-NEWS-in-order-to-find-etc-rather-than-GNU.patch
1
 
From 7893b98840a2fad0878491d46fa206912ac92758 Mon Sep 17 00:00:00 2001
 
1
From 0ff5145243e690dd0ca149be955a900bd92f394a Mon Sep 17 00:00:00 2001
2
2
From: Rob Browning <rlb@defaultvalue.org>
3
3
Date: Mon, 4 Apr 2011 22:46:29 -0500
4
4
Subject: Look for NEWS in order to find etc/ rather than GNU.
19
19
 1 file changed, 2 insertions(+), 2 deletions(-)
20
20
 
21
21
diff --git a/src/callproc.c b/src/callproc.c
22
 
index 7ba3e39..0ba15d7 100644
 
22
index 6328ba8..78b707b 100644
23
23
--- a/src/callproc.c
24
24
+++ b/src/callproc.c
25
 
@@ -1628,13 +1628,13 @@ init_callproc (void)
 
25
@@ -1633,13 +1633,13 @@ init_callproc (void)
26
26
 
27
27
       srcdir = Fexpand_file_name (build_string ("../src/"), lispdir);
28
28