r15990 - in /desktop/experimental/yelp/debian: changelog control control.in patches/03_info_crasher.patch patches/04_use_doc-base.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sun May 18 16:26:58 UTC 2008
Author: joss
Date: Sun May 18 16:26:58 2008
New Revision: 15990
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15990
Log:
* 03_info_crasher.patch: new patch, fix crasher in the info parser.
Closes: #461625.
* 04_use_doc-base.patch: add /var/lib/doc-base to XDG_DATA_DIRS so
that doc-base documents are correctly displayed. Closes: #472390.
* Recommend doc-base.
Added:
desktop/experimental/yelp/debian/patches/03_info_crasher.patch
desktop/experimental/yelp/debian/patches/04_use_doc-base.patch
Modified:
desktop/experimental/yelp/debian/changelog
desktop/experimental/yelp/debian/control
desktop/experimental/yelp/debian/control.in
desktop/experimental/yelp/debian/patches/series
Modified: desktop/experimental/yelp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/yelp/debian/changelog?rev=15990&op=diff
==============================================================================
--- desktop/experimental/yelp/debian/changelog (original)
+++ desktop/experimental/yelp/debian/changelog Sun May 18 16:26:58 2008
@@ -1,3 +1,13 @@
+yelp (2.22.1-3) UNRELEASED; urgency=low
+
+ * 03_info_crasher.patch: new patch, fix crasher in the info parser.
+ Closes: #461625.
+ * 04_use_doc-base.patch: add /var/lib/doc-base to XDG_DATA_DIRS so
+ that doc-base documents are correctly displayed. Closes: #472390.
+ * Recommend doc-base.
+
+ -- Josselin Mouette <joss at debian.org> Sun, 18 May 2008 17:23:38 +0200
+
yelp (2.22.1-2) experimental; urgency=low
* Target to experimental; include check-dist.mk.
Modified: desktop/experimental/yelp/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/yelp/debian/control?rev=15990&op=diff
==============================================================================
--- desktop/experimental/yelp/debian/control (original)
+++ desktop/experimental/yelp/debian/control Sun May 18 16:26:58 2008
@@ -36,7 +36,7 @@
docbook-xml (>= 4.1.2),
xml-core,
man-db (>= 2.5.1-1)
-Recommends: ttf-dejavu
+Recommends: ttf-dejavu, doc-base
Replaces: gman
Description: Help browser for GNOME 2
This package contains the GNOME online help browser application.
Modified: desktop/experimental/yelp/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/yelp/debian/control.in?rev=15990&op=diff
==============================================================================
--- desktop/experimental/yelp/debian/control.in (original)
+++ desktop/experimental/yelp/debian/control.in Sun May 18 16:26:58 2008
@@ -36,7 +36,7 @@
docbook-xml (>= 4.1.2),
xml-core,
man-db (>= 2.5.1-1)
-Recommends: ttf-dejavu
+Recommends: ttf-dejavu, doc-base
Replaces: gman
Description: Help browser for GNOME 2
This package contains the GNOME online help browser application.
Added: desktop/experimental/yelp/debian/patches/03_info_crasher.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/yelp/debian/patches/03_info_crasher.patch?rev=15990&op=file
==============================================================================
--- desktop/experimental/yelp/debian/patches/03_info_crasher.patch (added)
+++ desktop/experimental/yelp/debian/patches/03_info_crasher.patch Sun May 18 16:26:58 2008
@@ -1,0 +1,21 @@
+Debian #461625
+GNOME #533718
+
+Index: yelp-2.22.1/src/yelp-info-parser.c
+===================================================================
+--- yelp-2.22.1.orig/src/yelp-info-parser.c 2008-05-18 17:14:54.087169596 +0200
++++ yelp-2.22.1/src/yelp-info-parser.c 2008-05-18 17:23:01.842680735 +0200
+@@ -341,10 +341,12 @@ GtkTreeIter * find_real_sibling (GtkTree
+ gchar *title;
+ gchar *reftitle;
+
+- if (!it) {
++ if (!it || !comp) {
+ return NULL;
+ }
+
++ g_return_val_if_fail (GTK_IS_TREE_MODEL (model), NULL);
++
+ r = gtk_tree_iter_copy (it);
+ tmp = gtk_tree_iter_copy (it);
+
Added: desktop/experimental/yelp/debian/patches/04_use_doc-base.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/yelp/debian/patches/04_use_doc-base.patch?rev=15990&op=file
==============================================================================
--- desktop/experimental/yelp/debian/patches/04_use_doc-base.patch (added)
+++ desktop/experimental/yelp/debian/patches/04_use_doc-base.patch Sun May 18 16:26:58 2008
@@ -1,0 +1,31 @@
+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: desktop/experimental/yelp/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/yelp/debian/patches/series?rev=15990&op=diff
==============================================================================
--- desktop/experimental/yelp/debian/patches/series (original)
+++ desktop/experimental/yelp/debian/patches/series Sun May 18 16:26:58 2008
@@ -1,3 +1,5 @@
01_gecko1.9.patch
02_man-utf8.patch
+03_info_crasher.patch
+04_use_doc-base.patch
70_autotools.patch
More information about the pkg-gnome-commits
mailing list