r9563 - /desktop/experimental/control-center/debian/patches/05_autotools.patch

lool at users.alioth.debian.org lool at users.alioth.debian.org
Sat Apr 7 14:54:37 UTC 2007


Author: lool
Date: Sat Apr  7 14:54:37 2007
New Revision: 9563

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9563
Log:
* Drop config.guess from patch 05_autotools.

Modified:
    desktop/experimental/control-center/debian/patches/05_autotools.patch

Modified: desktop/experimental/control-center/debian/patches/05_autotools.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/patches/05_autotools.patch?rev=9563&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/patches/05_autotools.patch (original)
+++ desktop/experimental/control-center/debian/patches/05_autotools.patch Sat Apr  7 14:54:37 2007
@@ -3035,164 +3035,6 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -urNad control-center-2.18.0/config.guess control-center-2.18.0.new/config.guess
---- control-center-2.18.0/config.guess	2007-03-12 19:25:52.000000000 +0100
-+++ control-center-2.18.0.new/config.guess	2007-03-26 17:22:26.000000000 +0200
-@@ -139,16 +139,6 @@
- UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
- UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
- 
--case "${UNAME_MACHINE}" in
--    i?86)
--	test -z "$VENDOR" && VENDOR=pc
--	;;
--    *)
--	test -z "$VENDOR" && VENDOR=unknown
--	;;
--esac
--test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
--
- # Note: order is significant - the case branches are not exclusive.
- 
- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -839,7 +829,7 @@
- 	echo ${UNAME_MACHINE}-pc-minix
- 	exit ;;
-     arm*:Linux:*:*)
--	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     avr32*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-@@ -851,16 +841,16 @@
- 	echo crisv32-axis-linux-gnu
- 	exit ;;
-     frv:Linux:*:*)
--    	echo frv-${VENDOR}-linux-gnu
-+    	echo frv-unknown-linux-gnu
- 	exit ;;
-     ia64:Linux:*:*)
--	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     m32r*:Linux:*:*)
--	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     m68*:Linux:*:*)
--	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     mips:Linux:*:*)
- 	eval $set_cc_for_build
-@@ -883,7 +873,7 @@
- 		s: ::g
- 		p
- 	    }'`"
--	test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- 	;;
-     mips64:Linux:*:*)
- 	eval $set_cc_for_build
-@@ -906,16 +896,16 @@
- 		s: ::g
- 		p
- 	    }'`"
--	test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- 	;;
-     or32:Linux:*:*)
--	echo or32-${VENDOR}-linux-gnu
-+	echo or32-unknown-linux-gnu
- 	exit ;;
-     ppc:Linux:*:*)
--	echo powerpc-${VENDOR}-linux-gnu
-+	echo powerpc-unknown-linux-gnu
- 	exit ;;
-     ppc64:Linux:*:*)
--	echo powerpc64-${VENDOR}-linux-gnu
-+	echo powerpc64-unknown-linux-gnu
- 	exit ;;
-     alpha:Linux:*:*)
- 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -929,36 +919,36 @@
-         esac
- 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
- 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
--	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- 	exit ;;
-     parisc:Linux:*:* | hppa:Linux:*:*)
- 	# Look for CPU level
- 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
--	  PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
--	  PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
--	  *)    echo hppa-${VENDOR}-linux-gnu ;;
-+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-+	  *)    echo hppa-unknown-linux-gnu ;;
- 	esac
- 	exit ;;
-     parisc64:Linux:*:* | hppa64:Linux:*:*)
--	echo hppa64-${VENDOR}-linux-gnu
-+	echo hppa64-unknown-linux-gnu
- 	exit ;;
-     s390:Linux:*:* | s390x:Linux:*:*)
- 	echo ${UNAME_MACHINE}-ibm-linux
- 	exit ;;
-     sh64*:Linux:*:*)
--    	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     sh*:Linux:*:*)
--	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     sparc:Linux:*:* | sparc64:Linux:*:*)
--	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     vax:Linux:*:*)
- 	echo ${UNAME_MACHINE}-dec-linux-gnu
- 	exit ;;
-     x86_64:Linux:*:*)
--	echo x86_64-${VENDOR}-linux-gnu
-+	echo x86_64-unknown-linux-gnu
- 	exit ;;
-     i*86:Linux:*:*)
- 	# The BFD linker knows what the default object file format is, so
-@@ -973,18 +963,18 @@
- 				    p'`
-         case "$ld_supported_targets" in
- 	  elf32-i386)
--		TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux-gnu"
-+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- 		;;
- 	  a.out-i386-linux)
--		echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuaout"
-+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- 		exit ;;
- 	  coff-i386)
--		echo "${UNAME_MACHINE}-${VENDOR}-linux-gnucoff"
-+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
- 		exit ;;
- 	  "")
- 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
- 		# one that does not give us useful --help.
--		echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuoldld"
-+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
- 		exit ;;
- 	esac
- 	# Determine whether the default compiler is a.out or elf
-@@ -1018,7 +1008,7 @@
- 		p
- 	    }'`"
- 	test x"${LIBC}" != x && {
--		echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
-+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- 		exit
- 	}
- 	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
 diff -urNad control-center-2.18.0/configure control-center-2.18.0.new/configure
 --- control-center-2.18.0/configure	2007-03-12 19:25:18.000000000 +0100
 +++ control-center-2.18.0.new/configure	2007-03-26 17:22:32.000000000 +0200




More information about the pkg-gnome-commits mailing list