[Xen-devel] [PATCH 1/2] stubdom: Replace FSF street address with canonical URL in patches

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

Do these ones manually since the diff header needs fixup too.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 stubdom/grub.patches/10graphics.diff | 10 ++++------
 stubdom/grub.patches/61btrfs.diff    |  6 ++----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/stubdom/grub.patches/10graphics.diff 
b/stubdom/grub.patches/10graphics.diff
index d891c51..5ee2852 100644
--- a/stubdom/grub.patches/10graphics.diff
+++ b/stubdom/grub.patches/10graphics.diff
@@ -1164,7 +1164,7 @@ diff -Naur grub-0.97.orig/stage2/cmdline.c 
grub-0.97/stage2/cmdline.c
 diff -Naur grub-0.97.orig/stage2/graphics.c grub-0.97/stage2/graphics.c
 --- grub-0.97.orig/stage2/graphics.c   1969-12-31 21:00:00.000000000 -0300
 +++ grub-0.97/stage2/graphics.c        2005-06-13 19:13:31.000000000 -0300
-@@ -0,0 +1,585 @@
+@@ -0,0 +1,584 @@
 +/*
 + * graphics.c - graphics mode support for GRUB
 + * Implemented as a terminal type by Jeremy Katz <katzj@xxxxxxxxxx> based
@@ -1187,8 +1187,7 @@ diff -Naur grub-0.97.orig/stage2/graphics.c 
grub-0.97/stage2/graphics.c
 + *  GNU General Public License for more details.
 + *
 + *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ *  along with this program; If not, see <http://www.gnu.org/licenses/>
 + */
 +
 +#ifdef SUPPORT_GRAPHICS
@@ -1753,7 +1752,7 @@ diff -Naur grub-0.97.orig/stage2/graphics.c 
grub-0.97/stage2/graphics.c
 diff -Naur grub-0.97.orig/stage2/graphics.h grub-0.97/stage2/graphics.h
 --- grub-0.97.orig/stage2/graphics.h   1969-12-31 21:00:00.000000000 -0300
 +++ grub-0.97/stage2/graphics.h        2005-06-12 20:56:49.000000000 -0300
-@@ -0,0 +1,44 @@
+@@ -0,0 +1,43 @@
 +/* graphics.h - graphics console interface */
 +/*
 + *  GRUB  --  GRand Unified Bootloader
@@ -1770,8 +1769,7 @@ diff -Naur grub-0.97.orig/stage2/graphics.h 
grub-0.97/stage2/graphics.h
 + *  GNU General Public License for more details.
 + *
 + *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ *  along with this program; If not, see <http://www.gnu.org/licenses/>
 + */
 +
 +#ifndef GRAPHICS_H
diff --git a/stubdom/grub.patches/61btrfs.diff 
b/stubdom/grub.patches/61btrfs.diff
index fc72771..c831a10 100644
--- a/stubdom/grub.patches/61btrfs.diff
+++ b/stubdom/grub.patches/61btrfs.diff
@@ -66,7 +66,7 @@ diff -up grub-upstream.wip/INSTALL.btrfs 
grub-upstream.wip/INSTALL
 diff -up /dev/null grub-upstream.wip/stage2/btrfs.h
 --- /dev/null  2009-06-03 06:46:26.160951000 +0000
 +++ grub-upstream.wip/stage2/btrfs.h   2012-03-20 05:07:09.000000000 +0000
-@@ -0,0 +1,1415 @@
+@@ -0,0 +1,1413 @@
 +/* btrfs.h - an extraction from btrfs-progs-0.18/ctree.h into one file
 + *
 + * Copyright (C) 2007 Oracle.  All rights reserved.
@@ -81,9 +81,7 @@ diff -up /dev/null grub-upstream.wip/stage2/btrfs.h
 + * General Public License for more details.
 + *
 + * You should have received a copy of the GNU General Public
-+ * License along with this program; if not, write to the
-+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ * Boston, MA 021110-1307, USA.
++ * License along with this program; If not, see <http://www.gnu.org/licenses/>
 + */
 +
 +/* include/asm-i386/types.h */
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel