r11497 - in /desktop/unstable/gtk+2.0/debian: ./ patches/

lool at users.alioth.debian.org lool at users.alioth.debian.org
Wed Jun 13 09:02:58 UTC 2007


Author: lool
Date: Wed Jun 13 09:02:58 2007
New Revision: 11497

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11497
Log:
* Upload to unstable; drop check-dist include.
* New upstream release; no API change.
  - Drop patches 011_directfb-build-fixes-from-head,
    013_gdkproperty-directfb-strdup, 032_filechooser-sizing,
    090_capslock-numlock-im-thai merged upstream.
  - Update relibtoolizing patch, 070_mandatory-relibtoolize.

Removed:
    desktop/unstable/gtk+2.0/debian/patches/011_directfb-build-fixes-from-head.patch
    desktop/unstable/gtk+2.0/debian/patches/013_gdkproperty-directfb-strdup.patch
    desktop/unstable/gtk+2.0/debian/patches/032_filechooser-sizing.patch
    desktop/unstable/gtk+2.0/debian/patches/090_capslock-numlock-im-thai.patch
Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
    desktop/unstable/gtk+2.0/debian/patches/series
    desktop/unstable/gtk+2.0/debian/rules

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=11497&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Wed Jun 13 09:02:58 2007
@@ -1,8 +1,14 @@
-gtk+2.0 (2.10.12-4) UNRELEASED; urgency=low
+gtk+2.0 (2.10.13-1) unstable; urgency=low
 
   * Bump Conflicts to iiimf-client-gtk << 12.3.91-4.
-
- -- Loic Minier <lool at dooz.org>  Sat, 09 Jun 2007 15:14:39 +0200
+  * Upload to unstable; drop check-dist include.
+  * New upstream release; no API change.
+    - Drop patches 011_directfb-build-fixes-from-head,
+      013_gdkproperty-directfb-strdup, 032_filechooser-sizing,
+      090_capslock-numlock-im-thai merged upstream.
+    - Update relibtoolizing patch, 070_mandatory-relibtoolize.
+
+ -- Loic Minier <lool at dooz.org>  Wed, 13 Jun 2007 10:06:49 +0200
 
 gtk+2.0 (2.10.12-3) experimental; urgency=low
 

Modified: desktop/unstable/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/070_mandatory-relibtoolize.patch?rev=11497&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch (original)
+++ desktop/unstable/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch Wed Jun 13 09:02:58 2007
@@ -6,10 +6,9 @@
 rm -rf autom4te.cache
 exclude config.guess and sub with diff -urN -x config.guess -x config.sub
 
-Index: gtk+2.0-2.10.12/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/Makefile.in	2007-05-02 18:41:49.000000000 +0200
-+++ gtk+2.0-2.10.12/Makefile.in	2007-06-07 00:12:32.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/Makefile.in gtk+2.0-2.10.13/Makefile.in
+--- gtk+2.0-2.10.13.orig/Makefile.in	2007-06-13 05:12:22.000000000 +0200
++++ gtk+2.0-2.10.13/Makefile.in	2007-06-13 10:00:13.000000000 +0200
 @@ -90,6 +90,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -31,7 +30,14 @@
  SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
  
  # require automake 1.4
-@@ -453,7 +458,8 @@
+@@ -447,13 +452,14 @@
+ DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
+ 	COPYING ChangeLog INSTALL Makefile.am NEWS acconfig.h \
+ 	acinclude.m4 aclocal.m4 compile config.guess config.h.in \
+-	config.h.win32.in config.sub configure.in depcomp \
++	config.h.win32.in config.sub configure configure.in depcomp \
+ 	gdk-2.0-uninstalled.pc.in gdk-2.0.pc.in \
+ 	gdk-pixbuf-2.0-uninstalled.pc.in gdk-pixbuf-2.0.pc.in \
  	gtk+-2.0-uninstalled.pc.in gtk+-2.0.pc.in \
  	gtk+-unix-print-2.0.pc.in gtk-zip.sh.in install-sh ltmain.sh \
  	missing mkinstalldirs
@@ -50,10 +56,9 @@
  	  if test "$$subdir" = .; then :; else \
  	    test -d $(distdir)/$$subdir \
  	    || mkdir $(distdir)/$$subdir \
