r14595 - in /desktop/unstable/yelp/debian: changelog control control.in patches/02_man-utf8.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Feb 16 01:04:59 2008
New Revision: 14595

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14595
Log:
* Depend on man-db 2.5.1-1.
* 02_man-utf8.patch: patch from Colin Watson to recode manual pages
  to UTF-8 using Debian’s man-db. Closes: #465229.
* Standards version is 3.7.3.

Added:
    desktop/unstable/yelp/debian/patches/02_man-utf8.patch
Modified:
    desktop/unstable/yelp/debian/changelog
    desktop/unstable/yelp/debian/control
    desktop/unstable/yelp/debian/control.in

Modified: desktop/unstable/yelp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/yelp/debian/changelog?rev=14595&op=diff
==============================================================================
--- desktop/unstable/yelp/debian/changelog (original)
+++ desktop/unstable/yelp/debian/changelog Sat Feb 16 01:04:59 2008
@@ -6,8 +6,12 @@
   [ Josselin Mouette ]
   * 01_html_crash.patch: stolen from upstream SVN. Fix a crash when
     opening HTML files. Closes: #448386.
-
- -- Josselin Mouette <joss at debian.org>  Tue, 04 Dec 2007 15:51:23 +0100
+  * Depend on man-db 2.5.1-1.
+  * 02_man-utf8.patch: patch from Colin Watson to recode manual pages
+    to UTF-8 using Debian’s man-db. Closes: #465229.
+  * Standards version is 3.7.3.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 16 Feb 2008 01:51:38 +0100
 
 yelp (2.20.0-1) unstable; urgency=low
 

Modified: desktop/unstable/yelp/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/yelp/debian/control?rev=14595&op=diff
==============================================================================
--- desktop/unstable/yelp/debian/control (original)
+++ desktop/unstable/yelp/debian/control Sat Feb 16 01:04:59 2008
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 Build-Depends: debhelper (>= 5),
                gnome-pkg-tools (>= 0.10),
                cdbs (>= 0.4.41),
@@ -32,7 +32,8 @@
          ${misc:Depends},
          gnome-doc-utils,
          docbook-xml (>= 4.1.2),
-         xml-core
+         xml-core,
+         man-db (>= 2.5.1-1)
 Recommends: ttf-dejavu
 Replaces: gman
 Description: Help browser for GNOME 2

Modified: desktop/unstable/yelp/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/yelp/debian/control.in?rev=14595&op=diff
==============================================================================
--- desktop/unstable/yelp/debian/control.in (original)
+++ desktop/unstable/yelp/debian/control.in Sat Feb 16 01:04:59 2008
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 Build-Depends: debhelper (>= 5),
                gnome-pkg-tools (>= 0.10),
                cdbs (>= 0.4.41),
@@ -32,7 +32,8 @@
          ${misc:Depends},
          gnome-doc-utils,
          docbook-xml (>= 4.1.2),
-         xml-core
+         xml-core,
+         man-db (>= 2.5.1-1)
 Recommends: ttf-dejavu
 Replaces: gman
 Description: Help browser for GNOME 2

Added: desktop/unstable/yelp/debian/patches/02_man-utf8.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/yelp/debian/patches/02_man-utf8.patch?rev=14595&op=file
==============================================================================
--- desktop/unstable/yelp/debian/patches/02_man-utf8.patch (added)
+++ desktop/unstable/yelp/debian/patches/02_man-utf8.patch Sat Feb 16 01:04:59 2008
@@ -1,0 +1,35 @@
+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;