r16425 - in /desktop/unstable/gtk+2.0/debian: changelog control control.in patches/070_mandatory-relibtoolize.patch patches/092_openoffice-menus.patch patches/series

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Wed Jul 2 05:38:41 UTC 2008


Author: slomo
Date: Wed Jul  2 05:38:41 2008
New Revision: 16425

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16425
Log:
* New upstream bugfix release:
  + debian/patches/070_mandatory-relibtoolize.patch:
    - Regenerated for the new version.
  + debian/patches/092_openoffice-menus.patch:
    - Dropped, merged upstream.
* debian/control.in:
  + Updated Standards-Version to 3.8.0, no additional changes needed.

Removed:
    desktop/unstable/gtk+2.0/debian/patches/092_openoffice-menus.patch
Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/control
    desktop/unstable/gtk+2.0/debian/control.in
    desktop/unstable/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
    desktop/unstable/gtk+2.0/debian/patches/series

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=16425&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Wed Jul  2 05:38:41 2008
@@ -1,9 +1,19 @@
-gtk+2.0 (2.12.10-3) UNRELEASED; urgency=low
-
+gtk+2.0 (2.12.11-1) unstable; urgency=low
+
+  [ Emilio Pozuelo Monfort ]
   * Build-depend on libcups2-dev instead of libcupsys2-dev, as cups
     is transitioning to that new name.
 
- -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Fri, 13 Jun 2008 15:53:49 +0200
+  [ Sebastian Dröge ]
+  * New upstream bugfix release:
+    + debian/patches/070_mandatory-relibtoolize.patch:
+      - Regenerated for the new version.
+    + debian/patches/092_openoffice-menus.patch:
+      - Dropped, merged upstream.
+  * debian/control.in:
+    + Updated Standards-Version to 3.8.0, no additional changes needed.
+
+ -- Sebastian Dröge <slomo at debian.org>  Wed, 02 Jul 2008 06:37:51 +0200
 
 gtk+2.0 (2.12.10-2) unstable; urgency=low
 

Modified: desktop/unstable/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control?rev=16425&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control (original)
+++ desktop/unstable/gtk+2.0/debian/control Wed Jul  2 05:38:41 2008
@@ -36,7 +36,7 @@
                quilt
 Build-Depends-Indep: gtk-doc-tools (>= 1.6),
                      docbook-xml
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 
 Package: libgtk2.0-0
 Section: libs

Modified: desktop/unstable/gtk+2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control.in?rev=16425&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control.in (original)
+++ desktop/unstable/gtk+2.0/debian/control.in Wed Jul  2 05:38:41 2008
@@ -36,7 +36,7 @@
                quilt
 Build-Depends-Indep: gtk-doc-tools (>= 1.6),
                      docbook-xml
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 
 Package: @SHARED_PKG@
 Section: libs

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=16425&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 Jul  2 05:38:41 2008
@@ -1,17 +1,6 @@
-Classical relibtoolizing patch generated with:
-    libtoolize --force --copy &&
-    aclocal-1.7 -I m4macros &&
-    autoconf &&
-    automake-1.7 &&
-    rm -rf autom4te.cache &&
-exclude config.guess and sub with diff -urN -x config.guess -x config.sub
-
-This is required because of patches touching autotools files, but also because
-of upstream using an older libtool; see GNOME #484426; Debian #445001.
-
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/aclocal.m4 gtk+2.0-2.12.10/aclocal.m4
---- gtk+2.0-2.12.10.old/aclocal.m4	2008-06-03 23:20:21.000000000 +0200
-+++ gtk+2.0-2.12.10/aclocal.m4	2008-06-04 08:55:43.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/aclocal.m4 gtk+2.0-2.12.11/aclocal.m4
+--- gtk+2.0-2.12.11.old/aclocal.m4	2008-07-01 15:43:50.000000000 +0200
++++ gtk+2.0-2.12.11/aclocal.m4	2008-07-02 07:22:23.000000000 +0200
 @@ -941,7 +941,7 @@
  
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -161,9 +150,9 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/configure gtk+2.0-2.12.10/configure
---- gtk+2.0-2.12.10.old/configure	2008-06-03 23:20:39.000000000 +0200
-+++ gtk+2.0-2.12.10/configure	2008-06-04 08:55:50.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/configure gtk+2.0-2.12.11/configure
+--- gtk+2.0-2.12.11.old/configure	2008-07-01 15:44:08.000000000 +0200
++++ gtk+2.0-2.12.11/configure	2008-07-02 07:22:28.000000000 +0200
 @@ -885,6 +885,8 @@
  CCDEPMODE
  am__fastdepCC_TRUE