-Index: gtk+2.0-2.10.12/aclocal.m4
-===================================================================
---- gtk+2.0-2.10.12.orig/aclocal.m4	2007-05-02 18:28:34.000000000 +0200
-+++ gtk+2.0-2.10.12/aclocal.m4	2007-06-07 00:12:18.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/aclocal.m4 gtk+2.0-2.10.13/aclocal.m4
+--- gtk+2.0-2.10.13.orig/aclocal.m4	2007-06-13 05:12:12.000000000 +0200
++++ gtk+2.0-2.10.13/aclocal.m4	2007-06-13 10:00:08.000000000 +0200
 @@ -941,7 +941,7 @@
  
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -348,15 +353,14 @@
 +  AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
  ])
  
-Index: gtk+2.0-2.10.12/configure
-===================================================================
---- gtk+2.0-2.10.12.orig/configure	2007-05-02 18:28:50.000000000 +0200
-+++ gtk+2.0-2.10.12/configure	2007-06-07 00:12:18.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/configure gtk+2.0-2.10.13/configure
+--- gtk+2.0-2.10.13.orig/configure	2007-06-13 05:12:27.000000000 +0200
++++ gtk+2.0-2.10.13/configure	2007-06-13 10:00:12.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.10.12.
-+# Generated by GNU Autoconf 2.61 for gtk+ 2.10.12.
+-# Generated by GNU Autoconf 2.60 for gtk+ 2.10.13.
++# Generated by GNU Autoconf 2.61 for gtk+ 2.10.13.
  #
  # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>.
  #
@@ -618,7 +622,7 @@
 @@ -1748,7 +1767,7 @@
  if $ac_init_version; then
    cat <<\_ACEOF
- gtk+ configure 2.10.12
+ gtk+ configure 2.10.13
 -generated by GNU Autoconf 2.60
 +generated by GNU Autoconf 2.61
  
@@ -627,7 +631,7 @@
 @@ -1762,7 +1781,7 @@
  running configure, to aid debugging if configure makes a mistake.
  
- It was created by gtk+ $as_me 2.10.12, which was
+ It was created by gtk+ $as_me 2.10.13, which was
 -generated by GNU Autoconf 2.60.  Invocation command line was
 +generated by GNU Autoconf 2.61.  Invocation command line was
  
@@ -7991,7 +7995,7 @@
 @@ -35606,7 +33094,7 @@
  # values after options handling.
  ac_log="
- This file was extended by gtk+ $as_me 2.10.12, which was
+ This file was extended by gtk+ $as_me 2.10.13, which was
 -generated by GNU Autoconf 2.60.  Invocation command line was
 +generated by GNU Autoconf 2.61.  Invocation command line was
  
@@ -8009,7 +8013,7 @@
 @@ -35659,7 +33147,7 @@
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
- gtk+ config.status 2.10.12
+ gtk+ config.status 2.10.13
 -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'`\\"
@@ -8063,10 +8067,9 @@
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-Index: gtk+2.0-2.10.12/contrib/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/contrib/Makefile.in	2007-05-02 18:41:49.000000000 +0200
-+++ gtk+2.0-2.10.12/contrib/Makefile.in	2007-06-07 00:12:32.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/contrib/Makefile.in gtk+2.0-2.10.13/contrib/Makefile.in
+--- gtk+2.0-2.10.13.orig/contrib/Makefile.in	2007-06-13 05:12:22.000000000 +0200
++++ gtk+2.0-2.10.13/contrib/Makefile.in	2007-06-13 10:00:13.000000000 +0200
 @@ -90,6 +90,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8076,10 +8079,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/contrib/gdk-pixbuf-xlib/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/contrib/gdk-pixbuf-xlib/Makefile.in	2007-05-02 18:41:49.000000000 +0200
-+++ gtk+2.0-2.10.12/contrib/gdk-pixbuf-xlib/Makefile.in	2007-06-07 00:12:32.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.10.13/contrib/gdk-pixbuf-xlib/Makefile.in
+--- gtk+2.0-2.10.13.orig/contrib/gdk-pixbuf-xlib/Makefile.in	2007-06-13 05:12:22.000000000 +0200
++++ gtk+2.0-2.10.13/contrib/gdk-pixbuf-xlib/Makefile.in	2007-06-13 10:00:13.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8089,10 +8091,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/demos/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/demos/Makefile.in	2007-05-02 18:41:49.000000000 +0200
-+++ gtk+2.0-2.10.12/demos/Makefile.in	2007-06-07 00:12:32.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/demos/Makefile.in gtk+2.0-2.10.13/demos/Makefile.in
+--- gtk+2.0-2.10.13.orig/demos/Makefile.in	2007-06-13 05:12:22.000000000 +0200
++++ gtk+2.0-2.10.13/demos/Makefile.in	2007-06-13 10:00:13.000000000 +0200
 @@ -90,6 +90,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8102,10 +8103,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/demos/gtk-demo/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/demos/gtk-demo/Makefile.in	2007-05-02 18:41:49.000000000 +0200
-+++ gtk+2.0-2.10.12/demos/gtk-demo/Makefile.in	2007-06-07 00:12:32.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/demos/gtk-demo/Makefile.in gtk+2.0-2.10.13/demos/gtk-demo/Makefile.in
+--- gtk+2.0-2.10.13.orig/demos/gtk-demo/Makefile.in	2007-06-13 05:12:22.000000000 +0200
++++ gtk+2.0-2.10.13/demos/gtk-demo/Makefile.in	2007-06-13 10:00:14.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8115,10 +8115,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/docs/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/docs/Makefile.in	2007-05-02 18:41:50.000000000 +0200
-+++ gtk+2.0-2.10.12/docs/Makefile.in	2007-06-07 00:12:32.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/docs/Makefile.in gtk+2.0-2.10.13/docs/Makefile.in
+--- gtk+2.0-2.10.13.orig/docs/Makefile.in	2007-06-13 05:12:22.000000000 +0200
++++ gtk+2.0-2.10.13/docs/Makefile.in	2007-06-13 10:00:14.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8128,10 +8127,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/docs/faq/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/docs/faq/Makefile.in	2007-05-02 18:41:50.000000000 +0200
-+++ gtk+2.0-2.10.12/docs/faq/Makefile.in	2007-06-07 00:12:32.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/docs/faq/Makefile.in gtk+2.0-2.10.13/docs/faq/Makefile.in
+--- gtk+2.0-2.10.13.orig/docs/faq/Makefile.in	2007-06-13 05:12:22.000000000 +0200
++++ gtk+2.0-2.10.13/docs/faq/Makefile.in	2007-06-13 10:00:14.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8141,10 +8139,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/docs/reference/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/docs/reference/Makefile.in	2007-05-02 18:41:50.000000000 +0200
-+++ gtk+2.0-2.10.12/docs/reference/Makefile.in	2007-06-07 00:12:32.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/docs/reference/Makefile.in gtk+2.0-2.10.13/docs/reference/Makefile.in
+--- gtk+2.0-2.10.13.orig/docs/reference/Makefile.in	2007-06-13 05:12:22.000000000 +0200
++++ gtk+2.0-2.10.13/docs/reference/Makefile.in	2007-06-13 10:00:14.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8154,10 +8151,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/docs/reference/gdk/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/docs/reference/gdk/Makefile.in	2007-05-02 18:41:50.000000000 +0200
-+++ gtk+2.0-2.10.12/docs/reference/gdk/Makefile.in	2007-06-07 00:12:33.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/docs/reference/gdk/Makefile.in gtk+2.0-2.10.13/docs/reference/gdk/Makefile.in
+--- gtk+2.0-2.10.13.orig/docs/reference/gdk/Makefile.in	2007-06-13 05:12:22.000000000 +0200
++++ gtk+2.0-2.10.13/docs/reference/gdk/Makefile.in	2007-06-13 10:00:14.000000000 +0200
 @@ -95,6 +95,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8167,10 +8163,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/docs/reference/gdk-pixbuf/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/docs/reference/gdk-pixbuf/Makefile.in	2007-05-02 18:41:50.000000000 +0200
-+++ gtk+2.0-2.10.12/docs/reference/gdk-pixbuf/Makefile.in	2007-06-07 00:12:33.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.10.13/docs/reference/gdk-pixbuf/Makefile.in
+--- gtk+2.0-2.10.13.orig/docs/reference/gdk-pixbuf/Makefile.in	2007-06-13 05:12:22.000000000 +0200
++++ gtk+2.0-2.10.13/docs/reference/gdk-pixbuf/Makefile.in	2007-06-13 10:00:14.000000000 +0200
 @@ -95,6 +95,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8180,10 +8175,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/docs/reference/gtk/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/docs/reference/gtk/Makefile.in	2007-05-02 18:41:50.000000000 +0200
-+++ gtk+2.0-2.10.12/docs/reference/gtk/Makefile.in	2007-06-07 00:12:33.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/docs/reference/gtk/Makefile.in gtk+2.0-2.10.13/docs/reference/gtk/Makefile.in
+--- gtk+2.0-2.10.13.orig/docs/reference/gtk/Makefile.in	2007-06-13 05:12:22.000000000 +0200
++++ gtk+2.0-2.10.13/docs/reference/gtk/Makefile.in	2007-06-13 10:00:14.000000000 +0200
 @@ -95,6 +95,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8193,10 +8187,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/docs/tools/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/docs/tools/Makefile.in	2007-05-02 18:41:50.000000000 +0200
-+++ gtk+2.0-2.10.12/docs/tools/Makefile.in	2007-06-07 00:12:33.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/docs/tools/Makefile.in gtk+2.0-2.10.13/docs/tools/Makefile.in
+--- gtk+2.0-2.10.13.orig/docs/tools/Makefile.in	2007-06-13 05:12:22.000000000 +0200
++++ gtk+2.0-2.10.13/docs/tools/Makefile.in	2007-06-13 10:00:14.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8206,10 +8199,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/docs/tutorial/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/docs/tutorial/Makefile.in	2007-05-02 18:41:50.000000000 +0200
-+++ gtk+2.0-2.10.12/docs/tutorial/Makefile.in	2007-06-07 00:12:33.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/docs/tutorial/Makefile.in gtk+2.0-2.10.13/docs/tutorial/Makefile.in
+--- gtk+2.0-2.10.13.orig/docs/tutorial/Makefile.in	2007-06-13 05:12:23.000000000 +0200
++++ gtk+2.0-2.10.13/docs/tutorial/Makefile.in	2007-06-13 10:00:14.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8219,10 +8211,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/gdk/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/gdk/Makefile.in	2007-05-02 18:41:51.000000000 +0200
-+++ gtk+2.0-2.10.12/gdk/Makefile.in	2007-06-07 00:12:34.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/gdk/Makefile.in gtk+2.0-2.10.13/gdk/Makefile.in
+--- gtk+2.0-2.10.13.orig/gdk/Makefile.in	2007-06-13 05:12:23.000000000 +0200
++++ gtk+2.0-2.10.13/gdk/Makefile.in	2007-06-13 10:00:15.000000000 +0200
 @@ -91,6 +91,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8232,10 +8223,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/gdk/directfb/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/gdk/directfb/Makefile.in	2007-05-02 18:41:51.000000000 +0200
-+++ gtk+2.0-2.10.12/gdk/directfb/Makefile.in	2007-06-07 00:12:34.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/gdk/directfb/Makefile.in gtk+2.0-2.10.13/gdk/directfb/Makefile.in
+--- gtk+2.0-2.10.13.orig/gdk/directfb/Makefile.in	2007-06-13 05:12:23.000000000 +0200
++++ gtk+2.0-2.10.13/gdk/directfb/Makefile.in	2007-06-13 10:00:15.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8245,24 +8235,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-@@ -299,12 +301,11 @@
- 
- INCLUDES = \
- 	-DG_LOG_DOMAIN=\"Gdk-DirectFB\"	\
-+	-DGDK_COMPILATION \
- 	-I$(top_srcdir)			\
- 	-I$(top_srcdir)/gdk		\
- 	-I$(top_builddir)/gdk		\
- 	-DG_DISABLE_DEPRECATED		\
--	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
--	-DGDK_DISABLE_DEPRECATED	\
- 	@GTK_DEBUG_FLAGS@		\
- 	@GDK_DEP_CFLAGS@		
- 
-Index: gtk+2.0-2.10.12/gdk/linux-fb/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/gdk/linux-fb/Makefile.in	2007-05-02 18:41:51.000000000 +0200
-+++ gtk+2.0-2.10.12/gdk/linux-fb/Makefile.in	2007-06-07 00:12:34.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/gdk/linux-fb/Makefile.in gtk+2.0-2.10.13/gdk/linux-fb/Makefile.in
+--- gtk+2.0-2.10.13.orig/gdk/linux-fb/Makefile.in	2007-06-13 05:12:23.000000000 +0200
++++ gtk+2.0-2.10.13/gdk/linux-fb/Makefile.in	2007-06-13 10:00:15.000000000 +0200
 @@ -90,6 +90,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8272,10 +8247,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/gdk/quartz/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/gdk/quartz/Makefile.in	2007-05-02 18:41:51.000000000 +0200
