* New upstream stable release; no API change; bug fixes and translation

updated.
  - Drop patch 034_gtkcupsutils_type_fix fixed upstream.
  - Update relibtoolizing patch, 070_mandatory-relibtoolize.
  - Update patch 071_fix_gdk_window_null_crasher to apply cleanly.

debian/changelog

@@ -1,3 +1,13 @@
+gtk+2.0 (2.12.2-1) UNRELEASED; urgency=low
+
+  * New upstream stable release; no API change; bug fixes and translation
+    updated.
+    - Drop patch 034_gtkcupsutils_type_fix fixed upstream.
+    - Update relibtoolizing patch, 070_mandatory-relibtoolize.
+    - Update patch 071_fix_gdk_window_null_crasher to apply cleanly.
+
+ -- Sebastian Dröge <slomo@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.

debian/control

@@ -2,7 +2,7 @@ Source: gtk+2.0
 Section: libs
 Priority: optional
 Maintainer: Sebastien Bacher <seb128@debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>, Sebastian Dröge <slomo@debian.org>
 Build-Depends: debhelper (>= 5.0.22),
                gettext,
                pkg-config,

debian/patches/034_gtkcupsutils_type_fix.patch

@@ -1,11 +0,0 @@
---- gtk+2.0-2.12.0/modules/printbackends/cups/gtkcupsutils.c.orig	2007-09-13 22:35:49.000000000 +0200
-+++ gtk+2.0-2.12.0/modules/printbackends/cups/gtkcupsutils.c	2007-10-19 12:46:28.000000000 +0200
-@@ -622,7 +622,7 @@ _post_send (GtkCupsRequest *request)
-   if (request->data_io != NULL)
-     {
-       fstat (g_io_channel_unix_get_fd (request->data_io), &data_info);
--      sprintf (length, "%lu", (unsigned long) ippLength (request->ipp_request) + data_info.st_size);
-+      sprintf (length, "%lu", (unsigned long) (ippLength (request->ipp_request) + data_info.st_size));
-     }
-   else
-     sprintf (length, "%lu", (unsigned long) ippLength (request->ipp_request));

debian/patches/071_fix_gdk_window_null_crasher.patch

@@ -1,34 +1,21 @@
---- gdk/gdkwindow.c.orig	2007-10-02 11:22:11.000000000 +0200
-+++ gtk+2.0-2.12.0/gdk/gdkwindow.c	2007-10-02 11:22:20.000000000 +0200
-@@ -609,18 +609,21 @@ gdk_window_get_parent (GdkWindow *window
- GdkWindow*
- gdk_window_get_toplevel (GdkWindow *window)
- {
-   GdkWindowObject *obj;
-   
+--- gdk/gdkwindow.c.old	2007-11-27 05:31:06.000000000 +0100
++++ gtk+2.0-2.12.2/gdk/gdkwindow.c	2007-11-27 05:33:15.000000000 +0100
+@@ -614,9 +614,12 @@
    g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
  
    obj = (GdkWindowObject *)window;
 -  while (GDK_WINDOW_TYPE (obj) == GDK_WINDOW_CHILD)
 +  while (obj && GDK_WINDOW_TYPE (obj) == GDK_WINDOW_CHILD) {
      obj = (GdkWindowObject *)obj->parent;
+-  
 +  }
 +
 +  g_return_val_if_fail (obj != NULL, NULL);
-   
++
    return GDK_WINDOW (obj);
  }
  
- /**
-  * gdk_window_get_children:
-  * @window: a #GdkWindow
-  * 
-@@ -2290,19 +2293,21 @@ gdk_window_update_idle (gpointer data)
-   return FALSE;
- }
- 
- static gboolean
- gdk_window_is_toplevel_frozen (GdkWindow *window)
+@@ -2295,9 +2298,11 @@
  {
    GdkWindowObject *toplevel;
  
@@ -41,17 +28,7 @@
  }
  
  static void
- gdk_window_schedule_update (GdkWindow *window)
- {
-   if (window &&
-       (GDK_WINDOW_OBJECT (window)->update_freeze_count ||
-        gdk_window_is_toplevel_frozen (window)))
-@@ -2428,16 +2433,19 @@ gdk_window_process_all_updates (void)
-   
-   update_windows = NULL;
-   update_idle = 0;
- 
-   g_slist_foreach (old_update_windows, (GFunc)g_object_ref, NULL);
+@@ -2433,6 +2438,9 @@
    
    while (tmp_list)
      {
@@ -60,9 +37,4 @@
 +
        GdkWindowObject *private = (GdkWindowObject *)tmp_list->data;
        
-       if (private->update_freeze_count ||
- 	  gdk_window_is_toplevel_frozen (tmp_list->data))
- 	update_windows = g_slist_prepend (update_windows, private);
-       else
- 	gdk_window_process_updates_internal (tmp_list->data);
-       
+       if (!GDK_WINDOW_DESTROYED (tmp_list->data))

debian/patches/series

@@ -14,7 +14,6 @@
 030_gtkentry_password-char-circle.patch
 031_gtksearchenginetracker_fixes.patch
 033_treeview_resizing.patch
-034_gtkcupsutils_type_fix.patch
 040_filechooser_single-click.patch
 041_ia32-libs.patch
 042_treeview_single-focus.patch