From 8db04484ec9a4a21c05f4fd3367913f8df5a726f Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd@debian.org>
Date: Sat, 9 Oct 2010 21:06:00 +0000
Subject: [PATCH] Cope with new naming/building the gtk documentation

---
 debian/changelog                            | 6 +++++-
 debian/control                              | 1 +
 debian/control.in                           | 1 +
 debian/gruik2devhelp.awk                    | 2 +-
 debian/libgtk3.0-doc.doc-base.gtk-faq       | 2 +-
 debian/libgtk3.0-doc.doc-base.gtk3-tutorial | 2 +-
 6 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a495811425..67474269a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,12 @@ gtk+3.0 (2.91.0-1) experimental; urgency=low
   * Update build-depends to cairo >= 1.10.0 and glib-2.0 >= 2.27.0
   * debian/patches/070_mandatory-relibtoolize.patch
     + Updated
+  * Update the faq/tutorial index files names
+  * debian/control.in:
+    + Add dependency on docbook-utils for db2html to generate the documentation
+      html during build
 
- -- Sjoerd Simons <sjoerd@debian.org>  Sat, 09 Oct 2010 20:35:55 +0100
+ -- Sjoerd Simons <sjoerd@debian.org>  Sat, 09 Oct 2010 22:04:32 +0100
 
 gtk+2.0 (2.21.5-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index b968782d11..d10d17edaa 100644
--- a/debian/control
+++ b/debian/control
@@ -36,6 +36,7 @@ Build-Depends: debhelper (>= 7.0.50~),
                shared-mime-info
 Build-Depends-Indep: gtk-doc-tools (>= 1.8),
                      docbook-xml,
+                     docbook-utils,
                      libglib2.0-doc,
                      libatk1.0-doc,
                      libpango1.0-doc,
diff --git a/debian/control.in b/debian/control.in
index eb5167111c..d1434a70e4 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -36,6 +36,7 @@ Build-Depends: debhelper (>= 7.0.50~),
                shared-mime-info
 Build-Depends-Indep: gtk-doc-tools (>= 1.8),
                      docbook-xml,
+                     docbook-utils,
                      libglib2.0-doc,
                      libatk1.0-doc,
                      libpango1.0-doc,
diff --git a/debian/gruik2devhelp.awk b/debian/gruik2devhelp.awk
index 15f870d260..499a4201d5 100644
--- a/debian/gruik2devhelp.awk
+++ b/debian/gruik2devhelp.awk
@@ -3,7 +3,7 @@
 BEGIN { print "<?xml version=\"1.0\"?>";
         level=1 }
 
-title == 1 { print "<book title=\"" gensub("^>(.*)</TITLE$","\\1",1) "\" name =\"" name "\" link=\"book1.html\">";
+title == 1 { print "<book title=\"" gensub("^>(.*)</TITLE$","\\1",1) "\" name =\"" name "\" link=\"index.html\">";
              print "<chapters>";
              title=0 }
 /^><TITLE/ { title=1 }
diff --git a/debian/libgtk3.0-doc.doc-base.gtk-faq b/debian/libgtk3.0-doc.doc-base.gtk-faq
index aed3359382..30242a572f 100644
--- a/debian/libgtk3.0-doc.doc-base.gtk-faq
+++ b/debian/libgtk3.0-doc.doc-base.gtk-faq
@@ -8,5 +8,5 @@ Abstract: This document is intended to answer questions that are
 Section: Programming/C
 
 Format: HTML
-Index: /usr/share/doc/libgtk3.0-doc/faq/book1.html
+Index: /usr/share/doc/libgtk3.0-doc/faq/index.html
 Files: /usr/share/doc/libgtk3.0-doc/faq/*.html
diff --git a/debian/libgtk3.0-doc.doc-base.gtk3-tutorial b/debian/libgtk3.0-doc.doc-base.gtk3-tutorial
index 97db92333c..815d19fa6b 100644
--- a/debian/libgtk3.0-doc.doc-base.gtk3-tutorial
+++ b/debian/libgtk3.0-doc.doc-base.gtk3-tutorial
@@ -14,5 +14,5 @@ Abstract: GTK+ (GIMP Toolkit) is a library for creating graphical user
 Section: Programming/C
 
 Format: HTML
-Index: /usr/share/doc/libgtk3.0-doc/tutorial/book1.html
+Index: /usr/share/doc/libgtk3.0-doc/tutorial/index.html
 Files: /usr/share/doc/libgtk3.0-doc/tutorial/*.html