-+++ gtk+2.0-2.10.12/gdk/quartz/Makefile.in	2007-06-07 00:12:34.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/gdk/quartz/Makefile.in gtk+2.0-2.10.13/gdk/quartz/Makefile.in
+--- gtk+2.0-2.10.13.orig/gdk/quartz/Makefile.in	2007-06-13 05:12:23.000000000 +0200
++++ gtk+2.0-2.10.13/gdk/quartz/Makefile.in	2007-06-13 10:00:15.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8285,10 +8259,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/gdk/win32/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/gdk/win32/Makefile.in	2007-05-02 18:41:51.000000000 +0200
-+++ gtk+2.0-2.10.12/gdk/win32/Makefile.in	2007-06-07 00:12:34.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/gdk/win32/Makefile.in gtk+2.0-2.10.13/gdk/win32/Makefile.in
+--- gtk+2.0-2.10.13.orig/gdk/win32/Makefile.in	2007-06-13 05:12:23.000000000 +0200
++++ gtk+2.0-2.10.13/gdk/win32/Makefile.in	2007-06-13 10:00:15.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8298,10 +8271,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/gdk/win32/rc/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/gdk/win32/rc/Makefile.in	2007-05-02 18:41:51.000000000 +0200
-+++ gtk+2.0-2.10.12/gdk/win32/rc/Makefile.in	2007-06-07 00:12:34.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/gdk/win32/rc/Makefile.in gtk+2.0-2.10.13/gdk/win32/rc/Makefile.in
+--- gtk+2.0-2.10.13.orig/gdk/win32/rc/Makefile.in	2007-06-13 05:12:23.000000000 +0200
++++ gtk+2.0-2.10.13/gdk/win32/rc/Makefile.in	2007-06-13 10:00:15.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8311,10 +8283,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/gdk/x11/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/gdk/x11/Makefile.in	2007-05-02 18:41:51.000000000 +0200
-+++ gtk+2.0-2.10.12/gdk/x11/Makefile.in	2007-06-07 00:12:34.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/gdk/x11/Makefile.in gtk+2.0-2.10.13/gdk/x11/Makefile.in
+--- gtk+2.0-2.10.13.orig/gdk/x11/Makefile.in	2007-06-13 05:12:24.000000000 +0200
++++ gtk+2.0-2.10.13/gdk/x11/Makefile.in	2007-06-13 10:00:15.000000000 +0200
 @@ -91,6 +91,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8324,10 +8295,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/gdk-pixbuf/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/gdk-pixbuf/Makefile.in	2007-05-02 18:41:50.000000000 +0200
-+++ gtk+2.0-2.10.12/gdk-pixbuf/Makefile.in	2007-06-07 00:12:33.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/gdk-pixbuf/Makefile.in gtk+2.0-2.10.13/gdk-pixbuf/Makefile.in
+--- gtk+2.0-2.10.13.orig/gdk-pixbuf/Makefile.in	2007-06-13 05:12:23.000000000 +0200
++++ gtk+2.0-2.10.13/gdk-pixbuf/Makefile.in	2007-06-13 10:00:14.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8337,10 +8307,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/gdk-pixbuf/pixops/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/gdk-pixbuf/pixops/Makefile.in	2007-05-02 18:41:50.000000000 +0200
-+++ gtk+2.0-2.10.12/gdk-pixbuf/pixops/Makefile.in	2007-06-07 00:12:33.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.10.13/gdk-pixbuf/pixops/Makefile.in
+--- gtk+2.0-2.10.13.orig/gdk-pixbuf/pixops/Makefile.in	2007-06-13 05:12:23.000000000 +0200
++++ gtk+2.0-2.10.13/gdk-pixbuf/pixops/Makefile.in	2007-06-13 10:00:15.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8350,10 +8319,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/gtk/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/gtk/Makefile.in	2007-05-02 18:41:52.000000000 +0200
-+++ gtk+2.0-2.10.12/gtk/Makefile.in	2007-06-07 00:12:35.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/gtk/Makefile.in gtk+2.0-2.10.13/gtk/Makefile.in
+--- gtk+2.0-2.10.13.orig/gtk/Makefile.in	2007-06-13 05:12:24.000000000 +0200
++++ gtk+2.0-2.10.13/gtk/Makefile.in	2007-06-13 10:00:16.000000000 +0200
 @@ -110,6 +110,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8395,10 +8363,9 @@
  	gtkfilesystemunix.h	\
  	gtkhsv.h		\
  	gtkiconcache.h		\