@@ -759,29 +748,49 @@
  if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
    { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.12.10/contrib/gdk-pixbuf-xlib/Makefile.in
---- gtk+2.0-2.12.10.old/contrib/gdk-pixbuf-xlib/Makefile.in	2008-06-03 23:20:31.000000000 +0200
-+++ gtk+2.0-2.12.10/contrib/gdk-pixbuf-xlib/Makefile.in	2008-06-04 08:55:52.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/contrib/Makefile.in gtk+2.0-2.12.10/contrib/Makefile.in
---- gtk+2.0-2.12.10.old/contrib/Makefile.in	2008-06-03 23:20:31.000000000 +0200
-+++ gtk+2.0-2.12.10/contrib/Makefile.in	2008-06-04 08:55:52.000000000 +0200
+@@ -36186,9 +36267,9 @@
+   }
+   split(mac1, mac2, "(") #)
+   macro = mac2[1]
+-  prefix = substr(line, 1, index(line, defundef) - 1)
+   if (D_is_set[macro]) {
+     # Preserve the white space surrounding the "#".
++    prefix = substr(line, 1, index(line, defundef) - 1)
+     print prefix "define", macro P[macro] D[macro]
+     next
+   } else {
+@@ -36196,7 +36277,7 @@
+     # in the case of _POSIX_SOURCE, which is predefined and required
+     # on some systems where configure will not decide to define it.
+     if (defundef == "undef") {
+-      print "/*", prefix defundef, macro, "*/"
++      print "/*", line, "*/"
+       next
+     }
+   }
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.12.11/contrib/gdk-pixbuf-xlib/Makefile.in
+--- gtk+2.0-2.12.11.old/contrib/gdk-pixbuf-xlib/Makefile.in	2008-07-01 15:44:00.000000000 +0200
++++ gtk+2.0-2.12.11/contrib/gdk-pixbuf-xlib/Makefile.in	2008-07-02 07:22:29.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/contrib/Makefile.in gtk+2.0-2.12.11/contrib/Makefile.in
+--- gtk+2.0-2.12.11.old/contrib/Makefile.in	2008-07-01 15:44:00.000000000 +0200
++++ gtk+2.0-2.12.11/contrib/Makefile.in	2008-07-02 07:22:29.000000000 +0200
 @@ -91,6 +91,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -799,29 +808,29 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/demos/gtk-demo/Makefile.in gtk+2.0-2.12.10/demos/gtk-demo/Makefile.in
---- gtk+2.0-2.12.10.old/demos/gtk-demo/Makefile.in	2008-06-03 23:20:31.000000000 +0200
-+++ gtk+2.0-2.12.10/demos/gtk-demo/Makefile.in	2008-06-04 08:55:54.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/demos/Makefile.in gtk+2.0-2.12.10/demos/Makefile.in
---- gtk+2.0-2.12.10.old/demos/Makefile.in	2008-06-03 23:20:31.000000000 +0200
-+++ gtk+2.0-2.12.10/demos/Makefile.in	2008-06-04 08:55:53.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/demos/gtk-demo/Makefile.in gtk+2.0-2.12.11/demos/gtk-demo/Makefile.in
+--- gtk+2.0-2.12.11.old/demos/gtk-demo/Makefile.in	2008-07-01 15:44:01.000000000 +0200
++++ gtk+2.0-2.12.11/demos/gtk-demo/Makefile.in	2008-07-02 07:22:29.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/demos/Makefile.in gtk+2.0-2.12.11/demos/Makefile.in
+--- gtk+2.0-2.12.11.old/demos/Makefile.in	2008-07-01 15:44:00.000000000 +0200
++++ gtk+2.0-2.12.11/demos/Makefile.in	2008-07-02 07:22:29.000000000 +0200
 @@ -91,6 +91,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -839,49 +848,49 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/docs/faq/Makefile.in gtk+2.0-2.12.10/docs/faq/Makefile.in
