r11636 - in /desktop/experimental/gtk+2.0/debian: changelog patches/070_mandatory-relibtoolize.patch rules

lool at users.alioth.debian.org lool at users.alioth.debian.org
Tue Jun 19 19:28:49 UTC 2007


Author: lool
Date: Tue Jun 19 19:28:49 2007
New Revision: 11636

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11636
Log:
* New upstream development release, with incompatible API changes; the new
  API may still change incompatibly.
  - Bump shlibs to >= 2.11.4.

Modified:
    desktop/experimental/gtk+2.0/debian/changelog
    desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
    desktop/experimental/gtk+2.0/debian/rules

Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=11636&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog (original)
+++ desktop/experimental/gtk+2.0/debian/changelog Tue Jun 19 19:28:49 2007
@@ -1,4 +1,4 @@
-gtk+2.0 (2.11.3-1) UNRELEASED; urgency=low
+gtk+2.0 (2.11.4-1) UNRELEASED; urgency=low
 
   [ Josselin Mouette ]
   * 040_filechooser_single-click.patch: fix the patch to apply cleanly
@@ -23,8 +23,11 @@
     calling debian/dh_listmissing.pl.
   * Also depend on libxcomposite-dev, libxdamage-dev; thanks Sébastien Bacher.
   * Ship etc/gtk-2.0/im-multipress.conf in the shared library.
-
- -- Loic Minier <lool at dooz.org>  Mon, 18 Jun 2007 14:40:08 +0200
+  * New upstream development release, with incompatible API changes; the new
+    API may still change incompatibly.
+    - Bump shlibs to >= 2.11.4.
+
+ -- Loic Minier <lool at dooz.org>  Tue, 19 Jun 2007 21:18:17 +0200
 
 gtk+2.0 (2.11.2-1) experimental; urgency=low
 