-Index: gtk+2.0-2.10.12/gtk/theme-bits/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/gtk/theme-bits/Makefile.in	2007-05-02 18:41:52.000000000 +0200
-+++ gtk+2.0-2.10.12/gtk/theme-bits/Makefile.in	2007-06-07 00:12:35.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/gtk/theme-bits/Makefile.in gtk+2.0-2.10.13/gtk/theme-bits/Makefile.in
+--- gtk+2.0-2.10.13.orig/gtk/theme-bits/Makefile.in	2007-06-13 05:12:24.000000000 +0200
++++ gtk+2.0-2.10.13/gtk/theme-bits/Makefile.in	2007-06-13 10:00:16.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8408,10 +8375,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/gtk/xdgmime/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/gtk/xdgmime/Makefile.in	2007-05-02 18:41:52.000000000 +0200
-+++ gtk+2.0-2.10.12/gtk/xdgmime/Makefile.in	2007-06-07 00:12:35.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/gtk/xdgmime/Makefile.in gtk+2.0-2.10.13/gtk/xdgmime/Makefile.in
+--- gtk+2.0-2.10.13.orig/gtk/xdgmime/Makefile.in	2007-06-13 05:12:24.000000000 +0200
++++ gtk+2.0-2.10.13/gtk/xdgmime/Makefile.in	2007-06-13 10:00:16.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8421,10 +8387,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/ltmain.sh
-===================================================================
---- gtk+2.0-2.10.12.orig/ltmain.sh	2007-01-14 05:15:09.000000000 +0100
-+++ gtk+2.0-2.10.12/ltmain.sh	2007-06-07 00:12:18.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/ltmain.sh gtk+2.0-2.10.13/ltmain.sh
+--- gtk+2.0-2.10.13.orig/ltmain.sh	2007-01-14 05:15:09.000000000 +0100
++++ gtk+2.0-2.10.13/ltmain.sh	2006-03-11 19:49:04.000000000 +0100
 @@ -43,7 +43,7 @@
  
  PROGRAM=ltmain.sh
@@ -8458,10 +8423,9 @@
  	  esac
  	  ;;
  	no)
