[Parsix-Devel] SVN Commit 2604 - in /pkg/main/gtk+2.0/trunk/debian: ./ patches/

alanbach-guest at users.alioth.debian.org alanbach-guest at users.alioth.debian.org
Wed Dec 5 06:38:32 CET 2007


Author: alanbach-guest
Date: Wed Dec  5 05:38:32 2007
New Revision: 2604

URL: http://svn.debian.org/wsvn/pkg-parsix/?sc=1&rev=2604
Log:
* Sync'd with Debian 2.12.3-1
  * New upstream stable release

Modified:
    pkg/main/gtk+2.0/trunk/debian/changelog
    pkg/main/gtk+2.0/trunk/debian/patches/042_treeview_single-focus.patch
    pkg/main/gtk+2.0/trunk/debian/patches/070_mandatory-relibtoolize.patch
    pkg/main/gtk+2.0/trunk/debian/update-icon-caches

Modified: pkg/main/gtk+2.0/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-parsix/pkg/main/gtk%2B2.0/trunk/debian/changelog?rev=2604&op=diff
==============================================================================
--- pkg/main/gtk+2.0/trunk/debian/changelog (original)
+++ pkg/main/gtk+2.0/trunk/debian/changelog Wed Dec  5 05:38:32 2007
@@ -1,26 +1,47 @@
-gtk+2.0 (2.12.2-parsix1) unstable; urgency=low
-
+gtk+2.0 (2.12.3-parsix1) unstable; urgency=low
+
+  * Sync'd with Debian 2.12.3-1
   * New upstream stable release
+
+ -- Alan Baghumian <alan at technotux.org>  Wed, 05 Dec 2007 09:07:11 +0330
+
+gtk+2.0 (2.12.3-1) unstable; urgency=low
+
+  * Let update-icon-caches skip args which are not dirs or don't exist; fixes
+    postrm behavior of packages with an icon cache.
+  * New upstream stable release; no API change; bug fixes and translation
+    updates.
+    - Refresh patch 042_treeview_single-focus to apply cleanly.
+    - Update relibtoolizing patch, 070_mandatory-relibtoolize.
+
+ -- Loic Minier <lool at dooz.org>  Tue, 04 Dec 2007 22:39:07 +0100
+
+gtk+2.0 (2.12.2-1) unstable; urgency=low
+
+  * New upstream stable release; no API change; bug fixes and translation
+    updated.
     - Drop patches 034_gtkcupsutils_type_fix, 071_fix_gdk_window_null_crasher
       fixed upstream.
     - Update relibtoolizing patch, 070_mandatory-relibtoolize.
 
- -- Alan Baghumian <alan at technotux.org>  Sat, 01 Dec 2007 13:45:12 +0330
-
-gtk+2.0 (2.12.1-parsix2) unstable; urgency=low
-
-  * Sync'd with Debian 2.12.1-3 to address some bugs
-
- -- Alan Baghumian <alan at technotux.org>  Sat, 17 Nov 2007 13:09:31 +0330
-
-gtk+2.0 (2.12.1-3) UNRELEASED; urgency=low
+ -- Sebastian Dröge <slomo at debian.org>  Tue, 27 Nov 2007 05:15:01 +0100
+
+gtk+2.0 (2.12.1-3) unstable; urgency=low
 
   * Conflict against metacity < 1:2.20.0-1. Closes: #450693.
   * Suggest librsvg2-common for SVG pixbuf support.
-  * 033_treeview_resizing.patch: fix segmentation fault introduced by 
+  * 033_treeview_resizing.patch: fix segmentation fault introduced by
     an API inconsistency.