Modified: desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/070_mandatory-relibtoolize.patch?rev=11636&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch (original)
+++ desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch Tue Jun 19 19:28:49 2007
@@ -6,9 +6,9 @@
 rm -rf autom4te.cache
 exclude config.guess and sub with diff -urN -x config.guess -x config.sub
 
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/Makefile.in gtk+2.0-2.11.3.new/Makefile.in
---- gtk+2.0-2.11.3.orig/Makefile.in	2007-06-15 20:26:22.000000000 +0200
-+++ gtk+2.0-2.11.3.new/Makefile.in	2007-06-16 14:30:15.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/Makefile.in gtk+2.0-2.11.4/Makefile.in
+--- gtk+2.0-2.11.4.orig/Makefile.in	2007-06-19 17:28:56.000000000 +0200
++++ gtk+2.0-2.11.4/Makefile.in	2007-06-19 21:20:28.000000000 +0200
 @@ -90,6 +90,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -49,9 +49,9 @@
  	  if test "$$subdir" = .; then :; else \
  	    test -d $(distdir)/$$subdir \
  	    || mkdir $(distdir)/$$subdir \
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/aclocal.m4 gtk+2.0-2.11.3.new/aclocal.m4
---- gtk+2.0-2.11.3.orig/aclocal.m4	2007-06-15 20:26:16.000000000 +0200
-+++ gtk+2.0-2.11.3.new/aclocal.m4	2007-06-16 14:30:10.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/aclocal.m4 gtk+2.0-2.11.4/aclocal.m4
+--- gtk+2.0-2.11.4.orig/aclocal.m4	2007-06-19 17:28:50.000000000 +0200
++++ gtk+2.0-2.11.4/aclocal.m4	2007-06-19 21:20:22.000000000 +0200
 @@ -941,7 +941,7 @@
  
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -346,14 +346,410 @@
 +  AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
  ])
  
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/configure gtk+2.0-2.11.3.new/configure
---- gtk+2.0-2.11.3.orig/configure	2007-06-15 20:26:27.000000000 +0200
-+++ gtk+2.0-2.11.3.new/configure	2007-06-16 14:30:15.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/config.guess gtk+2.0-2.11.4/config.guess
+--- gtk+2.0-2.11.4.orig/config.guess	2007-01-14 05:15:09.000000000 +0100
++++ gtk+2.0-2.11.4/config.guess	2007-04-20 04:09:10.000000000 +0200
+@@ -1,9 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
++#   Inc.
+ 
+-timestamp='2005-12-13'
++timestamp='2007-03-06'
+ 
+ # 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
+@@ -106,7 +107,7 @@
+ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+ : ${TMPDIR=/tmp} ;
+- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+@@ -160,6 +161,7 @@
+ 	    arm*) machine=arm-unknown ;;
+ 	    sh3el) machine=shl-unknown ;;
+ 	    sh3eb) machine=sh-unknown ;;
++	    sh5el) machine=sh5le-unknown ;;
+ 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ 	esac
+ 	# The Operating System including object format, if it has switched
+@@ -206,8 +208,11 @@
+     *:ekkoBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ 	exit ;;
++    *:SolidBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
++	exit ;;
+     macppc:MirBSD:*:*)
+-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
++	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+ 	exit ;;
+     *:MirBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+@@ -764,12 +769,19 @@
+ 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ 	exit ;;
+     *:FreeBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
++	case ${UNAME_MACHINE} in
++	    pc98)
++		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	    amd64)
++		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	    *)
++		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	esac
+ 	exit ;;
+     i*:CYGWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-cygwin
+ 	exit ;;
+-    i*:MINGW*:*)
++    *:MINGW*:*)
+ 	echo ${UNAME_MACHINE}-pc-mingw32
+ 	exit ;;
+     i*:windows32*:*)
+@@ -779,9 +791,15 @@
+     i*:PW*:*)
+ 	echo ${UNAME_MACHINE}-pc-pw32
+ 	exit ;;
+-    x86:Interix*:[345]*)
+-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+-	exit ;;
++    *:Interix*:[3456]*)
++    	case ${UNAME_MACHINE} in
++	    x86) 
++		echo i586-pc-interix${UNAME_RELEASE}
++		exit ;;
++	    EM64T | authenticamd)
++		echo x86_64-unknown-interix${UNAME_RELEASE}
++		exit ;;
++	esac ;;
+     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ 	echo i${UNAME_MACHINE}-pc-mks
+ 	exit ;;
+@@ -817,6 +835,9 @@
+     arm*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
++    avr32*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
+     cris:Linux:*:*)
+ 	echo cris-axis-linux-gnu
+ 	exit ;;
+@@ -851,7 +872,11 @@
+ 	#endif
+ 	#endif
+ EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
++	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++	    /^CPU/{
++		s: ::g
++		p
++	    }'`"
+ 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ 	;;
+     mips64:Linux:*:*)
+@@ -870,7 +895,11 @@
+ 	#endif
+ 	#endif
+ EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
++	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++	    /^CPU/{
++		s: ::g
++		p
++	    }'`"
+ 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ 	;;
+     or32:Linux:*:*)
+@@ -925,6 +954,9 @@
+     x86_64:Linux:*:*)
+ 	echo x86_64-unknown-linux-gnu
+ 	exit ;;
++    xtensa:Linux:*:*)
++    	echo xtensa-unknown-linux-gnu
++	exit ;;
+     i*86:Linux:*:*)
+ 	# The BFD linker knows what the default object file format is, so
+ 	# first see if it will tell us. cd to the root directory to prevent
+@@ -967,7 +999,7 @@
+ 	LIBC=gnulibc1
+ 	# endif
+ 	#else
+-	#if defined(__INTEL_COMPILER) || defined(__PGI)
++	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+ 	LIBC=gnu
+ 	#else
+ 	LIBC=gnuaout
+@@ -977,7 +1009,11 @@
+ 	LIBC=dietlibc
+ 	#endif
+ EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
++	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++	    /^LIBC/{
++		s: ::g
++		p
++	    }'`"
+ 	test x"${LIBC}" != x && {
+ 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ 		exit
+@@ -1179,6 +1215,15 @@
+     SX-6:SUPER-UX:*:*)
+ 	echo sx6-nec-superux${UNAME_RELEASE}
+ 	exit ;;
++    SX-7:SUPER-UX:*:*)
++	echo sx7-nec-superux${UNAME_RELEASE}
++	exit ;;
++    SX-8:SUPER-UX:*:*)
++	echo sx8-nec-superux${UNAME_RELEASE}
++	exit ;;
++    SX-8R:SUPER-UX:*:*)
++	echo sx8r-nec-superux${UNAME_RELEASE}
++	exit ;;
+     Power*:Rhapsody:*:*)
+ 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ 	exit ;;
+diff -urN gtk+2.0-2.11.4.orig/config.sub gtk+2.0-2.11.4/config.sub
+--- gtk+2.0-2.11.4.orig/config.sub	2007-01-14 05:15:09.000000000 +0100
++++ gtk+2.0-2.11.4/config.sub	2007-04-20 04:09:10.000000000 +0200
+@@ -1,9 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
++#   Inc.
+ 
+-timestamp='2005-12-11'
++timestamp='2007-01-18'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -240,15 +241,16 @@
+ 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ 	| am33_2.0 \
+-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
++	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+ 	| bfin \
+ 	| c4x | clipper \
+ 	| d10v | d30v | dlx | dsp16xx \
+-	| fr30 | frv \
++	| fido | fr30 | frv \
+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ 	| i370 | i860 | i960 | ia64 \
+ 	| ip2k | iq2000 \
+-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
++	| m32c | m32r | m32rle | m68000 | m68k | m88k \
++	| maxq | mb | microblaze | mcore | mep \
+ 	| mips | mipsbe | mipseb | mipsel | mipsle \
+ 	| mips16 \
+ 	| mips64 | mips64el \
+@@ -268,26 +270,25 @@
+ 	| mn10200 | mn10300 \
+ 	| mt \
+ 	| msp430 \
++	| nios | nios2 \
+ 	| ns16k | ns32k \
+ 	| or32 \
+ 	| pdp10 | pdp11 | pj | pjl \
+ 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ 	| pyramid \
+-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
++	| score \
++	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ 	| sh64 | sh64le \
+-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+-	| sparcv8 | sparcv9 | sparcv9b \
+-	| strongarm \
++	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
++	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
++	| spu | strongarm \
+ 	| tahoe | thumb | tic4x | tic80 | tron \
+ 	| v850 | v850e \
+ 	| we32k \
+-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
++	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ 	| z8k)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
+-	m32c)
+-		basic_machine=$basic_machine-unknown
+-		;;
+ 	m6811 | m68hc11 | m6812 | m68hc12)
+ 		# Motorola 68HC11/12.
+ 		basic_machine=$basic_machine-unknown
+@@ -317,18 +318,18 @@
+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+-	| avr-* \
++	| avr-* | avr32-* \
+ 	| bfin-* | bs2000-* \
+ 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ 	| clipper-* | craynv-* | cydra-* \
+ 	| d10v-* | d30v-* | dlx-* \
+ 	| elxsi-* \
+-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
++	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ 	| h8300-* | h8500-* \
+ 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ 	| i*86-* | i860-* | i960-* | ia64-* \
+ 	| ip2k-* | iq2000-* \
+-	| m32r-* | m32rle-* \
++	| m32c-* | m32r-* | m32rle-* \
+ 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+ 	| m88110-* | m88k-* | maxq-* | mcore-* \
+ 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+@@ -350,29 +351,28 @@
+ 	| mmix-* \
+ 	| mt-* \
+ 	| msp430-* \
++	| nios-* | nios2-* \
+ 	| none-* | np1-* | ns16k-* | ns32k-* \
+ 	| orion-* \
+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ 	| pyramid-* \
+ 	| romp-* | rs6000-* \
+-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
++	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
++	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ 	| sparclite-* \
+-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
++	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ 	| tahoe-* | thumb-* \
+ 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ 	| tron-* \
+ 	| v850-* | v850e-* | vax-* \
+ 	| we32k-* \
+-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
++	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ 	| xstormy16-* | xtensa-* \
+ 	| ymp-* \
+ 	| z8k-*)
+ 		;;
+-	m32c-*)
+-		;;
+ 	# Recognize the various machine names and aliases which stand
+ 	# for a CPU type and a company and sometimes even an OS.
+ 	386bsd)
+@@ -818,6 +818,12 @@
+ 	pc532 | pc532-*)
+ 		basic_machine=ns32k-pc532
+ 		;;
++	pc98)
++		basic_machine=i386-pc
++		;;
++	pc98-*)
++		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	pentium | p5 | k5 | k6 | nexgen | viac3)
+ 		basic_machine=i586-pc
+ 		;;
+@@ -904,6 +910,10 @@
+ 	sb1el)
+ 		basic_machine=mipsisa64sb1el-unknown
+ 		;;
++	sde)
++		basic_machine=mipsisa32-sde
++		os=-elf
++		;;
+ 	sei)
+ 		basic_machine=mips-sei
+ 		os=-seiux
+@@ -915,6 +925,9 @@
+ 		basic_machine=sh-hitachi
+ 		os=-hms
+ 		;;
++	sh5el)
++		basic_machine=sh5le-unknown
++		;;
+ 	sh64)
+ 		basic_machine=sh64-unknown
+ 		;;
+@@ -1120,7 +1133,7 @@
+ 	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+ 		basic_machine=sh-unknown
+ 		;;
+-	sparc | sparcv8 | sparcv9 | sparcv9b)
++	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+ 		basic_machine=sparc-sun
+ 		;;
+ 	cydra)
+@@ -1193,7 +1206,8 @@
+ 	      | -aos* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
++	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
++	      | -openbsd* | -solidbsd* \
+ 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+@@ -1208,7 +1222,7 @@
+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+-	      | -skyos* | -haiku* | -rdos*)
++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+@@ -1360,6 +1374,12 @@
+ # system, and we'll never get to this point.
+ 
+ case $basic_machine in
++        score-*)
++		os=-elf
++		;;
++        spu-*)
++		os=-elf
++		;;
+ 	*-acorn)
+ 		os=-riscix1.2
+ 		;;
+@@ -1369,9 +1389,9 @@
+ 	arm*-semi)
+ 		os=-aout
+ 		;;
+-    c4x-* | tic4x-*)
+-        os=-coff
+-        ;;
++        c4x-* | tic4x-*)
++        	os=-coff
++		;;
+ 	# This must come before the *-dec entry.
+ 	pdp10-*)
+ 		os=-tops20
+@@ -1397,6 +1417,9 @@
+ 	m68*-cisco)
+ 		os=-aout
+ 		;;
++        mep-*)
++		os=-elf
++		;;
+ 	mips*-cisco)
+ 		os=-elf
+ 		;;
+diff -urN gtk+2.0-2.11.4.orig/configure gtk+2.0-2.11.4/configure
+--- gtk+2.0-2.11.4.orig/configure	2007-06-19 17:29:01.000000000 +0200
++++ gtk+2.0-2.11.4/configure	2007-06-19 21:20:27.000000000 +0200
 @@ -1,6 +1,6 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.60 for gtk+ 2.11.3.