-Index: gtk+2.0-2.10.12/m4macros/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/m4macros/Makefile.in	2007-05-02 18:41:52.000000000 +0200
-+++ gtk+2.0-2.10.12/m4macros/Makefile.in	2007-06-07 00:12:35.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/m4macros/Makefile.in gtk+2.0-2.10.13/m4macros/Makefile.in
+--- gtk+2.0-2.10.13.orig/m4macros/Makefile.in	2007-06-13 05:12:24.000000000 +0200
++++ gtk+2.0-2.10.13/m4macros/Makefile.in	2007-06-13 10:00:16.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8471,10 +8435,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/modules/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/modules/Makefile.in	2007-05-02 18:41:52.000000000 +0200
-+++ gtk+2.0-2.10.12/modules/Makefile.in	2007-06-07 00:12:35.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/modules/Makefile.in gtk+2.0-2.10.13/modules/Makefile.in
+--- gtk+2.0-2.10.13.orig/modules/Makefile.in	2007-06-13 05:12:24.000000000 +0200
++++ gtk+2.0-2.10.13/modules/Makefile.in	2007-06-13 10:00:16.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8484,10 +8447,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/modules/engines/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/modules/engines/Makefile.in	2007-05-02 18:41:52.000000000 +0200
-+++ gtk+2.0-2.10.12/modules/engines/Makefile.in	2007-06-07 00:12:35.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/modules/engines/Makefile.in gtk+2.0-2.10.13/modules/engines/Makefile.in
+--- gtk+2.0-2.10.13.orig/modules/engines/Makefile.in	2007-06-13 05:12:24.000000000 +0200
++++ gtk+2.0-2.10.13/modules/engines/Makefile.in	2007-06-13 10:00:16.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8497,10 +8459,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/modules/engines/ms-windows/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/modules/engines/ms-windows/Makefile.in	2007-05-02 18:41:52.000000000 +0200
-+++ gtk+2.0-2.10.12/modules/engines/ms-windows/Makefile.in	2007-06-07 00:12:35.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/modules/engines/ms-windows/Makefile.in gtk+2.0-2.10.13/modules/engines/ms-windows/Makefile.in
+--- gtk+2.0-2.10.13.orig/modules/engines/ms-windows/Makefile.in	2007-06-13 05:12:24.000000000 +0200
++++ gtk+2.0-2.10.13/modules/engines/ms-windows/Makefile.in	2007-06-13 10:00:16.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8510,10 +8471,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/modules/engines/ms-windows/Theme/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/modules/engines/ms-windows/Theme/Makefile.in	2007-05-02 18:41:52.000000000 +0200
-+++ gtk+2.0-2.10.12/modules/engines/ms-windows/Theme/Makefile.in	2007-06-07 00:12:35.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.10.13/modules/engines/ms-windows/Theme/Makefile.in
+--- gtk+2.0-2.10.13.orig/modules/engines/ms-windows/Theme/Makefile.in	2007-06-13 05:12:24.000000000 +0200
++++ gtk+2.0-2.10.13/modules/engines/ms-windows/Theme/Makefile.in	2007-06-13 10:00:16.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8523,10 +8483,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2007-05-02 18:41:52.000000000 +0200
-+++ gtk+2.0-2.10.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2007-06-07 00:12:35.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.10.13/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
+--- gtk+2.0-2.10.13.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2007-06-13 05:12:25.000000000 +0200
++++ gtk+2.0-2.10.13/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2007-06-13 10:00:16.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8536,10 +8495,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/modules/engines/pixbuf/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/modules/engines/pixbuf/Makefile.in	2007-05-02 18:41:52.000000000 +0200
-+++ gtk+2.0-2.10.12/modules/engines/pixbuf/Makefile.in	2007-06-07 00:12:36.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/modules/engines/pixbuf/Makefile.in gtk+2.0-2.10.13/modules/engines/pixbuf/Makefile.in
+--- gtk+2.0-2.10.13.orig/modules/engines/pixbuf/Makefile.in	2007-06-13 05:12:25.000000000 +0200
++++ gtk+2.0-2.10.13/modules/engines/pixbuf/Makefile.in	2007-06-13 10:00:17.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8549,10 +8507,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/modules/input/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/modules/input/Makefile.in	2007-05-02 18:41:52.000000000 +0200
-+++ gtk+2.0-2.10.12/modules/input/Makefile.in	2007-06-07 00:12:36.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/modules/input/Makefile.in gtk+2.0-2.10.13/modules/input/Makefile.in
+--- gtk+2.0-2.10.13.orig/modules/input/Makefile.in	2007-06-13 05:12:25.000000000 +0200
++++ gtk+2.0-2.10.13/modules/input/Makefile.in	2007-06-13 10:00:17.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8594,10 +8551,9 @@
  
  @CROSS_COMPILING_FALSE at all-local: gtk.immodules
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
-Index: gtk+2.0-2.10.12/modules/printbackends/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/modules/printbackends/Makefile.in	2007-05-02 18:41:52.000000000 +0200
-+++ gtk+2.0-2.10.12/modules/printbackends/Makefile.in	2007-06-07 00:12:36.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/modules/printbackends/Makefile.in gtk+2.0-2.10.13/modules/printbackends/Makefile.in
+--- gtk+2.0-2.10.13.orig/modules/printbackends/Makefile.in	2007-06-13 05:12:25.000000000 +0200
++++ gtk+2.0-2.10.13/modules/printbackends/Makefile.in	2007-06-13 10:00:17.000000000 +0200
 @@ -90,6 +90,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8607,10 +8563,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/modules/printbackends/cups/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/modules/printbackends/cups/Makefile.in	2007-05-02 18:41:52.000000000 +0200