---- gtk+2.0-2.12.10.old/docs/faq/Makefile.in	2008-06-03 23:20:31.000000000 +0200
-+++ gtk+2.0-2.12.10/docs/faq/Makefile.in	2008-06-04 08:55:54.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/docs/Makefile.in gtk+2.0-2.12.10/docs/Makefile.in
---- gtk+2.0-2.12.10.old/docs/Makefile.in	2008-06-03 23:20:31.000000000 +0200
-+++ gtk+2.0-2.12.10/docs/Makefile.in	2008-06-04 08:55:54.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/docs/reference/gdk/Makefile.in gtk+2.0-2.12.10/docs/reference/gdk/Makefile.in
---- gtk+2.0-2.12.10.old/docs/reference/gdk/Makefile.in	2008-06-03 23:20:32.000000000 +0200
-+++ gtk+2.0-2.12.10/docs/reference/gdk/Makefile.in	2008-06-04 08:55:55.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/docs/faq/Makefile.in gtk+2.0-2.12.11/docs/faq/Makefile.in
+--- gtk+2.0-2.12.11.old/docs/faq/Makefile.in	2008-07-01 15:44:01.000000000 +0200
++++ gtk+2.0-2.12.11/docs/faq/Makefile.in	2008-07-02 07:22:29.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/docs/Makefile.in gtk+2.0-2.12.11/docs/Makefile.in
+--- gtk+2.0-2.12.11.old/docs/Makefile.in	2008-07-01 15:44:01.000000000 +0200
++++ gtk+2.0-2.12.11/docs/Makefile.in	2008-07-02 07:22:29.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/docs/reference/gdk/Makefile.in gtk+2.0-2.12.11/docs/reference/gdk/Makefile.in
+--- gtk+2.0-2.12.11.old/docs/reference/gdk/Makefile.in	2008-07-01 15:44:01.000000000 +0200
++++ gtk+2.0-2.12.11/docs/reference/gdk/Makefile.in	2008-07-02 07:22:30.000000000 +0200
 @@ -96,6 +96,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -899,9 +908,9 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.12.10/docs/reference/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.12.10.old/docs/reference/gdk-pixbuf/Makefile.in	2008-06-03 23:20:32.000000000 +0200
-+++ gtk+2.0-2.12.10/docs/reference/gdk-pixbuf/Makefile.in	2008-06-04 08:55:55.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.12.11/docs/reference/gdk-pixbuf/Makefile.in
+--- gtk+2.0-2.12.11.old/docs/reference/gdk-pixbuf/Makefile.in	2008-07-01 15:44:01.000000000 +0200
++++ gtk+2.0-2.12.11/docs/reference/gdk-pixbuf/Makefile.in	2008-07-02 07:22:30.000000000 +0200
 @@ -96,6 +96,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -919,9 +928,9 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/docs/reference/gtk/Makefile.in gtk+2.0-2.12.10/docs/reference/gtk/Makefile.in
---- gtk+2.0-2.12.10.old/docs/reference/gtk/Makefile.in	2008-06-03 23:20:32.000000000 +0200
-+++ gtk+2.0-2.12.10/docs/reference/gtk/Makefile.in	2008-06-04 08:55:55.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/docs/reference/gtk/Makefile.in gtk+2.0-2.12.11/docs/reference/gtk/Makefile.in
+--- gtk+2.0-2.12.11.old/docs/reference/gtk/Makefile.in	2008-07-01 15:44:01.000000000 +0200
++++ gtk+2.0-2.12.11/docs/reference/gtk/Makefile.in	2008-07-02 07:22:30.000000000 +0200
 @@ -96,6 +96,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -939,169 +948,169 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/docs/reference/Makefile.in gtk+2.0-2.12.10/docs/reference/Makefile.in
---- gtk+2.0-2.12.10.old/docs/reference/Makefile.in	2008-06-03 23:20:31.000000000 +0200
-+++ gtk+2.0-2.12.10/docs/reference/Makefile.in	2008-06-04 08:55:54.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/docs/tools/Makefile.in gtk+2.0-2.12.10/docs/tools/Makefile.in
---- gtk+2.0-2.12.10.old/docs/tools/Makefile.in	2008-06-03 23:20:32.000000000 +0200
-+++ gtk+2.0-2.12.10/docs/tools/Makefile.in	2008-06-04 08:55:56.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/docs/tutorial/Makefile.in gtk+2.0-2.12.10/docs/tutorial/Makefile.in
---- gtk+2.0-2.12.10.old/docs/tutorial/Makefile.in	2008-06-03 23:20:32.000000000 +0200
-+++ gtk+2.0-2.12.10/docs/tutorial/Makefile.in	2008-06-04 08:55:56.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/gdk/directfb/Makefile.in gtk+2.0-2.12.10/gdk/directfb/Makefile.in
---- gtk+2.0-2.12.10.old/gdk/directfb/Makefile.in	2008-06-03 23:20:33.000000000 +0200
-+++ gtk+2.0-2.12.10/gdk/directfb/Makefile.in	2008-06-04 08:55:59.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/gdk/Makefile.in gtk+2.0-2.12.10/gdk/Makefile.in
---- gtk+2.0-2.12.10.old/gdk/Makefile.in	2008-06-03 23:20:33.000000000 +0200
-+++ gtk+2.0-2.12.10/gdk/Makefile.in	2008-06-04 08:55:58.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/gdk/quartz/Makefile.in gtk+2.0-2.12.10/gdk/quartz/Makefile.in
---- gtk+2.0-2.12.10.old/gdk/quartz/Makefile.in	2008-06-03 23:20:33.000000000 +0200
-+++ gtk+2.0-2.12.10/gdk/quartz/Makefile.in	2008-06-04 08:55:59.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/gdk/win32/Makefile.in gtk+2.0-2.12.10/gdk/win32/Makefile.in
---- gtk+2.0-2.12.10.old/gdk/win32/Makefile.in	2008-06-03 23:20:33.000000000 +0200
-+++ gtk+2.0-2.12.10/gdk/win32/Makefile.in	2008-06-04 08:56:00.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/gdk/win32/rc/Makefile.in gtk+2.0-2.12.10/gdk/win32/rc/Makefile.in
---- gtk+2.0-2.12.10.old/gdk/win32/rc/Makefile.in	2008-06-03 23:20:33.000000000 +0200
-+++ gtk+2.0-2.12.10/gdk/win32/rc/Makefile.in	2008-06-04 08:56:00.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/gdk/x11/Makefile.in gtk+2.0-2.12.10/gdk/x11/Makefile.in
---- gtk+2.0-2.12.10.old/gdk/x11/Makefile.in	2008-06-03 23:20:34.000000000 +0200
-+++ gtk+2.0-2.12.10/gdk/x11/Makefile.in	2008-06-04 08:56:00.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/docs/reference/Makefile.in gtk+2.0-2.12.11/docs/reference/Makefile.in
+--- gtk+2.0-2.12.11.old/docs/reference/Makefile.in	2008-07-01 15:44:01.000000000 +0200
++++ gtk+2.0-2.12.11/docs/reference/Makefile.in	2008-07-02 07:22:30.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/docs/tools/Makefile.in gtk+2.0-2.12.11/docs/tools/Makefile.in
+--- gtk+2.0-2.12.11.old/docs/tools/Makefile.in	2008-07-01 15:44:01.000000000 +0200
++++ gtk+2.0-2.12.11/docs/tools/Makefile.in	2008-07-02 07:22:30.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/docs/tutorial/Makefile.in gtk+2.0-2.12.11/docs/tutorial/Makefile.in
+--- gtk+2.0-2.12.11.old/docs/tutorial/Makefile.in	2008-07-01 15:44:01.000000000 +0200
++++ gtk+2.0-2.12.11/docs/tutorial/Makefile.in	2008-07-02 07:22:30.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/gdk/directfb/Makefile.in gtk+2.0-2.12.11/gdk/directfb/Makefile.in
+--- gtk+2.0-2.12.11.old/gdk/directfb/Makefile.in	2008-07-01 15:44:02.000000000 +0200
++++ gtk+2.0-2.12.11/gdk/directfb/Makefile.in	2008-07-02 07:22:31.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/gdk/Makefile.in gtk+2.0-2.12.11/gdk/Makefile.in
+--- gtk+2.0-2.12.11.old/gdk/Makefile.in	2008-07-01 15:44:02.000000000 +0200
++++ gtk+2.0-2.12.11/gdk/Makefile.in	2008-07-02 07:22:31.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/gdk/quartz/Makefile.in gtk+2.0-2.12.11/gdk/quartz/Makefile.in
+--- gtk+2.0-2.12.11.old/gdk/quartz/Makefile.in	2008-07-01 15:44:02.000000000 +0200
++++ gtk+2.0-2.12.11/gdk/quartz/Makefile.in	2008-07-02 07:22:32.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/gdk/win32/Makefile.in gtk+2.0-2.12.11/gdk/win32/Makefile.in
+--- gtk+2.0-2.12.11.old/gdk/win32/Makefile.in	2008-07-01 15:44:03.000000000 +0200
++++ gtk+2.0-2.12.11/gdk/win32/Makefile.in	2008-07-02 07:22:32.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/gdk/win32/rc/Makefile.in gtk+2.0-2.12.11/gdk/win32/rc/Makefile.in
+--- gtk+2.0-2.12.11.old/gdk/win32/rc/Makefile.in	2008-07-01 15:44:03.000000000 +0200
++++ gtk+2.0-2.12.11/gdk/win32/rc/Makefile.in	2008-07-02 07:22:32.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/gdk/x11/Makefile.in gtk+2.0-2.12.11/gdk/x11/Makefile.in
+--- gtk+2.0-2.12.11.old/gdk/x11/Makefile.in	2008-07-01 15:44:03.000000000 +0200
++++ gtk+2.0-2.12.11/gdk/x11/Makefile.in	2008-07-02 07:22:32.000000000 +0200
 @@ -92,6 +92,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -1119,9 +1128,9 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/gdk-pixbuf/Makefile.in gtk+2.0-2.12.10/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.12.10.old/gdk-pixbuf/Makefile.in	2008-06-03 23:20:32.000000000 +0200