-+# Generated by GNU Autoconf 2.61 for gtk+ 2.11.3.
+-# Generated by GNU Autoconf 2.60 for gtk+ 2.11.4.
++# Generated by GNU Autoconf 2.61 for gtk+ 2.11.4.
  #
  # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>.
  #
@@ -615,7 +1011,7 @@
 @@ -1774,7 +1793,7 @@
  if $ac_init_version; then
    cat <<\_ACEOF
- gtk+ configure 2.11.3
+ gtk+ configure 2.11.4
 -generated by GNU Autoconf 2.60
 +generated by GNU Autoconf 2.61
  
@@ -624,7 +1020,7 @@
 @@ -1788,7 +1807,7 @@
  running configure, to aid debugging if configure makes a mistake.
  
- It was created by gtk+ $as_me 2.11.3, which was
+ It was created by gtk+ $as_me 2.11.4, which was
 -generated by GNU Autoconf 2.60.  Invocation command line was
 +generated by GNU Autoconf 2.61.  Invocation command line was
  
@@ -8232,7 +8628,7 @@
 @@ -36377,7 +33788,7 @@
  # values after options handling.
  ac_log="
- This file was extended by gtk+ $as_me 2.11.3, which was
+ This file was extended by gtk+ $as_me 2.11.4, which was
 -generated by GNU Autoconf 2.60.  Invocation command line was
 +generated by GNU Autoconf 2.61.  Invocation command line was
  
@@ -8250,7 +8646,7 @@
 @@ -36430,7 +33841,7 @@
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
- gtk+ config.status 2.11.3
+ gtk+ config.status 2.11.4
 -configured by $0, generated by GNU Autoconf 2.60,
 +configured by $0, generated by GNU Autoconf 2.61,
    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -8304,9 +8700,9 @@
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/contrib/Makefile.in gtk+2.0-2.11.3.new/contrib/Makefile.in
---- gtk+2.0-2.11.3.orig/contrib/Makefile.in	2007-06-15 20:26:22.000000000 +0200
-+++ gtk+2.0-2.11.3.new/contrib/Makefile.in	2007-06-16 14:30:16.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/contrib/Makefile.in gtk+2.0-2.11.4/contrib/Makefile.in
+--- gtk+2.0-2.11.4.orig/contrib/Makefile.in	2007-06-19 17:28:56.000000000 +0200
++++ gtk+2.0-2.11.4/contrib/Makefile.in	2007-06-19 21:20:28.000000000 +0200
 @@ -90,6 +90,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8316,9 +8712,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.11.3.new/contrib/gdk-pixbuf-xlib/Makefile.in
