Merge lp:~mfisch/yelp/update-to-3.8.1 into lp:~ubuntu-desktop/yelp/ubuntu

[Matt Fischer]

Upgrading to 3.8.1 - redo against the ubuntu-desktop branch

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-12 21:43:12 +0000
+++ debian/changelog	2013-05-28 17:03:37 +0000
@@ -1,3 +1,24 @@
+yelp (3.8.1-0ubuntu2) saucy; urgency=low
+
+  * New upstream release (LP: #1184244)
+    - Added test token for classic mode (Matthias Clasen)
+    - Updated translations
+    - Stop checking for pangox and X11 (Emilio Pozuelo Monfort)
+    - Add keywords to the desktop file (Matthias Clasen)
+    - Fixed handling of xref links with anchors, #686095 (Tails developers)
+    - Fixed various memory management bugs, #683100 (Carlos Garcia Campos)
+    - Added local copy of MathJax for MathML display (Shaun McCance)
+    - Added support for xdg help system in All Documents (Shaun McCance)
+    - Fixed if:test="action:install" (Shaun McCance)
+    - Switched to using 'itstool -j' for XSL domain (Shaun McCance)
+  * Refreshed patches, removed some patches that have been unused for some
+    time.
+    - debian/patches/00_no_am_gnu_gettext.patch - Removed, unused
+    - debian/patches/02_man-utf8.patch - Removed, unused
+    - debian/patches/04_man-utf8.patch - Removed, unused
+
+ -- Matthew Fischer <[e-mail]>  Sat, 25 May 2013 20:01:06 -0600
+
 yelp (3.6.2-0ubuntu1) raring; urgency=low
 
   * New upstream release

=== modified file 'debian/control'
--- debian/control	2012-10-23 16:02:52 +0000
+++ debian/control	2013-05-28 17:03:37 +0000
@@ -25,7 +25,7 @@
                zlib1g-dev,
                libbz2-dev,
                liblzma-dev (>= 4.9),
-               libwebkitgtk-3.0-dev (>= 1.3.2),
+               libwebkitgtk-3.0-dev (>= 1.3.10),
                libsqlite3-dev,
                yelp-xsl (>= 3.1.2),
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/yelp/ubuntu

=== removed file 'debian/patches/00_no_am_gnu_gettext.patch'
--- debian/patches/00_no_am_gnu_gettext.patch	2012-05-21 23:53:11 +0000
+++ debian/patches/00_no_am_gnu_gettext.patch	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-From 04600e254d453c66a278b9e4fa259311396e2904 Mon Sep 17 00:00:00 2001
-From: Robert Ancell <[e-mail]>
-Date: Fri, 19 Nov 2010 12:55:59 +1100
-Subject: [PATCH 2/3] Don't use both IT_PROG_INTLTOOL and AM_GNU_GETTEXT
-
----
- configure.ac |    3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
-
-Index: yelp-3.4.2/configure.ac
-===================================================================
---- yelp-3.4.2.orig/configure.ac	2012-05-16 01:38:47.000000000 +1200
-+++ yelp-3.4.2/configure.ac	2012-05-22 11:50:50.154162326 +1200
-@@ -65,9 +65,6 @@
- ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
- AC_SUBST(ALL_LINGUAS)
- 
--AM_GNU_GETTEXT([external])
--AM_GNU_GETTEXT_VERSION([0.17])
--
- GETTEXT_PACKAGE=yelp
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",

=== removed file 'debian/patches/02_man-utf8.patch'
--- debian/patches/02_man-utf8.patch	2011-06-28 09:13:17 +0000
+++ debian/patches/02_man-utf8.patch	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-diff -ru yelp-2.20.0.orig/src/yelp-man-parser.c yelp-2.20.0/src/yelp-man-parser.c
---- yelp-2.20.0.orig/src/yelp-man-parser.c	2007-09-17 21:49:09.000000000 +0100
-+++ yelp-2.20.0/src/yelp-man-parser.c	2008-02-11 10:27:31.000000000 +0000
-@@ -99,12 +99,30 @@
- {
-     GError *errormsg = NULL;
-     /*gchar *ptr = NULL;*/
-+    gchar **recode_argv;
-+    gint recode_stdout_fd;
- 
-     g_return_val_if_fail (parser != NULL, NULL);
-     g_return_val_if_fail (file != NULL, NULL);
-     g_return_val_if_fail (encoding != NULL, NULL);
- 	
--    parser->channel = yelp_io_channel_new_file (file, NULL);
-+    recode_argv = g_new (gchar *, 5);
-+    recode_argv[0] = g_strdup ("man");
-+    recode_argv[1] = g_strdup ("--recode");
-+    recode_argv[2] = g_strdup ("UTF-8");
-+    recode_argv[3] = g_strdup (file);
-+    recode_argv[4] = NULL;
-+    if (g_spawn_async_with_pipes (NULL, recode_argv, NULL,
-+				  G_SPAWN_SEARCH_PATH |
-+				  G_SPAWN_STDERR_TO_DEV_NULL,
-+				  NULL, NULL, NULL,
-+				  NULL, &recode_stdout_fd, NULL,
-+				  NULL)) {
-+	parser->channel = g_io_channel_unix_new (recode_stdout_fd);
-+	encoding = "UTF-8";
-+    } else
-+	parser->channel = yelp_io_channel_new_file (file, NULL);
-+    g_strfreev (recode_argv);
- 
-     if (!parser->channel)
- 	return NULL;

=== removed file 'debian/patches/04_use_doc-base.patch'
--- debian/patches/04_use_doc-base.patch	2011-12-06 19:43:41 +0000
+++ debian/patches/04_use_doc-base.patch	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-Debian-specific patch: add /var/lib/doc-base to the list of dirs that 
-librarian will parse.
-
-Index: yelp-2.22.1/src/yelp-main.c
-===================================================================
---- yelp-2.22.1.orig/src/yelp-main.c	2008-05-18 17:57:16.446670073 +0200
-+++ yelp-2.22.1/src/yelp-main.c	2008-05-18 18:10:37.918680996 +0200
-@@ -341,6 +341,7 @@ main (int argc, char **argv) 
- 	GnomeClient   *client;
- 	gboolean       session_started = FALSE;
- 	gchar *local_id;
-+	gchar *xdg_dirs;
- 	GOptionContext *context;
- 
- 	bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR);  
-@@ -354,6 +355,15 @@ main (int argc, char **argv) 
- 		putenv ("DESKTOP_STARTUP_ID=");
- 	}
- 
-+	xdg_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
-+	if (xdg_dirs) {
-+		xdg_dirs = g_strconcat (xdg_dirs, ":/var/lib/doc-base", NULL);
-+		g_setenv ("XDG_DATA_DIRS", xdg_dirs, TRUE);
-+		g_free (xdg_dirs);
-+	} else {
-+		g_setenv ("XDG_DATA_DIRS", "/usr/local/share:/usr/share:/var/lib/doc-base", TRUE);
-+	}
-+
- 	/* Commandline parsing is done here */
- 	context = g_option_context_new (N_(" GNOME Help Browser"));
- 