-+++ gtk+2.0-2.12.10/gdk-pixbuf/Makefile.in	2008-06-04 08:55:57.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/gdk-pixbuf/Makefile.in gtk+2.0-2.12.11/gdk-pixbuf/Makefile.in
+--- gtk+2.0-2.12.11.old/gdk-pixbuf/Makefile.in	2008-07-01 15:44:02.000000000 +0200
++++ gtk+2.0-2.12.11/gdk-pixbuf/Makefile.in	2008-07-02 07:22:31.000000000 +0200
 @@ -90,6 +90,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -1156,29 +1165,29 @@
  LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GLIB_LIBS)
  
  noinst_PROGRAMS = test-gdk-pixbuf
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.12.10/gdk-pixbuf/pixops/Makefile.in
---- gtk+2.0-2.12.10.old/gdk-pixbuf/pixops/Makefile.in	2008-06-03 23:20:33.000000000 +0200
-+++ gtk+2.0-2.12.10/gdk-pixbuf/pixops/Makefile.in	2008-06-04 08:55:57.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/gtk/Makefile.in gtk+2.0-2.12.10/gtk/Makefile.in
---- gtk+2.0-2.12.10.old/gtk/Makefile.in	2008-06-03 23:20:34.000000000 +0200
-+++ gtk+2.0-2.12.10/gtk/Makefile.in	2008-06-04 08:56:02.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.12.11/gdk-pixbuf/pixops/Makefile.in
+--- gtk+2.0-2.12.11.old/gdk-pixbuf/pixops/Makefile.in	2008-07-01 15:44:02.000000000 +0200
++++ gtk+2.0-2.12.11/gdk-pixbuf/pixops/Makefile.in	2008-07-02 07:22:31.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/gtk/Makefile.in gtk+2.0-2.12.11/gtk/Makefile.in
+--- gtk+2.0-2.12.11.old/gtk/Makefile.in	2008-07-01 15:44:03.000000000 +0200
++++ gtk+2.0-2.12.11/gtk/Makefile.in	2008-07-02 07:22:33.000000000 +0200
 @@ -116,6 +116,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -1236,49 +1245,49 @@
  	gtkfilesystemunix.h	\
  	gtkhsv.h		\
  	gtkiconcache.h		\
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/gtk/theme-bits/Makefile.in gtk+2.0-2.12.10/gtk/theme-bits/Makefile.in
---- gtk+2.0-2.12.10.old/gtk/theme-bits/Makefile.in	2008-06-03 23:20:34.000000000 +0200
-+++ gtk+2.0-2.12.10/gtk/theme-bits/Makefile.in	2008-06-04 08:56:03.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/gtk/xdgmime/Makefile.in gtk+2.0-2.12.10/gtk/xdgmime/Makefile.in
---- gtk+2.0-2.12.10.old/gtk/xdgmime/Makefile.in	2008-06-03 23:20:34.000000000 +0200
-+++ gtk+2.0-2.12.10/gtk/xdgmime/Makefile.in	2008-06-04 08:56:05.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/ltmain.sh gtk+2.0-2.12.10/ltmain.sh
---- gtk+2.0-2.12.10.old/ltmain.sh	2008-05-20 18:32:30.000000000 +0200
-+++ gtk+2.0-2.12.10/ltmain.sh	2008-04-29 23:33:55.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/gtk/theme-bits/Makefile.in gtk+2.0-2.12.11/gtk/theme-bits/Makefile.in
+--- gtk+2.0-2.12.11.old/gtk/theme-bits/Makefile.in	2008-07-01 15:44:04.000000000 +0200
++++ gtk+2.0-2.12.11/gtk/theme-bits/Makefile.in	2008-07-02 07:22:33.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/gtk/xdgmime/Makefile.in gtk+2.0-2.12.11/gtk/xdgmime/Makefile.in
+--- gtk+2.0-2.12.11.old/gtk/xdgmime/Makefile.in	2008-07-01 15:44:04.000000000 +0200
++++ gtk+2.0-2.12.11/gtk/xdgmime/Makefile.in	2008-07-02 07:22:33.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/ltmain.sh gtk+2.0-2.12.11/ltmain.sh
+--- gtk+2.0-2.12.11.old/ltmain.sh	2008-06-09 21:51:13.000000000 +0200
++++ gtk+2.0-2.12.11/ltmain.sh	2008-04-29 23:33:55.000000000 +0200
 @@ -43,7 +43,7 @@
  
  PROGRAM=ltmain.sh