---- gtk+2.0-2.11.3.orig/contrib/gdk-pixbuf-xlib/Makefile.in	2007-06-15 20:26:22.000000000 +0200
-+++ gtk+2.0-2.11.3.new/contrib/gdk-pixbuf-xlib/Makefile.in	2007-06-16 14:30:16.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.11.4/contrib/gdk-pixbuf-xlib/Makefile.in
+--- gtk+2.0-2.11.4.orig/contrib/gdk-pixbuf-xlib/Makefile.in	2007-06-19 17:28:56.000000000 +0200
++++ gtk+2.0-2.11.4/contrib/gdk-pixbuf-xlib/Makefile.in	2007-06-19 21:20:28.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8328,9 +8724,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/demos/Makefile.in gtk+2.0-2.11.3.new/demos/Makefile.in
---- gtk+2.0-2.11.3.orig/demos/Makefile.in	2007-06-15 20:26:22.000000000 +0200
-+++ gtk+2.0-2.11.3.new/demos/Makefile.in	2007-06-16 14:30:16.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/demos/Makefile.in gtk+2.0-2.11.4/demos/Makefile.in
+--- gtk+2.0-2.11.4.orig/demos/Makefile.in	2007-06-19 17:28:57.000000000 +0200
++++ gtk+2.0-2.11.4/demos/Makefile.in	2007-06-19 21:20:28.000000000 +0200
 @@ -90,6 +90,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8340,9 +8736,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/demos/gtk-demo/Makefile.in gtk+2.0-2.11.3.new/demos/gtk-demo/Makefile.in
---- gtk+2.0-2.11.3.orig/demos/gtk-demo/Makefile.in	2007-06-15 20:26:22.000000000 +0200
-+++ gtk+2.0-2.11.3.new/demos/gtk-demo/Makefile.in	2007-06-16 14:30:16.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/demos/gtk-demo/Makefile.in gtk+2.0-2.11.4/demos/gtk-demo/Makefile.in
+--- gtk+2.0-2.11.4.orig/demos/gtk-demo/Makefile.in	2007-06-19 17:28:57.000000000 +0200
++++ gtk+2.0-2.11.4/demos/gtk-demo/Makefile.in	2007-06-19 21:20:28.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8352,9 +8748,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/docs/Makefile.in gtk+2.0-2.11.3.new/docs/Makefile.in
---- gtk+2.0-2.11.3.orig/docs/Makefile.in	2007-06-15 20:26:22.000000000 +0200
-+++ gtk+2.0-2.11.3.new/docs/Makefile.in	2007-06-16 14:30:16.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/docs/Makefile.in gtk+2.0-2.11.4/docs/Makefile.in
+--- gtk+2.0-2.11.4.orig/docs/Makefile.in	2007-06-19 17:28:57.000000000 +0200
++++ gtk+2.0-2.11.4/docs/Makefile.in	2007-06-19 21:20:28.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8364,9 +8760,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/docs/faq/Makefile.in gtk+2.0-2.11.3.new/docs/faq/Makefile.in
---- gtk+2.0-2.11.3.orig/docs/faq/Makefile.in	2007-06-15 20:26:22.000000000 +0200
-+++ gtk+2.0-2.11.3.new/docs/faq/Makefile.in	2007-06-16 14:30:16.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/docs/faq/Makefile.in gtk+2.0-2.11.4/docs/faq/Makefile.in
+--- gtk+2.0-2.11.4.orig/docs/faq/Makefile.in	2007-06-19 17:28:57.000000000 +0200
++++ gtk+2.0-2.11.4/docs/faq/Makefile.in	2007-06-19 21:20:28.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8376,9 +8772,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/docs/reference/Makefile.in gtk+2.0-2.11.3.new/docs/reference/Makefile.in
---- gtk+2.0-2.11.3.orig/docs/reference/Makefile.in	2007-06-15 20:26:22.000000000 +0200
-+++ gtk+2.0-2.11.3.new/docs/reference/Makefile.in	2007-06-16 14:30:16.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/docs/reference/Makefile.in gtk+2.0-2.11.4/docs/reference/Makefile.in
+--- gtk+2.0-2.11.4.orig/docs/reference/Makefile.in	2007-06-19 17:28:57.000000000 +0200
++++ gtk+2.0-2.11.4/docs/reference/Makefile.in	2007-06-19 21:20:29.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8388,9 +8784,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/docs/reference/gdk/Makefile.in gtk+2.0-2.11.3.new/docs/reference/gdk/Makefile.in
---- gtk+2.0-2.11.3.orig/docs/reference/gdk/Makefile.in	2007-06-15 20:26:22.000000000 +0200
-+++ gtk+2.0-2.11.3.new/docs/reference/gdk/Makefile.in	2007-06-16 14:30:16.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/docs/reference/gdk/Makefile.in gtk+2.0-2.11.4/docs/reference/gdk/Makefile.in
+--- gtk+2.0-2.11.4.orig/docs/reference/gdk/Makefile.in	2007-06-19 17:28:57.000000000 +0200
++++ gtk+2.0-2.11.4/docs/reference/gdk/Makefile.in	2007-06-19 21:20:29.000000000 +0200
 @@ -95,6 +95,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8400,9 +8796,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.11.3.new/docs/reference/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.11.3.orig/docs/reference/gdk-pixbuf/Makefile.in	2007-06-15 20:26:22.000000000 +0200
-+++ gtk+2.0-2.11.3.new/docs/reference/gdk-pixbuf/Makefile.in	2007-06-16 14:30:16.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.11.4/docs/reference/gdk-pixbuf/Makefile.in
+--- gtk+2.0-2.11.4.orig/docs/reference/gdk-pixbuf/Makefile.in	2007-06-19 17:28:57.000000000 +0200
++++ gtk+2.0-2.11.4/docs/reference/gdk-pixbuf/Makefile.in	2007-06-19 21:20:29.000000000 +0200
 @@ -95,6 +95,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8412,9 +8808,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/docs/reference/gtk/Makefile.in gtk+2.0-2.11.3.new/docs/reference/gtk/Makefile.in
