Merge lp:~ubuntu-branches/ubuntu/maverick/devhelp/maverick-201009301413 into lp:ubuntu/maverick/devhelp

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/maverick/devhelp now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/devhelp/maverick-201009301413. A merge should be performed if necessary.

Unmerged revisions

15. By Michael Terry on 2010-09-29

* debian/patches/ftbfs-drop-gtknotebookpage.patch:
  - Patch taken from upstream that fixes compilation with latest GTK+
    LP: #651255

=== added file 'debian/patches/ftbfs-drop-gtknotebookpage.patch'
--- debian/patches/ftbfs-drop-gtknotebookpage.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ftbfs-drop-gtknotebookpage.patch	2010-09-30 14:19:41 +0000
@@ -0,0 +1,59 @@
+Author: Frédéric Péters <[e-mail]>
+Subject: GtkNotebookPage has been removed in GTK+
+Origin: http://git.gnome.org/browse/devhelp/commit/?id=ae2897ec20de184ff793e0bdc78f72c57a89f030
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/devhelp/+bug/651255
+
+---
+Index: devhelp/src/dh-util.c
+===================================================================
+--- devhelp.orig/src/dh-util.c	2010-09-29 11:40:17.166239000 -0400
++++ devhelp/src/dh-util.c	2010-09-29 11:46:18.902273003 -0400
+@@ -494,7 +494,7 @@
+ 
+ static void
+ util_state_notebook_switch_page_cb (GtkWidget       *notebook,
+-                                    GtkNotebookPage *page,
++                                    gpointer         page,
+                                     guint            page_num,
+                                     gpointer         user_data)
+ {
+Index: devhelp/src/dh-window.c
+===================================================================
+--- devhelp.orig/src/dh-window.c	2010-09-29 11:40:17.166239000 -0400
++++ devhelp/src/dh-window.c	2010-09-29 11:46:18.902273003 -0400
+@@ -979,7 +979,7 @@
+  */
+ static void
+ window_control_switch_page_cb (GtkWidget       *notebook,
+-                               GtkNotebookPage *page,
++                               gpointer         page,
+                                guint            page_num,
+                                DhWindow        *window)
+ {
+@@ -994,7 +994,7 @@
+ 
+ static void
+ window_control_after_switch_page_cb (GtkWidget       *notebook,
+-                                     GtkNotebookPage *page,
++                                     gpointer         page,
+                                      guint            page_num,
+                                      DhWindow        *window)
+ {
+@@ -1009,7 +1009,7 @@
+ 
+ static void
+ window_web_view_switch_page_cb (GtkNotebook     *notebook,
+-                                GtkNotebookPage *page,
++                                gpointer         page,
+                                 guint            new_page_num,
+                                 DhWindow        *window)
+ {
+@@ -1047,7 +1047,7 @@
+ 
+ static void
+ window_web_view_switch_page_after_cb (GtkNotebook     *notebook,
+-                                      GtkNotebookPage *page,
++                                      gpointer         page,
+                                       guint            new_page_num,
+                                       DhWindow        *window)
+ {

=== renamed file 'debian/patches/ftbfs-drop-gtknotebookpage.patch' => 'debian/patches/ftbfs-drop-gtknotebookpage.patch.moved'