Jiri Slaby
608d5e43ad
Now Fedora is using trunk as well, just serialized - every commit as separate patch on top of base 2.00 version. So we are not alone and can move along. Please test. OBS-URL: https://build.opensuse.org/request/show/179591 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=42
126 lines
4.1 KiB
Diff
126 lines
4.1 KiB
Diff
From 3729b131ef1dcaa043242e8074418249695d381b Mon Sep 17 00:00:00 2001
|
|
From: Jiri Slaby <jirislaby@gmail.com>
|
|
Date: Sun, 24 Jun 2012 20:51:52 +0200
|
|
Subject: [PATCH] use grub2 as a package name
|
|
|
|
This will ease all of the renaming of directories and all the pkgdata
|
|
hacks.
|
|
|
|
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
|
|
---
|
|
configure | 24 ++++++++++++------------
|
|
configure.ac | 2 +-
|
|
2 files changed, 13 insertions(+), 13 deletions(-)
|
|
|
|
Index: grub-2.00/configure
|
|
===================================================================
|
|
--- grub-2.00.orig/configure
|
|
+++ grub-2.00/configure
|
|
@@ -1,6 +1,6 @@
|
|
#! /bin/sh
|
|
# Guess values for system-dependent variables and create Makefiles.
|
|
-# Generated by GNU Autoconf 2.69 for GRUB 2.00.
|
|
+# Generated by GNU Autoconf 2.69 for GRUB2 2.00.
|
|
#
|
|
# Report bugs to <bug-grub@gnu.org>.
|
|
#
|
|
@@ -578,10 +578,10 @@ MFLAGS=
|
|
MAKEFLAGS=
|
|
|
|
# Identity of this package.
|
|
-PACKAGE_NAME='GRUB'
|
|
-PACKAGE_TARNAME='grub'
|
|
+PACKAGE_NAME='GRUB2'
|
|
+PACKAGE_TARNAME='grub2'
|
|
PACKAGE_VERSION='2.00'
|
|
-PACKAGE_STRING='GRUB 2.00'
|
|
+PACKAGE_STRING='GRUB2 2.00'
|
|
PACKAGE_BUGREPORT='bug-grub@gnu.org'
|
|
PACKAGE_URL=''
|
|
|
|
@@ -1938,7 +1938,7 @@ if test "$ac_init_help" = "long"; then
|
|
# Omit some internal or obsolete options to make the list less imposing.
|
|
# This message is too long to be a string in the A/UX 3.1 sh.
|
|
cat <<_ACEOF
|
|
-\`configure' configures GRUB 2.00 to adapt to many kinds of systems.
|
|
+\`configure' configures GRUB2 2.00 to adapt to many kinds of systems.
|
|
|
|
Usage: $0 [OPTION]... [VAR=VALUE]...
|
|
|
|
@@ -1986,7 +1986,7 @@ Fine tuning of the installation director
|
|
--infodir=DIR info documentation [DATAROOTDIR/info]
|
|
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
|
|
--mandir=DIR man documentation [DATAROOTDIR/man]
|
|
- --docdir=DIR documentation root [DATAROOTDIR/doc/grub]
|
|
+ --docdir=DIR documentation root [DATAROOTDIR/doc/grub2]
|
|
--htmldir=DIR html documentation [DOCDIR]
|
|
--dvidir=DIR dvi documentation [DOCDIR]
|
|
--pdfdir=DIR pdf documentation [DOCDIR]
|
|
@@ -2009,7 +2009,7 @@ fi
|
|
|
|
if test -n "$ac_init_help"; then
|
|
case $ac_init_help in
|
|
- short | recursive ) echo "Configuration of GRUB 2.00:";;
|
|
+ short | recursive ) echo "Configuration of GRUB2 2.00:";;
|
|
esac
|
|
cat <<\_ACEOF
|
|
|
|
@@ -2144,7 +2144,7 @@ fi
|
|
test -n "$ac_init_help" && exit $ac_status
|
|
if $ac_init_version; then
|
|
cat <<\_ACEOF
|
|
-GRUB configure 2.00
|
|
+GRUB2 configure 2.00
|
|
generated by GNU Autoconf 2.69
|
|
|
|
Copyright (C) 2012 Free Software Foundation, Inc.
|
|
@@ -2853,7 +2853,7 @@ cat >config.log <<_ACEOF
|
|
This file contains any messages produced by compilers while
|
|
running configure, to aid debugging if configure makes a mistake.
|
|
|
|
-It was created by GRUB $as_me 2.00, which was
|
|
+It was created by GRUB2 $as_me 2.00, which was
|
|
generated by GNU Autoconf 2.69. Invocation command line was
|
|
|
|
$ $0 $@
|
|
@@ -3839,7 +3839,7 @@ fi
|
|
|
|
|
|
# Define the identity of the package.
|
|
- PACKAGE='grub'
|
|
+ PACKAGE='grub2'
|
|
VERSION='2.00'
|
|
|
|
|
|
@@ -23470,7 +23470,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
|
|
# report actual input values of CONFIG_FILES etc. instead of their
|
|
# values after options handling.
|
|
ac_log="
|
|
-This file was extended by GRUB $as_me 2.00, which was
|
|
+This file was extended by GRUB2 $as_me 2.00, which was
|
|
generated by GNU Autoconf 2.69. Invocation command line was
|
|
|
|
CONFIG_FILES = $CONFIG_FILES
|
|
@@ -23540,7 +23540,7 @@ _ACEOF
|
|
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
|
ac_cs_version="\\
|
|
-GRUB config.status 2.00
|
|
+GRUB2 config.status 2.00
|
|
configured by $0, generated by GNU Autoconf 2.69,
|
|
with options \\"\$ac_cs_config\\"
|
|
|
|
Index: grub-2.00/configure.ac
|
|
===================================================================
|
|
--- grub-2.00.orig/configure.ac
|
|
+++ grub-2.00/configure.ac
|
|
@@ -32,7 +32,7 @@ dnl type, so there is no conflict. Varia
|
|
dnl (such as TARGET_CC, TARGET_CFLAGS, etc.) are used for the target
|
|
dnl type.
|
|
|
|
-AC_INIT([GRUB],[2.00],[bug-grub@gnu.org])
|
|
+AC_INIT([GRUB2],[2.00],[bug-grub@gnu.org])
|
|
|
|
AC_CONFIG_AUX_DIR([build-aux])
|
|
|