---- gtk+2.0-2.11.3.orig/docs/reference/gtk/Makefile.in	2007-06-15 22:40:03.000000000 +0200
-+++ gtk+2.0-2.11.3.new/docs/reference/gtk/Makefile.in	2007-06-16 14:30:16.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/docs/reference/gtk/Makefile.in gtk+2.0-2.11.4/docs/reference/gtk/Makefile.in
+--- gtk+2.0-2.11.4.orig/docs/reference/gtk/Makefile.in	2007-06-19 17:28:57.000000000 +0200
++++ gtk+2.0-2.11.4/docs/reference/gtk/Makefile.in	2007-06-19 21:20:29.000000000 +0200
 @@ -95,6 +95,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8424,9 +8820,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/docs/tools/Makefile.in gtk+2.0-2.11.3.new/docs/tools/Makefile.in
---- gtk+2.0-2.11.3.orig/docs/tools/Makefile.in	2007-06-15 20:26:23.000000000 +0200
-+++ gtk+2.0-2.11.3.new/docs/tools/Makefile.in	2007-06-16 14:30:16.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/docs/tools/Makefile.in gtk+2.0-2.11.4/docs/tools/Makefile.in
+--- gtk+2.0-2.11.4.orig/docs/tools/Makefile.in	2007-06-19 17:28:57.000000000 +0200
++++ gtk+2.0-2.11.4/docs/tools/Makefile.in	2007-06-19 21:20:29.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8436,9 +8832,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/docs/tutorial/Makefile.in gtk+2.0-2.11.3.new/docs/tutorial/Makefile.in
---- gtk+2.0-2.11.3.orig/docs/tutorial/Makefile.in	2007-06-15 20:26:23.000000000 +0200
-+++ gtk+2.0-2.11.3.new/docs/tutorial/Makefile.in	2007-06-16 14:30:17.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/docs/tutorial/Makefile.in gtk+2.0-2.11.4/docs/tutorial/Makefile.in
+--- gtk+2.0-2.11.4.orig/docs/tutorial/Makefile.in	2007-06-19 17:28:57.000000000 +0200
++++ gtk+2.0-2.11.4/docs/tutorial/Makefile.in	2007-06-19 21:20:29.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8448,9 +8844,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/gdk/Makefile.in gtk+2.0-2.11.3.new/gdk/Makefile.in
---- gtk+2.0-2.11.3.orig/gdk/Makefile.in	2007-06-15 20:26:23.000000000 +0200
-+++ gtk+2.0-2.11.3.new/gdk/Makefile.in	2007-06-16 14:30:17.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/gdk/Makefile.in gtk+2.0-2.11.4/gdk/Makefile.in
+--- gtk+2.0-2.11.4.orig/gdk/Makefile.in	2007-06-19 17:28:58.000000000 +0200
++++ gtk+2.0-2.11.4/gdk/Makefile.in	2007-06-19 21:20:29.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8460,9 +8856,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/gdk/directfb/Makefile.in gtk+2.0-2.11.3.new/gdk/directfb/Makefile.in
---- gtk+2.0-2.11.3.orig/gdk/directfb/Makefile.in	2007-06-15 20:26:23.000000000 +0200
-+++ gtk+2.0-2.11.3.new/gdk/directfb/Makefile.in	2007-06-16 14:30:17.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/gdk/directfb/Makefile.in gtk+2.0-2.11.4/gdk/directfb/Makefile.in
+--- gtk+2.0-2.11.4.orig/gdk/directfb/Makefile.in	2007-06-19 17:28:58.000000000 +0200
++++ gtk+2.0-2.11.4/gdk/directfb/Makefile.in	2007-06-19 21:20:30.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8472,9 +8868,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/gdk/quartz/Makefile.in gtk+2.0-2.11.3.new/gdk/quartz/Makefile.in
---- gtk+2.0-2.11.3.orig/gdk/quartz/Makefile.in	2007-06-15 20:26:23.000000000 +0200
-+++ gtk+2.0-2.11.3.new/gdk/quartz/Makefile.in	2007-06-16 14:30:17.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/gdk/quartz/Makefile.in gtk+2.0-2.11.4/gdk/quartz/Makefile.in
+--- gtk+2.0-2.11.4.orig/gdk/quartz/Makefile.in	2007-06-19 17:28:58.000000000 +0200
++++ gtk+2.0-2.11.4/gdk/quartz/Makefile.in	2007-06-19 21:20:30.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8484,9 +8880,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/gdk/win32/Makefile.in gtk+2.0-2.11.3.new/gdk/win32/Makefile.in
---- gtk+2.0-2.11.3.orig/gdk/win32/Makefile.in	2007-06-15 20:26:23.000000000 +0200
-+++ gtk+2.0-2.11.3.new/gdk/win32/Makefile.in	2007-06-16 14:30:17.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/gdk/win32/Makefile.in gtk+2.0-2.11.4/gdk/win32/Makefile.in
+--- gtk+2.0-2.11.4.orig/gdk/win32/Makefile.in	2007-06-19 17:28:58.000000000 +0200
++++ gtk+2.0-2.11.4/gdk/win32/Makefile.in	2007-06-19 21:20:30.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8496,9 +8892,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/gdk/win32/rc/Makefile.in gtk+2.0-2.11.3.new/gdk/win32/rc/Makefile.in
---- gtk+2.0-2.11.3.orig/gdk/win32/rc/Makefile.in	2007-06-15 20:26:23.000000000 +0200
-+++ gtk+2.0-2.11.3.new/gdk/win32/rc/Makefile.in	2007-06-16 14:30:17.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/gdk/win32/rc/Makefile.in gtk+2.0-2.11.4/gdk/win32/rc/Makefile.in
+--- gtk+2.0-2.11.4.orig/gdk/win32/rc/Makefile.in	2007-06-19 17:28:58.000000000 +0200
++++ gtk+2.0-2.11.4/gdk/win32/rc/Makefile.in	2007-06-19 21:20:30.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8508,9 +8904,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/gdk/x11/Makefile.in gtk+2.0-2.11.3.new/gdk/x11/Makefile.in
---- gtk+2.0-2.11.3.orig/gdk/x11/Makefile.in	2007-06-15 20:26:24.000000000 +0200
-+++ gtk+2.0-2.11.3.new/gdk/x11/Makefile.in	2007-06-16 14:30:18.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/gdk/x11/Makefile.in gtk+2.0-2.11.4/gdk/x11/Makefile.in
+--- gtk+2.0-2.11.4.orig/gdk/x11/Makefile.in	2007-06-19 17:28:58.000000000 +0200
++++ gtk+2.0-2.11.4/gdk/x11/Makefile.in	2007-06-19 21:20:30.000000000 +0200
 @@ -91,6 +91,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8520,9 +8916,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/gdk-pixbuf/Makefile.in gtk+2.0-2.11.3.new/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.11.3.orig/gdk-pixbuf/Makefile.in	2007-06-15 20:26:23.000000000 +0200
