Merge lp:~cyphermox/devhelp/lp704096 into lp:~ubuntu-desktop/devhelp/ubuntu

[Mathieu Trudel-Lapierre]

To fix gconf schema errors introduced by devhelp-common:

WARNING: Failed to parse default value `' for schema (/schemas/apps/devhelp/state/main/contents/books_disabled)

As per bug 704096.

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2011-03-28 18:50:16 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+merge = True

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-13 16:47:15 +0000
+++ debian/changelog	2011-03-28 18:50:16 +0000
@@ -1,3 +1,11 @@
+devhelp (2.32.0-0ubuntu3) UNRELEASED; urgency=low
+
+  * debian/patches/99git_gconf_books_disabled_default_2b31353.patch:
+    Set a correct default value of empty for the gconf setting
+    state/main/contents/books_disabled (backported from 2.91.4) (LP: #704096)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 28 Mar 2011 14:33:32 -0400
+
 devhelp (2.32.0-0ubuntu2) natty; urgency=low
 
   * debian/control.in: Update build and binary dependencies for current

=== added file 'debian/patches/99git_gconf_books_disabled_default_2b31353.patch'
--- debian/patches/99git_gconf_books_disabled_default_2b31353.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/99git_gconf_books_disabled_default_2b31353.patch	2011-03-28 18:50:16 +0000
@@ -0,0 +1,22 @@
+From 2b3135317d953f8d1a14288726fd1bc66671699d Mon Sep 17 00:00:00 2001
+From: Yanko Kaneti <[e-mail]>
+Date: Fri, 03 Dec 2010 02:25:40 +0000
+Subject: Fix default value for list type key state/main/contents/books_disabled
+
+https://bugzilla.gnome.org/show_bug.cgi?id=636339
+---
+diff --git a/data/devhelp.schemas.in b/data/devhelp.schemas.in
+index c30d76a..38bb62b 100644
+--- a/data/devhelp.schemas.in
++++ b/data/devhelp.schemas.in
+@@ -132,7 +132,7 @@
+       <owner>devhelp</owner>
+       <type>list</type>
+       <list_type>string</list_type>
+-      <default></default>
++      <default>[]</default>
+       <locale name="C">
+          <short>Books disabled</short>
+          <long>List of books disabled by the user.</long>
+--
+cgit v0.9

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-11-29 06:13:36 +0000
+++ debian/patches/series	2011-03-28 18:50:16 +0000
@@ -1,1 +1,2 @@
 00install-devhelp-el.patch
+99git_gconf_books_disabled_default_2b31353.patch