The following commit has been merged in the master branch:
commit 9569749d95bb810eb5b9a3c7d92f904e1d31c6cd
Author: Francesco Paolo Lovergine <fran...@debian.org>
Date: Mon Nov 25 15:26:32 2013 +0100
Restored original config.* stuff from upstream branch.
diff --git a/config.guess b/config.guess
index 11a9347..0f0fe71 100755
--- a/config.guess
+++ b/config.guess
@@ -4,11 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-<<<<<<< HEAD
-timestamp='2007-07-22'
-=======
timestamp='2007-03-06'
->>>>>>> sid
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -334,11 +330,7 @@ case
"${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
-<<<<<<< HEAD
- i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-=======
i86pc:SunOS:5.*:*)
->>>>>>> sid
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -801,11 +793,7 @@ EOF
exit ;;
*:Interix*:[3456]*)
case ${UNAME_MACHINE} in
-<<<<<<< HEAD
- x86)
-=======
x86)
->>>>>>> sid
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T | authenticamd)
diff --git a/config.sub b/config.sub
index e01d92f..5defff6 100755
--- a/config.sub
+++ b/config.sub
@@ -4,11 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-<<<<<<< HEAD
-timestamp='2007-06-28'
-=======
timestamp='2007-01-18'
->>>>>>> sid
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -479,13 +475,8 @@ case $basic_machine in
basic_machine=craynv-cray
os=-unicosmp
;;
-<<<<<<< HEAD
- cr16)
- basic_machine=cr16-unknown
-=======
cr16c)
basic_machine=cr16c-unknown
->>>>>>> sid
os=-elf
;;
crds | unos)
@@ -692,13 +683,6 @@ case $basic_machine in
basic_machine=i386-pc
os=-mingw32
;;
-<<<<<<< HEAD
- mingw32ce)
- basic_machine=arm-unknown
- os=-mingw32ce
- ;;
-=======
->>>>>>> sid
miniframe)
basic_machine=m68000-convergent
;;
--
Proj.4
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