-+++ gtk+2.0-2.11.3.new/gdk-pixbuf/Makefile.in	2007-06-16 14:30:17.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/gdk-pixbuf/Makefile.in gtk+2.0-2.11.4/gdk-pixbuf/Makefile.in
+--- gtk+2.0-2.11.4.orig/gdk-pixbuf/Makefile.in	2007-06-19 17:28:57.000000000 +0200
++++ gtk+2.0-2.11.4/gdk-pixbuf/Makefile.in	2007-06-19 21:20:29.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8532,9 +8928,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.11.3.new/gdk-pixbuf/pixops/Makefile.in
---- gtk+2.0-2.11.3.orig/gdk-pixbuf/pixops/Makefile.in	2007-06-15 20:26:23.000000000 +0200
-+++ gtk+2.0-2.11.3.new/gdk-pixbuf/pixops/Makefile.in	2007-06-16 14:30:17.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.11.4/gdk-pixbuf/pixops/Makefile.in
+--- gtk+2.0-2.11.4.orig/gdk-pixbuf/pixops/Makefile.in	2007-06-19 17:28:58.000000000 +0200
++++ gtk+2.0-2.11.4/gdk-pixbuf/pixops/Makefile.in	2007-06-19 21:20:29.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8544,9 +8940,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/gtk/Makefile.in gtk+2.0-2.11.3.new/gtk/Makefile.in
---- gtk+2.0-2.11.3.orig/gtk/Makefile.in	2007-06-15 23:17:49.000000000 +0200
-+++ gtk+2.0-2.11.3.new/gtk/Makefile.in	2007-06-16 14:30:18.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/gtk/Makefile.in gtk+2.0-2.11.4/gtk/Makefile.in
+--- gtk+2.0-2.11.4.orig/gtk/Makefile.in	2007-06-19 17:28:59.000000000 +0200
++++ gtk+2.0-2.11.4/gtk/Makefile.in	2007-06-19 21:20:30.000000000 +0200
 @@ -111,6 +111,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8588,9 +8984,9 @@
  	gtkfilesystemunix.h	\
  	gtkhsv.h		\
  	gtkiconcache.h		\
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/gtk/theme-bits/Makefile.in gtk+2.0-2.11.3.new/gtk/theme-bits/Makefile.in
---- gtk+2.0-2.11.3.orig/gtk/theme-bits/Makefile.in	2007-06-15 20:26:24.000000000 +0200
-+++ gtk+2.0-2.11.3.new/gtk/theme-bits/Makefile.in	2007-06-16 14:30:18.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/gtk/theme-bits/Makefile.in gtk+2.0-2.11.4/gtk/theme-bits/Makefile.in
+--- gtk+2.0-2.11.4.orig/gtk/theme-bits/Makefile.in	2007-06-19 17:28:59.000000000 +0200
++++ gtk+2.0-2.11.4/gtk/theme-bits/Makefile.in	2007-06-19 21:20:31.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8600,9 +8996,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/gtk/xdgmime/Makefile.in gtk+2.0-2.11.3.new/gtk/xdgmime/Makefile.in
---- gtk+2.0-2.11.3.orig/gtk/xdgmime/Makefile.in	2007-06-15 20:26:24.000000000 +0200
-+++ gtk+2.0-2.11.3.new/gtk/xdgmime/Makefile.in	2007-06-16 14:30:18.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/gtk/xdgmime/Makefile.in gtk+2.0-2.11.4/gtk/xdgmime/Makefile.in
+--- gtk+2.0-2.11.4.orig/gtk/xdgmime/Makefile.in	2007-06-19 17:28:59.000000000 +0200
++++ gtk+2.0-2.11.4/gtk/xdgmime/Makefile.in	2007-06-19 21:20:31.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8612,9 +9008,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/ltmain.sh gtk+2.0-2.11.3.new/ltmain.sh
---- gtk+2.0-2.11.3.orig/ltmain.sh	2007-01-14 05:15:09.000000000 +0100
-+++ gtk+2.0-2.11.3.new/ltmain.sh	2006-03-11 19:49:04.000000000 +0100
+diff -urN gtk+2.0-2.11.4.orig/ltmain.sh gtk+2.0-2.11.4/ltmain.sh
+--- gtk+2.0-2.11.4.orig/ltmain.sh	2007-01-14 05:15:09.000000000 +0100
++++ gtk+2.0-2.11.4/ltmain.sh	2006-03-11 19:49:04.000000000 +0100
 @@ -43,7 +43,7 @@
  
  PROGRAM=ltmain.sh