@@ -1312,29 +1321,29 @@
  	  esac
  	  ;;
  	no)
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/m4macros/Makefile.in gtk+2.0-2.12.10/m4macros/Makefile.in
---- gtk+2.0-2.12.10.old/m4macros/Makefile.in	2008-06-03 23:20:35.000000000 +0200
-+++ gtk+2.0-2.12.10/m4macros/Makefile.in	2008-06-04 08:56:06.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/Makefile.in gtk+2.0-2.12.10/Makefile.in
---- gtk+2.0-2.12.10.old/Makefile.in	2008-06-03 23:20:30.000000000 +0200
-+++ gtk+2.0-2.12.10/Makefile.in	2008-06-04 08:55:52.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/m4macros/Makefile.in gtk+2.0-2.12.11/m4macros/Makefile.in
+--- gtk+2.0-2.12.11.old/m4macros/Makefile.in	2008-07-01 15:44:04.000000000 +0200
++++ gtk+2.0-2.12.11/m4macros/Makefile.in	2008-07-02 07:22:33.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/Makefile.in gtk+2.0-2.12.11/Makefile.in
+--- gtk+2.0-2.12.11.old/Makefile.in	2008-07-01 15:44:00.000000000 +0200
++++ gtk+2.0-2.12.11/Makefile.in	2008-07-02 07:22:29.000000000 +0200
 @@ -91,6 +91,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -1390,109 +1399,109 @@
  	  if test "$$subdir" = .; then :; else \
  	    test -d $(distdir)/$$subdir \
  	    || mkdir $(distdir)/$$subdir \
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/modules/engines/Makefile.in gtk+2.0-2.12.10/modules/engines/Makefile.in
---- gtk+2.0-2.12.10.old/modules/engines/Makefile.in	2008-06-03 23:20:35.000000000 +0200
-+++ gtk+2.0-2.12.10/modules/engines/Makefile.in	2008-06-04 08:56:06.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.12.10/modules/engines/ms-windows/Makefile.in
---- gtk+2.0-2.12.10.old/modules/engines/ms-windows/Makefile.in	2008-06-03 23:20:35.000000000 +0200
-+++ gtk+2.0-2.12.10/modules/engines/ms-windows/Makefile.in	2008-06-04 08:56:07.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.12.10/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
---- gtk+2.0-2.12.10.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2008-06-03 23:20:35.000000000 +0200
-+++ gtk+2.0-2.12.10/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2008-06-04 08:56:08.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.12.10/modules/engines/ms-windows/Theme/Makefile.in
---- gtk+2.0-2.12.10.old/modules/engines/ms-windows/Theme/Makefile.in	2008-06-03 23:20:35.000000000 +0200
-+++ gtk+2.0-2.12.10/modules/engines/ms-windows/Theme/Makefile.in	2008-06-04 08:56:07.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.12.10/modules/engines/pixbuf/Makefile.in
---- gtk+2.0-2.12.10.old/modules/engines/pixbuf/Makefile.in	2008-06-03 23:20:36.000000000 +0200
-+++ gtk+2.0-2.12.10/modules/engines/pixbuf/Makefile.in	2008-06-04 08:56:08.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/modules/input/Makefile.in gtk+2.0-2.12.10/modules/input/Makefile.in
---- gtk+2.0-2.12.10.old/modules/input/Makefile.in	2008-06-03 23:20:36.000000000 +0200
-+++ gtk+2.0-2.12.10/modules/input/Makefile.in	2008-06-04 08:56:08.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/modules/engines/Makefile.in gtk+2.0-2.12.11/modules/engines/Makefile.in
+--- gtk+2.0-2.12.11.old/modules/engines/Makefile.in	2008-07-01 15:44:04.000000000 +0200
++++ gtk+2.0-2.12.11/modules/engines/Makefile.in	2008-07-02 07:22:34.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.12.11/modules/engines/ms-windows/Makefile.in
+--- gtk+2.0-2.12.11.old/modules/engines/ms-windows/Makefile.in	2008-07-01 15:44:04.000000000 +0200
++++ gtk+2.0-2.12.11/modules/engines/ms-windows/Makefile.in	2008-07-02 07:22:34.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.12.11/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
+--- gtk+2.0-2.12.11.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2008-07-01 15:44:04.000000000 +0200
++++ gtk+2.0-2.12.11/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2008-07-02 07:22:34.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.12.11/modules/engines/ms-windows/Theme/Makefile.in
+--- gtk+2.0-2.12.11.old/modules/engines/ms-windows/Theme/Makefile.in	2008-07-01 15:44:04.000000000 +0200
++++ gtk+2.0-2.12.11/modules/engines/ms-windows/Theme/Makefile.in	2008-07-02 07:22:34.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.12.11/modules/engines/pixbuf/Makefile.in
+--- gtk+2.0-2.12.11.old/modules/engines/pixbuf/Makefile.in	2008-07-01 15:44:04.000000000 +0200
++++ gtk+2.0-2.12.11/modules/engines/pixbuf/Makefile.in	2008-07-02 07:22:34.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/modules/input/Makefile.in gtk+2.0-2.12.11/modules/input/Makefile.in
+--- gtk+2.0-2.12.11.old/modules/input/Makefile.in	2008-07-01 15:44:05.000000000 +0200
++++ gtk+2.0-2.12.11/modules/input/Makefile.in	2008-07-02 07:22:35.000000000 +0200
 @@ -90,6 +90,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -1542,89 +1551,89 @@
  
  @CROSS_COMPILING_FALSE at all-local: gtk.immodules
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/modules/Makefile.in gtk+2.0-2.12.10/modules/Makefile.in
---- gtk+2.0-2.12.10.old/modules/Makefile.in	2008-06-03 23:20:35.000000000 +0200
-+++ gtk+2.0-2.12.10/modules/Makefile.in	2008-06-04 08:56:06.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.12.10/modules/printbackends/cups/Makefile.in
---- gtk+2.0-2.12.10.old/modules/printbackends/cups/Makefile.in	2008-06-03 23:20:36.000000000 +0200
-+++ gtk+2.0-2.12.10/modules/printbackends/cups/Makefile.in	2008-06-04 08:56:09.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/modules/printbackends/file/Makefile.in gtk+2.0-2.12.10/modules/printbackends/file/Makefile.in
---- gtk+2.0-2.12.10.old/modules/printbackends/file/Makefile.in	2008-06-03 23:20:36.000000000 +0200
-+++ gtk+2.0-2.12.10/modules/printbackends/file/Makefile.in	2008-06-04 08:56:09.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.12.10/modules/printbackends/lpr/Makefile.in
---- gtk+2.0-2.12.10.old/modules/printbackends/lpr/Makefile.in	2008-06-03 23:20:36.000000000 +0200
-+++ gtk+2.0-2.12.10/modules/printbackends/lpr/Makefile.in	2008-06-04 08:56:09.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/modules/printbackends/Makefile.in gtk+2.0-2.12.10/modules/printbackends/Makefile.in
---- gtk+2.0-2.12.10.old/modules/printbackends/Makefile.in	2008-06-03 23:20:36.000000000 +0200
-+++ gtk+2.0-2.12.10/modules/printbackends/Makefile.in	2008-06-04 08:56:09.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/modules/Makefile.in gtk+2.0-2.12.11/modules/Makefile.in
+--- gtk+2.0-2.12.11.old/modules/Makefile.in	2008-07-01 15:44:04.000000000 +0200
++++ gtk+2.0-2.12.11/modules/Makefile.in	2008-07-02 07:22:34.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.12.11/modules/printbackends/cups/Makefile.in
+--- gtk+2.0-2.12.11.old/modules/printbackends/cups/Makefile.in	2008-07-01 15:44:05.000000000 +0200
++++ gtk+2.0-2.12.11/modules/printbackends/cups/Makefile.in	2008-07-02 07:22:35.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/modules/printbackends/file/Makefile.in gtk+2.0-2.12.11/modules/printbackends/file/Makefile.in
+--- gtk+2.0-2.12.11.old/modules/printbackends/file/Makefile.in	2008-07-01 15:44:05.000000000 +0200
++++ gtk+2.0-2.12.11/modules/printbackends/file/Makefile.in	2008-07-02 07:22:35.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.12.11/modules/printbackends/lpr/Makefile.in
+--- gtk+2.0-2.12.11.old/modules/printbackends/lpr/Makefile.in	2008-07-01 15:44:05.000000000 +0200
++++ gtk+2.0-2.12.11/modules/printbackends/lpr/Makefile.in	2008-07-02 07:22:35.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/modules/printbackends/Makefile.in gtk+2.0-2.12.11/modules/printbackends/Makefile.in
+--- gtk+2.0-2.12.11.old/modules/printbackends/Makefile.in	2008-07-01 15:44:05.000000000 +0200
++++ gtk+2.0-2.12.11/modules/printbackends/Makefile.in	2008-07-02 07:22:35.000000000 +0200
 @@ -92,6 +92,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -1642,49 +1651,49 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/modules/printbackends/test/Makefile.in gtk+2.0-2.12.10/modules/printbackends/test/Makefile.in