=== modified file 'debian/patches/05_menu_tooltip.patch'
--- debian/patches/05_menu_tooltip.patch	2011-08-16 03:44:02 +0000
+++ debian/patches/05_menu_tooltip.patch	2013-05-28 17:03:37 +0000
@@ -1,15 +1,15 @@
 # Description: change title to mention Ubuntu rather than GNOME
 # UbuntuSpecific: Ubuntu branding change
 # 
-Index: yelp-3.1.2/yelp.desktop.in.in
+Index: yelp/yelp.desktop.in.in
 ===================================================================
---- yelp-3.1.2.orig/yelp.desktop.in.in	2011-08-15 19:00:42.370279582 -0400
-+++ yelp-3.1.2/yelp.desktop.in.in	2011-08-15 19:00:58.480617127 -0400
+--- yelp.orig/yelp.desktop.in.in	2013-05-25 20:40:29.942231688 -0600
++++ yelp/yelp.desktop.in.in	2013-05-25 20:42:26.222228288 -0600
 @@ -1,6 +1,6 @@
  [Desktop Entry]
  _Name=Help
 -_Comment=Get help with GNOME
 +_Comment=Get help with Unity
+ _Keywords=documentation;information;manual;
  OnlyShowIn=GNOME;Unity;
  Exec=yelp %u
- Icon=help-browser

=== modified file 'debian/patches/07_disable_package_search.patch'
--- debian/patches/07_disable_package_search.patch	2012-05-21 23:53:11 +0000
+++ debian/patches/07_disable_package_search.patch	2013-05-28 17:03:37 +0000
@@ -4,11 +4,11 @@
 Forwarded: not-needed
 Bug: https://bugs.launchpad.net/bugs/838540
 Author: Jeremy Bicha <[e-mail]>
-Index: yelp-3.4.2/libyelp/yelp-view.c
+Index: yelp/libyelp/yelp-view.c
 ===================================================================
---- yelp-3.4.2.orig/libyelp/yelp-view.c	2012-02-29 15:30:23.000000000 +1300
-+++ yelp-3.4.2/libyelp/yelp-view.c	2012-05-22 11:50:55.570162401 +1200
-@@ -1731,10 +1731,6 @@
+--- yelp.orig/libyelp/yelp-view.c	2013-05-25 20:42:37.882227947 -0600
++++ yelp/libyelp/yelp-view.c	2013-05-25 20:42:37.874227947 -0600
+@@ -1734,10 +1734,6 @@
              scheme = "ghelp";
              pkg = struri + 6;
          }