@@ -8648,9 +9044,9 @@
  	  esac
  	  ;;
  	no)
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/m4macros/Makefile.in gtk+2.0-2.11.3.new/m4macros/Makefile.in
---- gtk+2.0-2.11.3.orig/m4macros/Makefile.in	2007-06-15 20:26:24.000000000 +0200
-+++ gtk+2.0-2.11.3.new/m4macros/Makefile.in	2007-06-16 14:30:18.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/m4macros/Makefile.in gtk+2.0-2.11.4/m4macros/Makefile.in
+--- gtk+2.0-2.11.4.orig/m4macros/Makefile.in	2007-06-19 17:28:59.000000000 +0200
++++ gtk+2.0-2.11.4/m4macros/Makefile.in	2007-06-19 21:20:31.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8660,9 +9056,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/modules/Makefile.in gtk+2.0-2.11.3.new/modules/Makefile.in
---- gtk+2.0-2.11.3.orig/modules/Makefile.in	2007-06-15 20:26:24.000000000 +0200
-+++ gtk+2.0-2.11.3.new/modules/Makefile.in	2007-06-16 14:30:18.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/modules/Makefile.in gtk+2.0-2.11.4/modules/Makefile.in
+--- gtk+2.0-2.11.4.orig/modules/Makefile.in	2007-06-19 17:28:59.000000000 +0200
++++ gtk+2.0-2.11.4/modules/Makefile.in	2007-06-19 21:20:31.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8672,9 +9068,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/modules/engines/Makefile.in gtk+2.0-2.11.3.new/modules/engines/Makefile.in
---- gtk+2.0-2.11.3.orig/modules/engines/Makefile.in	2007-06-15 20:26:24.000000000 +0200
-+++ gtk+2.0-2.11.3.new/modules/engines/Makefile.in	2007-06-16 14:30:18.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/modules/engines/Makefile.in gtk+2.0-2.11.4/modules/engines/Makefile.in
+--- gtk+2.0-2.11.4.orig/modules/engines/Makefile.in	2007-06-19 17:28:59.000000000 +0200
++++ gtk+2.0-2.11.4/modules/engines/Makefile.in	2007-06-19 21:20:31.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8684,9 +9080,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/modules/engines/ms-windows/Makefile.in gtk+2.0-2.11.3.new/modules/engines/ms-windows/Makefile.in
---- gtk+2.0-2.11.3.orig/modules/engines/ms-windows/Makefile.in	2007-06-15 20:26:24.000000000 +0200
-+++ gtk+2.0-2.11.3.new/modules/engines/ms-windows/Makefile.in	2007-06-16 14:30:19.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/modules/engines/ms-windows/Makefile.in gtk+2.0-2.11.4/modules/engines/ms-windows/Makefile.in
+--- gtk+2.0-2.11.4.orig/modules/engines/ms-windows/Makefile.in	2007-06-19 17:28:59.000000000 +0200
++++ gtk+2.0-2.11.4/modules/engines/ms-windows/Makefile.in	2007-06-19 21:20:31.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8696,9 +9092,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.11.3.new/modules/engines/ms-windows/Theme/Makefile.in
---- gtk+2.0-2.11.3.orig/modules/engines/ms-windows/Theme/Makefile.in	2007-06-15 20:26:24.000000000 +0200
-+++ gtk+2.0-2.11.3.new/modules/engines/ms-windows/Theme/Makefile.in	2007-06-16 14:30:19.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.11.4/modules/engines/ms-windows/Theme/Makefile.in
+--- gtk+2.0-2.11.4.orig/modules/engines/ms-windows/Theme/Makefile.in	2007-06-19 17:28:59.000000000 +0200
++++ gtk+2.0-2.11.4/modules/engines/ms-windows/Theme/Makefile.in	2007-06-19 21:20:31.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8708,9 +9104,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.11.3.new/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
---- gtk+2.0-2.11.3.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2007-06-15 20:26:25.000000000 +0200
-+++ gtk+2.0-2.11.3.new/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2007-06-16 14:30:19.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.11.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
+--- gtk+2.0-2.11.4.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2007-06-19 17:28:59.000000000 +0200
++++ gtk+2.0-2.11.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2007-06-19 21:20:31.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8720,9 +9116,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/modules/engines/pixbuf/Makefile.in gtk+2.0-2.11.3.new/modules/engines/pixbuf/Makefile.in
---- gtk+2.0-2.11.3.orig/modules/engines/pixbuf/Makefile.in	2007-06-15 20:26:25.000000000 +0200
-+++ gtk+2.0-2.11.3.new/modules/engines/pixbuf/Makefile.in	2007-06-16 14:30:19.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/modules/engines/pixbuf/Makefile.in gtk+2.0-2.11.4/modules/engines/pixbuf/Makefile.in
+--- gtk+2.0-2.11.4.orig/modules/engines/pixbuf/Makefile.in	2007-06-19 17:28:59.000000000 +0200
++++ gtk+2.0-2.11.4/modules/engines/pixbuf/Makefile.in	2007-06-19 21:20:31.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8732,9 +9128,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/modules/input/Makefile.in gtk+2.0-2.11.3.new/modules/input/Makefile.in
---- gtk+2.0-2.11.3.orig/modules/input/Makefile.in	2007-06-15 20:26:25.000000000 +0200
-+++ gtk+2.0-2.11.3.new/modules/input/Makefile.in	2007-06-16 14:30:19.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/modules/input/Makefile.in gtk+2.0-2.11.4/modules/input/Makefile.in
+--- gtk+2.0-2.11.4.orig/modules/input/Makefile.in	2007-06-19 17:28:59.000000000 +0200
++++ gtk+2.0-2.11.4/modules/input/Makefile.in	2007-06-19 21:20:31.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8776,9 +9172,9 @@
  
  @CROSS_COMPILING_FALSE at all-local: gtk.immodules
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/modules/printbackends/Makefile.in gtk+2.0-2.11.3.new/modules/printbackends/Makefile.in
---- gtk+2.0-2.11.3.orig/modules/printbackends/Makefile.in	2007-06-15 20:26:25.000000000 +0200
-+++ gtk+2.0-2.11.3.new/modules/printbackends/Makefile.in	2007-06-16 14:30:19.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/modules/printbackends/Makefile.in gtk+2.0-2.11.4/modules/printbackends/Makefile.in
+--- gtk+2.0-2.11.4.orig/modules/printbackends/Makefile.in	2007-06-19 17:28:59.000000000 +0200
++++ gtk+2.0-2.11.4/modules/printbackends/Makefile.in	2007-06-19 21:20:31.000000000 +0200
 @@ -91,6 +91,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8788,9 +9184,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/modules/printbackends/cups/Makefile.in gtk+2.0-2.11.3.new/modules/printbackends/cups/Makefile.in