-
- -- Josselin Mouette <joss at debian.org>  Thu, 15 Nov 2007 20:09:09 +0100
+  * 003_gdk.pc_privates.patch: generate correct Requires.private for
+    gdk-2.0.pc containing all necessary dependencies for static linking.
+  * 006_proper-directfb-modules.patch: refreshed.
+  * 010_gdkpixbuf_-lm.patch: fix gdk-pixbuf-2.0.pc by adding back -lm,
+    which is required by some macros. Closes: #451512.
+  * 070_mandatory-relibtoolize.patch: regenerated.
+  * rules: copy the extraneous libraries generated in the static build 
+    to the Libs.private of the shared build.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 18 Nov 2007 01:30:52 +0100
 
 gtk+2.0 (2.12.1-2) unstable; urgency=low
 

Modified: pkg/main/gtk+2.0/trunk/debian/patches/042_treeview_single-focus.patch
URL: http://svn.debian.org/wsvn/pkg-parsix/pkg/main/gtk%2B2.0/trunk/debian/patches/042_treeview_single-focus.patch?rev=2604&op=diff
==============================================================================
--- pkg/main/gtk+2.0/trunk/debian/patches/042_treeview_single-focus.patch (original)
+++ pkg/main/gtk+2.0/trunk/debian/patches/042_treeview_single-focus.patch Wed Dec  5 05:38:32 2007
@@ -1,8 +1,6 @@
-Index: gtk+-2.12.1/gtk/gtktreeview.c
-===================================================================
---- gtk+-2.12.1.orig/gtk/gtktreeview.c	2007-11-01 13:42:24.766037188 +0100
-+++ gtk+-2.12.1/gtk/gtktreeview.c	2007-11-01 13:45:13.083629061 +0100
-@@ -9660,7 +9660,8 @@ gtk_tree_view_focus_to_cursor (GtkTreeVi
+--- gtk+2.0-2.12.3.orig/gtk/gtktreeview.c	2007-12-04 22:37:26.000000000 +0100
++++ gtk+2.0-2.12.3/gtk/gtktreeview.c	2007-12-04 22:37:28.000000000 +0100
+@@ -9661,7 +9661,8 @@
  
        if (cursor_path)
  	{

Modified: pkg/main/gtk+2.0/trunk/debian/patches/070_mandatory-relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-parsix/pkg/main/gtk%2B2.0/trunk/debian/patches/070_mandatory-relibtoolize.patch?rev=2604&op=diff
==============================================================================
--- pkg/main/gtk+2.0/trunk/debian/patches/070_mandatory-relibtoolize.patch (original)
+++ pkg/main/gtk+2.0/trunk/debian/patches/070_mandatory-relibtoolize.patch Wed Dec  5 05:38:32 2007
@@ -9,9 +9,8 @@
 This is required because of patches touching autotools files, but also because
 of upstream using an older libtool; see GNOME #484426; Debian #445001.
 
-diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/aclocal.m4 gtk+2.0-2.12.2/aclocal.m4
---- gtk+2.0-2.12.2.old/aclocal.m4	2007-11-26 20:44:10.000000000 +0100
-+++ gtk+2.0-2.12.2/aclocal.m4	2007-11-27 05:24:42.000000000 +0100
+--- gtk+2.0-2.12.3.orig/aclocal.m4	2007-12-04 17:56:26.000000000 +0100
++++ gtk+2.0-2.12.3/aclocal.m4	2007-12-04 22:37:55.000000000 +0100
 @@ -941,7 +941,7 @@
  
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -133,9 +132,8 @@
  
    no_glib=""
  
-diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/configure gtk+2.0-2.12.2/configure
---- gtk+2.0-2.12.2.old/configure	2007-11-26 20:44:23.000000000 +0100
-+++ gtk+2.0-2.12.2/configure	2007-11-27 05:24:48.000000000 +0100
+--- gtk+2.0-2.12.3.orig/configure	2007-12-04 17:56:39.000000000 +0100
++++ gtk+2.0-2.12.3/configure	2007-12-04 22:38:53.000000000 +0100
 @@ -863,6 +863,8 @@
  CCDEPMODE
  am__fastdepCC_TRUE
@@ -751,29 +749,27 @@
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.12.2/contrib/gdk-pixbuf-xlib/Makefile.in
---- gtk+2.0-2.12.2.old/contrib/gdk-pixbuf-xlib/Makefile.in	2007-11-26 20:44:18.000000000 +0100
-+++ gtk+2.0-2.12.2/contrib/gdk-pixbuf-xlib/Makefile.in	2007-11-27 05:24:49.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/contrib/Makefile.in gtk+2.0-2.12.2/contrib/Makefile.in
---- gtk+2.0-2.12.2.old/contrib/Makefile.in	2007-11-26 20:44:18.000000000 +0100
-+++ gtk+2.0-2.12.2/contrib/Makefile.in	2007-11-27 05:24:49.000000000 +0100
+--- gtk+2.0-2.12.3.orig/contrib/gdk-pixbuf-xlib/Makefile.in	2007-12-04 17:56:34.000000000 +0100
++++ gtk+2.0-2.12.3/contrib/gdk-pixbuf-xlib/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/contrib/Makefile.in	2007-12-04 17:56:34.000000000 +0100
++++ gtk+2.0-2.12.3/contrib/Makefile.in	2007-12-04 22:37:55.000000000 +0100
 @@ -90,6 +90,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -791,29 +787,27 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/demos/gtk-demo/Makefile.in gtk+2.0-2.12.2/demos/gtk-demo/Makefile.in
---- gtk+2.0-2.12.2.old/demos/gtk-demo/Makefile.in	2007-11-26 20:44:18.000000000 +0100
-+++ gtk+2.0-2.12.2/demos/gtk-demo/Makefile.in	2007-11-27 05:24:50.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/demos/Makefile.in gtk+2.0-2.12.2/demos/Makefile.in
---- gtk+2.0-2.12.2.old/demos/Makefile.in	2007-11-26 20:44:18.000000000 +0100
-+++ gtk+2.0-2.12.2/demos/Makefile.in	2007-11-27 05:24:50.000000000 +0100
+--- gtk+2.0-2.12.3.orig/demos/gtk-demo/Makefile.in	2007-12-04 17:56:34.000000000 +0100
++++ gtk+2.0-2.12.3/demos/gtk-demo/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/demos/Makefile.in	2007-12-04 17:56:34.000000000 +0100
++++ gtk+2.0-2.12.3/demos/Makefile.in	2007-12-04 22:37:55.000000000 +0100
 @@ -90,6 +90,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -831,49 +825,46 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/docs/faq/Makefile.in gtk+2.0-2.12.2/docs/faq/Makefile.in
---- gtk+2.0-2.12.2.old/docs/faq/Makefile.in	2007-11-26 20:44:18.000000000 +0100
-+++ gtk+2.0-2.12.2/docs/faq/Makefile.in	2007-11-27 05:24:50.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/docs/Makefile.in gtk+2.0-2.12.2/docs/Makefile.in
---- gtk+2.0-2.12.2.old/docs/Makefile.in	2007-11-26 20:44:18.000000000 +0100
-+++ gtk+2.0-2.12.2/docs/Makefile.in	2007-11-27 05:24:50.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/docs/reference/gdk/Makefile.in gtk+2.0-2.12.2/docs/reference/gdk/Makefile.in
---- gtk+2.0-2.12.2.old/docs/reference/gdk/Makefile.in	2007-11-26 20:44:19.000000000 +0100
-+++ gtk+2.0-2.12.2/docs/reference/gdk/Makefile.in	2007-11-27 05:24:50.000000000 +0100
+--- gtk+2.0-2.12.3.orig/docs/faq/Makefile.in	2007-12-04 17:56:34.000000000 +0100
++++ gtk+2.0-2.12.3/docs/faq/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/docs/Makefile.in	2007-12-04 17:56:34.000000000 +0100
++++ gtk+2.0-2.12.3/docs/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/docs/reference/gdk/Makefile.in	2007-12-04 17:56:34.000000000 +0100
++++ gtk+2.0-2.12.3/docs/reference/gdk/Makefile.in	2007-12-04 22:37:55.000000000 +0100
 @@ -95,6 +95,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -891,9 +882,8 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.12.2/docs/reference/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.12.2.old/docs/reference/gdk-pixbuf/Makefile.in	2007-11-26 20:44:19.000000000 +0100
-+++ gtk+2.0-2.12.2/docs/reference/gdk-pixbuf/Makefile.in	2007-11-27 05:24:50.000000000 +0100
+--- gtk+2.0-2.12.3.orig/docs/reference/gdk-pixbuf/Makefile.in	2007-12-04 17:56:34.000000000 +0100
++++ gtk+2.0-2.12.3/docs/reference/gdk-pixbuf/Makefile.in	2007-12-04 22:37:55.000000000 +0100
 @@ -95,6 +95,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -911,9 +901,8 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/docs/reference/gtk/Makefile.in gtk+2.0-2.12.2/docs/reference/gtk/Makefile.in
---- gtk+2.0-2.12.2.old/docs/reference/gtk/Makefile.in	2007-11-26 20:44:19.000000000 +0100
-+++ gtk+2.0-2.12.2/docs/reference/gtk/Makefile.in	2007-11-27 05:24:50.000000000 +0100
+--- gtk+2.0-2.12.3.orig/docs/reference/gtk/Makefile.in	2007-12-04 17:56:34.000000000 +0100
++++ gtk+2.0-2.12.3/docs/reference/gtk/Makefile.in	2007-12-04 22:37:55.000000000 +0100
 @@ -95,6 +95,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -931,169 +920,160 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/docs/reference/Makefile.in gtk+2.0-2.12.2/docs/reference/Makefile.in
---- gtk+2.0-2.12.2.old/docs/reference/Makefile.in	2007-11-26 20:44:18.000000000 +0100
-+++ gtk+2.0-2.12.2/docs/reference/Makefile.in	2007-11-27 05:24:50.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/docs/tools/Makefile.in gtk+2.0-2.12.2/docs/tools/Makefile.in
---- gtk+2.0-2.12.2.old/docs/tools/Makefile.in	2007-11-26 20:44:19.000000000 +0100
-+++ gtk+2.0-2.12.2/docs/tools/Makefile.in	2007-11-27 05:24:51.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/docs/tutorial/Makefile.in gtk+2.0-2.12.2/docs/tutorial/Makefile.in
---- gtk+2.0-2.12.2.old/docs/tutorial/Makefile.in	2007-11-26 20:44:19.000000000 +0100
-+++ gtk+2.0-2.12.2/docs/tutorial/Makefile.in	2007-11-27 05:24:51.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gdk/directfb/Makefile.in gtk+2.0-2.12.2/gdk/directfb/Makefile.in
---- gtk+2.0-2.12.2.old/gdk/directfb/Makefile.in	2007-11-26 20:44:19.000000000 +0100
-+++ gtk+2.0-2.12.2/gdk/directfb/Makefile.in	2007-11-27 05:24:52.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gdk/Makefile.in gtk+2.0-2.12.2/gdk/Makefile.in
---- gtk+2.0-2.12.2.old/gdk/Makefile.in	2007-11-26 20:44:19.000000000 +0100
-+++ gtk+2.0-2.12.2/gdk/Makefile.in	2007-11-27 05:24:52.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gdk/quartz/Makefile.in gtk+2.0-2.12.2/gdk/quartz/Makefile.in
---- gtk+2.0-2.12.2.old/gdk/quartz/Makefile.in	2007-11-26 20:44:20.000000000 +0100
-+++ gtk+2.0-2.12.2/gdk/quartz/Makefile.in	2007-11-27 05:24:52.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gdk/win32/Makefile.in gtk+2.0-2.12.2/gdk/win32/Makefile.in
---- gtk+2.0-2.12.2.old/gdk/win32/Makefile.in	2007-11-26 20:44:20.000000000 +0100
-+++ gtk+2.0-2.12.2/gdk/win32/Makefile.in	2007-11-27 05:24:52.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gdk/win32/rc/Makefile.in gtk+2.0-2.12.2/gdk/win32/rc/Makefile.in
---- gtk+2.0-2.12.2.old/gdk/win32/rc/Makefile.in	2007-11-26 20:44:20.000000000 +0100
-+++ gtk+2.0-2.12.2/gdk/win32/rc/Makefile.in	2007-11-27 05:24:52.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gdk/x11/Makefile.in gtk+2.0-2.12.2/gdk/x11/Makefile.in
---- gtk+2.0-2.12.2.old/gdk/x11/Makefile.in	2007-11-26 20:44:20.000000000 +0100
-+++ gtk+2.0-2.12.2/gdk/x11/Makefile.in	2007-11-27 05:24:53.000000000 +0100
+--- gtk+2.0-2.12.3.orig/docs/reference/Makefile.in	2007-12-04 17:56:34.000000000 +0100
++++ gtk+2.0-2.12.3/docs/reference/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/docs/tools/Makefile.in	2007-12-04 17:56:35.000000000 +0100
++++ gtk+2.0-2.12.3/docs/tools/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/docs/tutorial/Makefile.in	2007-12-04 17:56:35.000000000 +0100
++++ gtk+2.0-2.12.3/docs/tutorial/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/gdk/directfb/Makefile.in	2007-12-04 17:56:35.000000000 +0100
++++ gtk+2.0-2.12.3/gdk/directfb/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/gdk/Makefile.in	2007-12-04 17:56:35.000000000 +0100
++++ gtk+2.0-2.12.3/gdk/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/gdk/quartz/Makefile.in	2007-12-04 17:56:35.000000000 +0100
++++ gtk+2.0-2.12.3/gdk/quartz/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/gdk/win32/Makefile.in	2007-12-04 17:56:35.000000000 +0100
++++ gtk+2.0-2.12.3/gdk/win32/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/gdk/win32/rc/Makefile.in	2007-12-04 17:56:35.000000000 +0100
++++ gtk+2.0-2.12.3/gdk/win32/rc/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/gdk/x11/Makefile.in	2007-12-04 17:56:36.000000000 +0100
++++ gtk+2.0-2.12.3/gdk/x11/Makefile.in	2007-12-04 22:37:55.000000000 +0100
 @@ -91,6 +91,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -1111,49 +1091,46 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gdk-pixbuf/Makefile.in gtk+2.0-2.12.2/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.12.2.old/gdk-pixbuf/Makefile.in	2007-11-26 20:44:19.000000000 +0100
-+++ gtk+2.0-2.12.2/gdk-pixbuf/Makefile.in	2007-11-27 05:24:51.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.12.2/gdk-pixbuf/pixops/Makefile.in
---- gtk+2.0-2.12.2.old/gdk-pixbuf/pixops/Makefile.in	2007-11-26 20:44:19.000000000 +0100
-+++ gtk+2.0-2.12.2/gdk-pixbuf/pixops/Makefile.in	2007-11-27 05:24:51.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gtk/Makefile.in gtk+2.0-2.12.2/gtk/Makefile.in
---- gtk+2.0-2.12.2.old/gtk/Makefile.in	2007-11-26 20:44:20.000000000 +0100
-+++ gtk+2.0-2.12.2/gtk/Makefile.in	2007-11-27 05:24:53.000000000 +0100
+--- gtk+2.0-2.12.3.orig/gdk-pixbuf/Makefile.in	2007-12-04 17:56:35.000000000 +0100
++++ gtk+2.0-2.12.3/gdk-pixbuf/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/gdk-pixbuf/pixops/Makefile.in	2007-12-04 17:56:35.000000000 +0100
++++ gtk+2.0-2.12.3/gdk-pixbuf/pixops/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/gtk/Makefile.in	2007-12-04 17:56:36.000000000 +0100
++++ gtk+2.0-2.12.3/gtk/Makefile.in	2007-12-04 22:37:55.000000000 +0100
 @@ -113,6 +113,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -1211,49 +1188,46 @@
  	gtkfilesystemunix.h	\
  	gtkhsv.h		\
  	gtkiconcache.h		\
-diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gtk/theme-bits/Makefile.in gtk+2.0-2.12.2/gtk/theme-bits/Makefile.in
---- gtk+2.0-2.12.2.old/gtk/theme-bits/Makefile.in	2007-11-26 20:44:20.000000000 +0100
-+++ gtk+2.0-2.12.2/gtk/theme-bits/Makefile.in	2007-11-27 05:24:53.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/gtk/xdgmime/Makefile.in gtk+2.0-2.12.2/gtk/xdgmime/Makefile.in
---- gtk+2.0-2.12.2.old/gtk/xdgmime/Makefile.in	2007-11-26 20:44:21.000000000 +0100
-+++ gtk+2.0-2.12.2/gtk/xdgmime/Makefile.in	2007-11-27 05:24:54.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/ltmain.sh gtk+2.0-2.12.2/ltmain.sh
---- gtk+2.0-2.12.2.old/ltmain.sh	2007-08-29 13:52:51.000000000 +0200
-+++ gtk+2.0-2.12.2/ltmain.sh	2007-08-14 19:43:36.000000000 +0200
+--- gtk+2.0-2.12.3.orig/gtk/theme-bits/Makefile.in	2007-12-04 17:56:36.000000000 +0100
++++ gtk+2.0-2.12.3/gtk/theme-bits/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/gtk/xdgmime/Makefile.in	2007-12-04 17:56:36.000000000 +0100
++++ gtk+2.0-2.12.3/gtk/xdgmime/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/ltmain.sh	2007-08-29 13:52:51.000000000 +0200
++++ gtk+2.0-2.12.3/ltmain.sh	2007-12-04 22:37:55.000000000 +0100
 @@ -43,7 +43,7 @@
  
  PROGRAM=ltmain.sh
@@ -1287,29 +1261,27 @@
  	  esac
  	  ;;
  	no)
-diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/m4macros/Makefile.in gtk+2.0-2.12.2/m4macros/Makefile.in
---- gtk+2.0-2.12.2.old/m4macros/Makefile.in	2007-11-26 20:44:21.000000000 +0100
-+++ gtk+2.0-2.12.2/m4macros/Makefile.in	2007-11-27 05:24:54.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/Makefile.in gtk+2.0-2.12.2/Makefile.in
---- gtk+2.0-2.12.2.old/Makefile.in	2007-11-26 20:44:18.000000000 +0100
-+++ gtk+2.0-2.12.2/Makefile.in	2007-11-27 05:24:49.000000000 +0100
+--- gtk+2.0-2.12.3.orig/m4macros/Makefile.in	2007-12-04 17:56:36.000000000 +0100
++++ gtk+2.0-2.12.3/m4macros/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/Makefile.in	2007-12-04 17:56:34.000000000 +0100
++++ gtk+2.0-2.12.3/Makefile.in	2007-12-04 22:37:55.000000000 +0100
 @@ -90,6 +90,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -1365,109 +1337,103 @@
  	  if test "$$subdir" = .; then :; else \
  	    test -d $(distdir)/$$subdir \
  	    || mkdir $(distdir)/$$subdir \
-diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/engines/Makefile.in gtk+2.0-2.12.2/modules/engines/Makefile.in
---- gtk+2.0-2.12.2.old/modules/engines/Makefile.in	2007-11-26 20:44:21.000000000 +0100
-+++ gtk+2.0-2.12.2/modules/engines/Makefile.in	2007-11-27 05:24:54.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.12.2/modules/engines/ms-windows/Makefile.in
---- gtk+2.0-2.12.2.old/modules/engines/ms-windows/Makefile.in	2007-11-26 20:44:21.000000000 +0100
-+++ gtk+2.0-2.12.2/modules/engines/ms-windows/Makefile.in	2007-11-27 05:24:54.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.12.2/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
---- gtk+2.0-2.12.2.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2007-11-26 20:44:21.000000000 +0100
-+++ gtk+2.0-2.12.2/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2007-11-27 05:24:54.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.12.2/modules/engines/ms-windows/Theme/Makefile.in
---- gtk+2.0-2.12.2.old/modules/engines/ms-windows/Theme/Makefile.in	2007-11-26 20:44:21.000000000 +0100
-+++ gtk+2.0-2.12.2/modules/engines/ms-windows/Theme/Makefile.in	2007-11-27 05:24:54.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.12.2/modules/engines/pixbuf/Makefile.in
---- gtk+2.0-2.12.2.old/modules/engines/pixbuf/Makefile.in	2007-11-26 20:44:21.000000000 +0100
-+++ gtk+2.0-2.12.2/modules/engines/pixbuf/Makefile.in	2007-11-27 05:24:55.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/input/Makefile.in gtk+2.0-2.12.2/modules/input/Makefile.in
---- gtk+2.0-2.12.2.old/modules/input/Makefile.in	2007-11-26 20:44:21.000000000 +0100
-+++ gtk+2.0-2.12.2/modules/input/Makefile.in	2007-11-27 05:24:55.000000000 +0100
+--- gtk+2.0-2.12.3.orig/modules/engines/Makefile.in	2007-12-04 17:56:36.000000000 +0100
++++ gtk+2.0-2.12.3/modules/engines/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/modules/engines/ms-windows/Makefile.in	2007-12-04 17:56:37.000000000 +0100
++++ gtk+2.0-2.12.3/modules/engines/ms-windows/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2007-12-04 17:56:37.000000000 +0100
++++ gtk+2.0-2.12.3/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/modules/engines/ms-windows/Theme/Makefile.in	2007-12-04 17:56:37.000000000 +0100
++++ gtk+2.0-2.12.3/modules/engines/ms-windows/Theme/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/modules/engines/pixbuf/Makefile.in	2007-12-04 17:56:37.000000000 +0100
++++ gtk+2.0-2.12.3/modules/engines/pixbuf/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/modules/input/Makefile.in	2007-12-04 17:56:37.000000000 +0100
++++ gtk+2.0-2.12.3/modules/input/Makefile.in	2007-12-04 22:37:55.000000000 +0100
 @@ -89,6 +89,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -1517,89 +1483,84 @@
  
  @CROSS_COMPILING_FALSE at all-local: gtk.immodules
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/Makefile.in gtk+2.0-2.12.2/modules/Makefile.in
---- gtk+2.0-2.12.2.old/modules/Makefile.in	2007-11-26 20:44:21.000000000 +0100
-+++ gtk+2.0-2.12.2/modules/Makefile.in	2007-11-27 05:24:54.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.12.2/modules/printbackends/cups/Makefile.in
---- gtk+2.0-2.12.2.old/modules/printbackends/cups/Makefile.in	2007-11-26 20:44:21.000000000 +0100
-+++ gtk+2.0-2.12.2/modules/printbackends/cups/Makefile.in	2007-11-27 05:24:55.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/printbackends/file/Makefile.in gtk+2.0-2.12.2/modules/printbackends/file/Makefile.in
---- gtk+2.0-2.12.2.old/modules/printbackends/file/Makefile.in	2007-11-26 20:44:21.000000000 +0100
-+++ gtk+2.0-2.12.2/modules/printbackends/file/Makefile.in	2007-11-27 05:24:56.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.12.2/modules/printbackends/lpr/Makefile.in
---- gtk+2.0-2.12.2.old/modules/printbackends/lpr/Makefile.in	2007-11-26 20:44:22.000000000 +0100
-+++ gtk+2.0-2.12.2/modules/printbackends/lpr/Makefile.in	2007-11-27 05:24:56.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/printbackends/Makefile.in gtk+2.0-2.12.2/modules/printbackends/Makefile.in
---- gtk+2.0-2.12.2.old/modules/printbackends/Makefile.in	2007-11-26 20:44:21.000000000 +0100
-+++ gtk+2.0-2.12.2/modules/printbackends/Makefile.in	2007-11-27 05:24:55.000000000 +0100
+--- gtk+2.0-2.12.3.orig/modules/Makefile.in	2007-12-04 17:56:36.000000000 +0100
++++ gtk+2.0-2.12.3/modules/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/modules/printbackends/cups/Makefile.in	2007-12-04 17:56:37.000000000 +0100
++++ gtk+2.0-2.12.3/modules/printbackends/cups/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/modules/printbackends/file/Makefile.in	2007-12-04 17:56:37.000000000 +0100
++++ gtk+2.0-2.12.3/modules/printbackends/file/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/modules/printbackends/lpr/Makefile.in	2007-12-04 17:56:37.000000000 +0100
++++ gtk+2.0-2.12.3/modules/printbackends/lpr/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/modules/printbackends/Makefile.in	2007-12-04 17:56:37.000000000 +0100
++++ gtk+2.0-2.12.3/modules/printbackends/Makefile.in	2007-12-04 22:37:55.000000000 +0100
 @@ -91,6 +91,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -1617,49 +1578,46 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/modules/printbackends/test/Makefile.in gtk+2.0-2.12.2/modules/printbackends/test/Makefile.in
---- gtk+2.0-2.12.2.old/modules/printbackends/test/Makefile.in	2007-11-26 20:44:22.000000000 +0100
-+++ gtk+2.0-2.12.2/modules/printbackends/test/Makefile.in	2007-11-27 05:24:56.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/perf/Makefile.in gtk+2.0-2.12.2/perf/Makefile.in
---- gtk+2.0-2.12.2.old/perf/Makefile.in	2007-11-26 20:44:22.000000000 +0100
-+++ gtk+2.0-2.12.2/perf/Makefile.in	2007-11-27 05:24:56.000000000 +0100
-@@ -89,6 +89,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@
-@@ -112,6 +114,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 -urN -x config.guess -x config.sub gtk+2.0-2.12.2.old/tests/Makefile.in gtk+2.0-2.12.2/tests/Makefile.in
---- gtk+2.0-2.12.2.old/tests/Makefile.in	2007-11-26 20:44:22.000000000 +0100
-+++ gtk+2.0-2.12.2/tests/Makefile.in	2007-11-27 05:24:57.000000000 +0100
+--- gtk+2.0-2.12.3.orig/modules/printbackends/test/Makefile.in	2007-12-04 17:56:37.000000000 +0100
++++ gtk+2.0-2.12.3/modules/printbackends/test/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/perf/Makefile.in	2007-12-04 17:56:37.000000000 +0100
++++ gtk+2.0-2.12.3/perf/Makefile.in	2007-12-04 22:37:55.000000000 +0100
+@@ -89,6 +89,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@
+@@ -112,6 +114,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@
+--- gtk+2.0-2.12.3.orig/tests/Makefile.in	2007-12-04 17:56:38.000000000 +0100
++++ gtk+2.0-2.12.3/tests/Makefile.in	2007-12-04 22:37:55.000000000 +0100
 @@ -92,6 +92,8 @@
  ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
  ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@

Modified: pkg/main/gtk+2.0/trunk/debian/update-icon-caches
URL: http://svn.debian.org/wsvn/pkg-parsix/pkg/main/gtk%2B2.0/trunk/debian/update-icon-caches?rev=2604&op=diff
==============================================================================
--- pkg/main/gtk+2.0/trunk/debian/update-icon-caches (original)
+++ pkg/main/gtk+2.0/trunk/debian/update-icon-caches Wed Dec  5 05:38:32 2007
@@ -11,8 +11,7 @@
 
 for dir in "$@"; do
     if [ ! -d "$dir" ]; then
-        echo "$dir is not a directory"
-        exit 2
+        continue
     fi
     if [ -f "$dir"/index.theme ]; then
         if [ -f "$dir"/icon-theme.cache ]; then



More information about the Parsix-Devel mailing list