-+++ gtk+2.0-2.10.12/modules/printbackends/cups/Makefile.in	2007-06-07 00:12:36.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/modules/printbackends/cups/Makefile.in gtk+2.0-2.10.13/modules/printbackends/cups/Makefile.in
+--- gtk+2.0-2.10.13.orig/modules/printbackends/cups/Makefile.in	2007-06-13 05:12:25.000000000 +0200
++++ gtk+2.0-2.10.13/modules/printbackends/cups/Makefile.in	2007-06-13 10:00:17.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8620,10 +8575,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/modules/printbackends/file/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/modules/printbackends/file/Makefile.in	2007-05-02 18:41:53.000000000 +0200
-+++ gtk+2.0-2.10.12/modules/printbackends/file/Makefile.in	2007-06-07 00:12:36.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/modules/printbackends/file/Makefile.in gtk+2.0-2.10.13/modules/printbackends/file/Makefile.in
+--- gtk+2.0-2.10.13.orig/modules/printbackends/file/Makefile.in	2007-06-13 05:12:25.000000000 +0200
++++ gtk+2.0-2.10.13/modules/printbackends/file/Makefile.in	2007-06-13 10:00:17.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8633,10 +8587,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/modules/printbackends/lpr/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/modules/printbackends/lpr/Makefile.in	2007-05-02 18:41:53.000000000 +0200
-+++ gtk+2.0-2.10.12/modules/printbackends/lpr/Makefile.in	2007-06-07 00:12:36.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/modules/printbackends/lpr/Makefile.in gtk+2.0-2.10.13/modules/printbackends/lpr/Makefile.in
+--- gtk+2.0-2.10.13.orig/modules/printbackends/lpr/Makefile.in	2007-06-13 05:12:25.000000000 +0200
++++ gtk+2.0-2.10.13/modules/printbackends/lpr/Makefile.in	2007-06-13 10:00:17.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8646,10 +8599,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/perf/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/perf/Makefile.in	2007-05-02 18:41:53.000000000 +0200
-+++ gtk+2.0-2.10.12/perf/Makefile.in	2007-06-07 00:12:36.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/perf/Makefile.in gtk+2.0-2.10.13/perf/Makefile.in
+--- gtk+2.0-2.10.13.orig/perf/Makefile.in	2007-06-13 05:12:25.000000000 +0200
++++ gtk+2.0-2.10.13/perf/Makefile.in	2007-06-13 10:00:17.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8659,10 +8611,9 @@
  EXEEXT = @EXEEXT@
  F77 = @F77@
  FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.10.12/tests/Makefile.in
-===================================================================
---- gtk+2.0-2.10.12.orig/tests/Makefile.in	2007-05-02 18:41:53.000000000 +0200
-+++ gtk+2.0-2.10.12/tests/Makefile.in	2007-06-07 00:12:37.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/tests/Makefile.in gtk+2.0-2.10.13/tests/Makefile.in
+--- gtk+2.0-2.10.13.orig/tests/Makefile.in	2007-06-13 05:12:26.000000000 +0200
++++ gtk+2.0-2.10.13/tests/Makefile.in	2007-06-13 10:00:18.000000000 +0200
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@

Modified: desktop/unstable/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/series?rev=11497&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/series (original)
+++ desktop/unstable/gtk+2.0/debian/patches/series Wed Jun 13 09:02:58 2007
@@ -5,16 +5,12 @@
 007_implicit_pointer_conversion_gdkdrawable_directfb.patch
 008_implicit_pointer_conversion_gdkgc_directfb.patch
 009_gtk-export-filechooser.patch
-011_directfb-build-fixes-from-head.patch
-013_gdkproperty-directfb-strdup.patch
 015_default-fallback-icon-theme.patch
 020_immodules-files-d.patch
 021_loader-files-d.patch
 030_gtkentry_password-char-circle.patch
 031_cursor-blinking-timeout.patch
-032_filechooser-sizing.patch
 033_treeview_resizing.patch
 040_filechooser_single-click.patch
 041_ia32-libs.patch
 070_mandatory-relibtoolize.patch
-090_capslock-numlock-im-thai.patch -p0

Modified: desktop/unstable/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/rules?rev=11497&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/rules (original)
+++ desktop/unstable/gtk+2.0/debian/rules Wed Jun 13 09:02:58 2007
@@ -3,8 +3,6 @@
 # Debian GNOME Maintainers
 DISABLE_UPDATE_UPLOADERS := 1
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-# prevent accidental uploads to unstable
-include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
 # get-orig-source target
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 




More information about the pkg-gnome-commits mailing list