---- gtk+2.0-2.11.3.orig/modules/printbackends/cups/Makefile.in	2007-06-15 20:26:25.000000000 +0200
-+++ gtk+2.0-2.11.3.new/modules/printbackends/cups/Makefile.in	2007-06-16 14:30:19.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/modules/printbackends/cups/Makefile.in gtk+2.0-2.11.4/modules/printbackends/cups/Makefile.in
+--- gtk+2.0-2.11.4.orig/modules/printbackends/cups/Makefile.in	2007-06-19 17:29:00.000000000 +0200
++++ gtk+2.0-2.11.4/modules/printbackends/cups/Makefile.in	2007-06-19 21:20:32.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8800,9 +9196,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/modules/printbackends/file/Makefile.in gtk+2.0-2.11.3.new/modules/printbackends/file/Makefile.in
---- gtk+2.0-2.11.3.orig/modules/printbackends/file/Makefile.in	2007-06-15 20:26:25.000000000 +0200
-+++ gtk+2.0-2.11.3.new/modules/printbackends/file/Makefile.in	2007-06-16 14:30:19.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/modules/printbackends/file/Makefile.in gtk+2.0-2.11.4/modules/printbackends/file/Makefile.in
+--- gtk+2.0-2.11.4.orig/modules/printbackends/file/Makefile.in	2007-06-19 17:29:00.000000000 +0200
++++ gtk+2.0-2.11.4/modules/printbackends/file/Makefile.in	2007-06-19 21:20:32.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8812,9 +9208,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/modules/printbackends/lpr/Makefile.in gtk+2.0-2.11.3.new/modules/printbackends/lpr/Makefile.in
---- gtk+2.0-2.11.3.orig/modules/printbackends/lpr/Makefile.in	2007-06-15 20:26:25.000000000 +0200
-+++ gtk+2.0-2.11.3.new/modules/printbackends/lpr/Makefile.in	2007-06-16 14:30:19.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/modules/printbackends/lpr/Makefile.in gtk+2.0-2.11.4/modules/printbackends/lpr/Makefile.in
+--- gtk+2.0-2.11.4.orig/modules/printbackends/lpr/Makefile.in	2007-06-19 17:29:00.000000000 +0200
++++ gtk+2.0-2.11.4/modules/printbackends/lpr/Makefile.in	2007-06-19 21:20:32.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8824,9 +9220,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/modules/printbackends/test/Makefile.in gtk+2.0-2.11.3.new/modules/printbackends/test/Makefile.in
---- gtk+2.0-2.11.3.orig/modules/printbackends/test/Makefile.in	2007-06-15 20:26:25.000000000 +0200
-+++ gtk+2.0-2.11.3.new/modules/printbackends/test/Makefile.in	2007-06-16 14:30:19.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/modules/printbackends/test/Makefile.in gtk+2.0-2.11.4/modules/printbackends/test/Makefile.in
+--- gtk+2.0-2.11.4.orig/modules/printbackends/test/Makefile.in	2007-06-19 17:29:00.000000000 +0200
++++ gtk+2.0-2.11.4/modules/printbackends/test/Makefile.in	2007-06-19 21:20:32.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8836,9 +9232,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/perf/Makefile.in gtk+2.0-2.11.3.new/perf/Makefile.in
---- gtk+2.0-2.11.3.orig/perf/Makefile.in	2007-06-15 20:26:25.000000000 +0200
-+++ gtk+2.0-2.11.3.new/perf/Makefile.in	2007-06-16 14:30:20.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/perf/Makefile.in gtk+2.0-2.11.4/perf/Makefile.in
+--- gtk+2.0-2.11.4.orig/perf/Makefile.in	2007-06-19 17:29:00.000000000 +0200
++++ gtk+2.0-2.11.4/perf/Makefile.in	2007-06-19 21:20:32.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8848,9 +9244,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/tests/Makefile.in gtk+2.0-2.11.3.new/tests/Makefile.in
---- gtk+2.0-2.11.3.orig/tests/Makefile.in	2007-06-15 20:26:26.000000000 +0200
-+++ gtk+2.0-2.11.3.new/tests/Makefile.in	2007-06-16 14:30:20.000000000 +0200
+diff -urN gtk+2.0-2.11.4.orig/tests/Makefile.in gtk+2.0-2.11.4/tests/Makefile.in
+--- gtk+2.0-2.11.4.orig/tests/Makefile.in	2007-06-19 17:29:00.000000000 +0200
++++ gtk+2.0-2.11.4/tests/Makefile.in	2007-06-19 21:20:32.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@

Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=11636&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules (original)
+++ desktop/experimental/gtk+2.0/debian/rules Tue Jun 19 19:28:49 2007
@@ -48,7 +48,7 @@
 VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//')
 APIVER := 2.0
 SONAME := 0
-SHVER := 2.11.3
+SHVER := 2.11.4
 
 # earliest version that this release has backwards binary compatibility for
 GTK_BINARY_VERSION := 2.10.0




More information about the pkg-gnome-commits mailing list