---- gtk+2.0-2.12.10.old/modules/printbackends/test/Makefile.in	2008-06-03 23:20:37.000000000 +0200
-+++ gtk+2.0-2.12.10/modules/printbackends/test/Makefile.in	2008-06-04 08:56:10.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/perf/Makefile.in gtk+2.0-2.12.10/perf/Makefile.in
---- gtk+2.0-2.12.10.old/perf/Makefile.in	2008-06-03 23:20:37.000000000 +0200
-+++ gtk+2.0-2.12.10/perf/Makefile.in	2008-06-04 08:56:10.000000000 +0200
-@@ -90,6 +90,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -113,6 +115,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.10.old/tests/Makefile.in gtk+2.0-2.12.10/tests/Makefile.in
---- gtk+2.0-2.12.10.old/tests/Makefile.in	2008-06-03 23:20:37.000000000 +0200
-+++ gtk+2.0-2.12.10/tests/Makefile.in	2008-06-04 08:56:11.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/modules/printbackends/test/Makefile.in gtk+2.0-2.12.11/modules/printbackends/test/Makefile.in
+--- gtk+2.0-2.12.11.old/modules/printbackends/test/Makefile.in	2008-07-01 15:44:05.000000000 +0200
++++ gtk+2.0-2.12.11/modules/printbackends/test/Makefile.in	2008-07-02 07:22:35.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/perf/Makefile.in gtk+2.0-2.12.11/perf/Makefile.in
+--- gtk+2.0-2.12.11.old/perf/Makefile.in	2008-07-01 15:44:05.000000000 +0200
++++ gtk+2.0-2.12.11/perf/Makefile.in	2008-07-02 07:22:36.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -113,6 +115,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/tests/Makefile.in gtk+2.0-2.12.11/tests/Makefile.in
+--- gtk+2.0-2.12.11.old/tests/Makefile.in	2008-07-01 15:44:06.000000000 +0200
++++ gtk+2.0-2.12.11/tests/Makefile.in	2008-07-02 07:22:36.000000000 +0200
 @@ -93,6 +93,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=16425&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/series (original)
+++ desktop/unstable/gtk+2.0/debian/patches/series Wed Jul  2 05:38:41 2008
@@ -20,4 +20,3 @@
 070_mandatory-relibtoolize.patch
 091_workaround_no_gtk_init_incorrect_display.patch
 095_gtk-im-module-setting.patch
-092_openoffice-menus.patch




More information about the pkg-gnome-commits mailing list