--- yelp-2.28.0+webkit.orig/debian/changelog +++ yelp-2.28.0+webkit/debian/changelog @@ -0,0 +1,803 @@ +yelp (2.28.0+webkit-1ubuntu1) lucid; urgency=low + + * Merge with Debian unstable, remaining changes: + * debian/control.in: + - Bump build-depend version for libglib2.0-dev + - LP integration + - Change recommend on ttf-dejavu to suggests + - Add BZR link + * debian/patches/01_lpi.patch: + * debian/patches/02_autoconf.patch: + - LP integration + * debian/patches/03_info_crasher.patch: + - Don't use this debian change since upstream indicated it creates issues + * debian/patches/04_new_ubuntu_layout.patch: + - Ubuntu index layout + * debian/patches/05_menu_tooltip.patch: + - Change tooltip from "Get help with GNOME" to "Get help with Ubuntu" + * debian/patches/06_ubuntu_online_url.patch: + - Use an Ubuntu online url + * debian/watch: + - Watch for unstable versions + + -- Robert Ancell Tue, 08 Dec 2009 15:03:20 +1100 + +yelp (2.28.0+webkit-1) unstable; urgency=low + + * New upstream release, based on the freshly merged webkit branch. + * Update build-dependencies. + * 06_text_plain.patch: removed, merged upstream. + * 10_hurd_path-max.patch, 70_autotools.patch: removed, obsolete. + * This upload is brought to you by the Cabalistic Lizard Hunting + Association. + + -- Josselin Mouette Wed, 23 Sep 2009 22:29:43 +0200 + +yelp (2.26.0-3) unstable; urgency=low + + [ Josselin Mouette ] + * 10_hurd_path-max.patch: new patch. Fix build on hurd. + Closes: #531073. + + [ Emilio Pozuelo Monfort ] + * Standards-Version is 3.8.3, no chanes needed. + + -- Emilio Pozuelo Monfort Sat, 29 Aug 2009 01:25:14 +0200 + +yelp (2.26.0-2) unstable; urgency=low + + * 04_use_doc-base.patch: disable for now, it’s really too slow to be + usable. Furthermore, documents are not classified. + * Stop recommending doc-base. + + -- Josselin Mouette Mon, 29 Jun 2009 23:32:05 +0200 + +yelp (2.26.0-1) unstable; urgency=low + + * Stop mentioning GNOME 2. + * Add a versioned breaks with scrollkeeper to force it out of users’ + systems. + * Recommend gnome-user-guide. Closes: #528017. + * New upstream release. + * 07_url_localfile.patch, 08_html_livelock.patch: dropped, merged + upstream. + * 70_autotools.patch: regenerated for the new version. + * Bump gnome-doc-utils build-dep. + + -- Josselin Mouette Tue, 09 Jun 2009 19:25:26 +0200 + +yelp (2.24.0-2) unstable; urgency=low + + * Upload to unstable; drop check-dist include. + + -- Josselin Mouette Thu, 05 Mar 2009 11:28:16 +0100 + +yelp (2.24.0-1) experimental; urgency=low + + [ Mario Lang ] + * New upstream stable release. + * debian/rules: Include check-dist.mk. + * debian/patches/01_gecko1.9.patch: Removed, applied upstream. + * debian/patches/05_txt_crash.patch: Removed, applied upstream. + * debian/patches/07_crash_info.patch: Removed, applied upstream. + * debian/patches/60_format-string.patch: Removed, applied upstream. + * debian/rules: Drop libgnomevfs2-dev from Build-Depends. + + [ Josselin Mouette ] + * Add glib 2.15.2 build-dependency for gio. + * Regenerate 70_autotools.patch, and document how to do it. + * Force the search implementation to be the basic one. + * 07_url_localfile.patch: new patch. Get GIO to read paths as well as + URIs. + * 06_text_plain.patch: do not kill handling of info and man pages + through file: URIs. + * 08_html_livelock.patch: new patch. Do not loop endlessly at the end + of files. + + -- Josselin Mouette Tue, 23 Dec 2008 19:33:13 +0100 + +yelp (2.22.1-8) unstable; urgency=low + + * 07_crash_info.patch: patch from JHM Dassen (Ray) to fix crash when + viewing libc.info. Closes: #452747. + + -- Josselin Mouette Sun, 31 Aug 2008 15:24:52 +0200 + +yelp (2.22.1-7) unstable; urgency=low + + * 05_txt_crash.patch: fix crash when trying to view a text file. + Closes: #497086. + * 06_text_plain.patch: support text/plain files, so that the text + documentation is viewable. + * Standards version is 3.8.0, no changes needed. + + -- Josselin Mouette Sun, 31 Aug 2008 10:25:38 +0200 + +yelp (2.22.1-6) unstable; urgency=low + + * Add CVE identifier in 2.22.1-4 and 60_format-string. + * Re-upload for a clean diff, fixing builds. (Closes: #495032) + + -- Marc 'HE' Brockschmidt Thu, 14 Aug 2008 11:47:38 +0200 + +yelp (2.22.1-5) unstable; urgency=low + + * Rebuild 70_autotools with libtoolize --force --copy && aclocal-1.9 -I m4 + && autoheader && autoconf && automake-1.9 && autoheader && rm -rf + autom4te.cache config.h.in~. + + -- Loic Minier Wed, 13 Aug 2008 18:55:53 +0200 + +yelp (2.22.1-4) unstable; urgency=high + + * SECURITY: New patch, 60_format-string, fixes format string vulnerability; + bump urgency to high; CVE-2008-3533; GNOME #546364; from SVN r3173; + LP: #254860. + + -- Loic Minier Wed, 13 Aug 2008 14:43:03 +0200 + +yelp (2.22.1-3) unstable; 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. + * Upload to unstable; drop check-dist include. + * Update (build-)deps to 1.9~rc1. + + -- Josselin Mouette Sun, 18 May 2008 17:23:38 +0200 + +yelp (2.22.1-2) experimental; urgency=low + + * Target to experimental; include check-dist.mk. + * Switch to quilt for patch handling; build-depend on quilt. + * Build-depend on xulrunner-dev and depend on xulrunner-1.9. + * 01_gecko1.9.patch: patch from Alexander Sack and Christian Persch to + get yelp to build against gecko 1.9. + * Pass --with-gecko=libxul-embedding to use it. Closes: #480815. + * 70_autotools.patch: run the autotools on top of that. + + -- Josselin Mouette Mon, 12 May 2008 18:53:30 +0200 + +yelp (2.22.1-1) unstable; urgency=low + + * New upstream bugfix release. + + -- Sebastian Dröge Tue, 08 Apr 2008 13:18:56 +0200 + +yelp (2.22.0-1) unstable; urgency=low + + * New upstream stable release: + + debian/control.in: + - Build depend on librarian-dev (>= 0.7.0). + + debian/patches/01_html_crash.patch: + - Dropped, merged upstream. + + -- Sebastian Dröge Fri, 14 Mar 2008 13:24:51 +0100 + +yelp (2.20.0-2) unstable; urgency=low + + [ Loic Minier ] + * Set GNOME Team as maintainer. + + [ Josselin Mouette ] + * 01_html_crash.patch: stolen from upstream SVN. Fix a crash when + opening HTML files. Closes: #448386. + * 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 Sat, 16 Feb 2008 01:51:38 +0100 + +yelp (2.20.0-1) unstable; urgency=low + + [ Loic Minier ] + * New patch, 60_desktop-file-no-icon-suffix, drops icon filename suffix from + the .desktop file to permit proper theming; thanks Tony Houghton; + closes: #431366. + + [ Frederic Peters ] + * New upstream release: + + added build-depends on librarian-dev. + + 60_desktop-file-no-icon-suffix: dropped, merged upstream. + + -- Loic Minier Sun, 23 Sep 2007 20:14:09 +0200 + +yelp (2.18.1-1) unstable; urgency=low + + * Upload to unstable; drop check-dist include. + * Wrap deps and build-deps. + * New upstream stable release; translations. + + -- Loic Minier Sat, 14 Apr 2007 14:22:16 +0200 + +yelp (2.18.0-1) experimental; urgency=low + + [ Josselin Mouette ] + * Recommend ttf-dejavu (closes: #366760). + + [ Marc 'HE' Brockschmidt ] + * New upstream release; only bug fixes + * Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on + cdbs >= 0.4.41. + * Prepend -Wl,-z,defs before -Wl,--as-needed in LDFLAGS. + * Don't overwrite DEB_CONFIGURE_EXTRA_FLAGS. + * Bump debhelper compat level to 5, add fitting build-dep + * Update/complete debian/copyright + + -- Marc 'HE' Brockschmidt Sun, 01 Apr 2007 16:42:32 +0200 + +yelp (2.16.2-2) experimental; urgency=low + + [ Josselin Mouette ] + * Build-depend on libxt-dev (closes: #405221). + + [ Loic Minier ] + * Add a get-orig-source target to retrieve the upstream tarball. + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + * Bump up libgnomeui-dev build-dep to >= 2.16.0-2, first version post the + Gtk transition. + + -- Loic Minier Tue, 30 Jan 2007 21:42:17 +0100 + +yelp (2.16.2-1) experimental; urgency=low + + * New upstream release. + + -- Josselin Mouette Tue, 21 Nov 2006 20:27:12 +0100 + +yelp (2.16.0-1) experimental; urgency=low + + * New upstream release. + * 70_mandatory-relibtoolize.patch: removed, it isn't needed anymore. + * Remove build-dependencies on libgnomeprint and libbonobo. + * Bump intltool requirement to 0.35.0. + * Increase build-dependencies appropriately. + * Require libdbus-glib-1-dev and zlib1g-dev. + * Standards-version is 3.7.2. + * Update watch file. + + -- Josselin Mouette Sun, 10 Sep 2006 22:26:16 +0200 + +yelp (2.14.3-1) unstable; urgency=low + + * New upstream release. + + -- Loic Minier Mon, 7 Aug 2006 22:37:01 +0200 + +yelp (2.14.2-2) unstable; urgency=low + + * Relibtoolize with autoconf 2.59a-9 as newer versions require another level + of shell expansion to resolve datadir, and hence cause the + AM_GLIB_DEFINE_LOCALEDIR macro to fail miserably. + [debian/patches/70_mandatory-relibtoolize.patch] + + -- Loic Minier Sun, 4 Jun 2006 17:59:55 +0200 + +yelp (2.14.2-1) unstable; urgency=low + + * New upstream release. + - Now handles inclusion of a man page. (Closes: #320731) + - Fully relibtoolize and rename relibtoolizing patch; this is mandatory + for configure to properly detect the X libraries. + [debian/patches/01_reautoconf.patch, + debian/patches/70_mandatory-relibtoolize.patch] + + -- Loic Minier Tue, 30 May 2006 16:51:39 +0200 + +yelp (2.14.1-1) unstable; urgency=low + + [ J.H.M. Dassen (Ray) ] + * New upstream release. + * [debian/control.in] Added libgnomeprint2.2-dev, libgnomeprintui2.2-dev,o + libstartup-notification0-dev build dependencies per configure.in . + * [debian/patches/01_reautoconf.patch] New, fix the X11 test in configure . + + [ Josselin Mouette ] + * Update watch file. + * Use debhelper compatibility mode 4. + * links, rules: use dh_link for the manual page. + * copyright: update download link. + * Add missing build-dependencies: libgconf2-dev, libgnomevfs2-dev, + libbonobo2-dev, libglade2-dev, libxml2-dev. + + -- Josselin Mouette Thu, 27 Apr 2006 19:25:56 +0200 + +yelp (2.12.2-4) unstable; urgency=low + + * Remove the dependency on xulrunner, it is unneeded as of xulrunner + 1.8.0.1-4. + + -- Josselin Mouette Tue, 21 Feb 2006 20:24:08 +0100 + +yelp (2.12.2-3) unstable; urgency=low + + * The "kill the lizard" release. + * rules: use xulrunner's mozilla engine. + Closes: #322991, #309640, #316653, #314401, #351977. + * control.in: + + Build-depend on libxul-dev, remove dependencies on mozilla. + + Add a temporary dependency on xulrunner. + * scollbar.patch: removed, useless. + + -- Josselin Mouette Mon, 20 Feb 2006 22:43:15 +0100 + +yelp (2.12.2-2) unstable; urgency=low + + * Upload to unstable. + + -- Josselin Mouette Sun, 8 Jan 2006 14:44:54 +0100 + +yelp (2.12.2-1) experimental; urgency=low + + * New upstream release. + - Drop startup crashing patch, merged upstream. + [debian/patches/yelp-fix-crash-on-startup.patch] + + -- Loic Minier Mon, 28 Nov 2005 21:46:57 +0100 + +yelp (2.12.1-3) experimental; urgency=low + + * scrollbar.patch: set the mozilla theme to "classic" to avoid + displaying an ugly mozilla-"modern" scrollbar (closes: #339490). + * control.in: remove build-dependency on gtkhtml (unused). + + -- Josselin Mouette Wed, 16 Nov 2005 23:37:17 +0100 + +yelp (2.12.1-2) experimental; urgency=high + + * Revert the stupid change of the mozilla-browser dep in a mozilla-dev dep. + [debian/control, debian/control.in] + + -- Loic Minier Sat, 5 Nov 2005 18:13:31 +0100 + +yelp (2.12.1-1) experimental; urgency=low + + * New upstream versions. + - Bump gnome-doc-utils build-dep to >= 0.3.1. [debian/control, + debian/control.in] + - Update watch file. [debian/watch] + * Drop the version in mozilla deps (always satisfied in unstable and + testing). [debian/control, debian/control.in] + * Describe command-line file passing in the manual page. (Closes: #287027) + [debian/yelp.sgml] + * Mention Desktop > Help instead of Applications > Help in manual page. + (Closes: #315179) [debian/yelp.sgml] + + -- Loic Minier Thu, 27 Oct 2005 21:42:31 +0200 + +yelp (2.10.0-3) unstable; urgency=high + + [ Josselin Mouette ] + * Standards-version is 3.6.2. + * Depend on ${misc:Depends} (high urgency fix). + + [ Loic Minier ] + * Bump mozilla-dev to 1.7.12 to get a C++ transitionned mozilla. + * Add CDBS' utils. + * Clarify license/versus copyright. + + -- Loic Minier Fri, 14 Oct 2005 11:37:20 +0200 + +yelp (2.10.0-2) unstable; urgency=low + + * Upload to unstable. + * Don't overwrite DEB_CONFIGURE_SCRIPT_ENV completely. + + -- Josselin Mouette Thu, 9 Jun 2005 23:52:40 +0200 + +yelp (2.10.0-1) experimental; urgency=low + + * New upstream release. + + Theme colors display correctly with industrial engine (closes: #254463). + + Space now pages down (closes: #201847). + * rules: + + Enable man and info support: (closes: #303791). + + Don't relibtoolize anymore. + + Pass --as-needed to ld. + * control.in: + + Don't build-depend on libtool. + + Require debhelper 4.1 (for cdbs). + + Build-depend and depend on gnome-doc-utils. + + Build-depend on mozilla-dev 1.7. + + Depend on mozilla-browser 1.7. + + Build-depend on libbz2-dev. + * Update watch file. + * yelp-fix-crash-on-startup.patch: new patch from Ubuntu, to avoid a double + free. + + -- Josselin Mouette Mon, 9 May 2005 19:42:20 +0200 + +yelp (2.6.5-1) unstable; urgency=medium + + * New upstream maintenance release (typo fixes; translation updates). + + -- J.H.M. Dassen (Ray) Sun, 12 Dec 2004 14:11:11 +0100 + +yelp (2.6.4-2) unstable; urgency=low + + * Removed the "See Also" section of the man page and added a pointer to + the `--help' command line option. (closes: #282719) + + -- Jerry Haltom Thu, 25 Nov 2004 22:29:17 -0600 + +yelp (2.6.4-1) unstable; urgency=low + + * New upstream maintenance release. + + -- J.H.M. Dassen (Ray) Tue, 12 Oct 2004 11:49:31 +0200 + +yelp (2.6.3-2) unstable; urgency=low + + * Removed the conflict against gman. + * [debian/patches/01_relibtoolize.patch] Removed (added to rules + file). + + -- Jerry Haltom Sat, 9 Oct 2004 23:12:06 -0500 + +yelp (2.6.3-1) unstable; urgency=medium + + * New upstream release (translation updates only). + * [debian/patches/02_ga.po-typo.patch] Removed (integrated upstream). + + -- J.H.M. Dassen (Ray) Tue, 14 Sep 2004 08:12:44 +0200 + +yelp (2.6.2-1) unstable; urgency=medium + + * New upstream bugfix releases (crashes and leaks fixed; translations + updated). + * [debian/patches/01_relibtoolize.patch] Updated. + * [debian/patches/02_ga.po-typo.patch] Added. + + -- J.H.M. Dassen (Ray) Tue, 31 Aug 2004 18:53:28 +0200 + +yelp (2.6.1-4) unstable; urgency=low + + * Removed references to man and info from the description. + * Replaced Conflict with gman with Replaces. Gman still has man and + info page support, so some users might want to use it still. + (closes: #251081) + * Acknowledge NMU. Thanks Josselin! Reported and uploaded before I + even noticed. + + -- Jerry Haltom Fri, 6 Aug 2004 22:04:17 -0500 + +yelp (2.6.1-3) unstable; urgency=low + + * Rebuild against libgnutls11 (closes: #263673). + * control.in: build-depend on libgnomeui 2.6.1.1-4 to enforce the + libgnutls11 dependency. + + -- Josselin Mouette Thu, 5 Aug 2004 16:35:23 +0200 + +yelp (2.6.1-2) unstable; urgency=low + + * GNOME Team Upload. + * Upload in unstable. + + -- Sebastien Bacher Thu, 27 May 2004 00:43:30 +0200 + +yelp (2.6.1-1) experimental; urgency=low + + * New upstream release. + * Adjusted build dependency versions and added libgtk2.0-dev. + + -- Jerry Haltom Thu, 22 Apr 2004 10:48:11 -0500 + +yelp (2.6.0-3) experimental; urgency=low + + * [debian/patches/01_relibtoolize.patch] New. Generated with new libtool to + cut down on library dependencies. + * Fixed some XML errors in debian/yelp.sgml man page. + + -- Jerry Haltom Sun, 11 Apr 2004 14:00:13 -0500 + +yelp (2.6.0-2) experimental; urgency=low + + * Upstream changes not mentioned but important from initial 2.6.0-1 upload: + + Upstream has removed man/info pages pending the finish of a complete + rewrite. (Closes: #177167, #236203, #181979) + + Upstream has redone the way the left side pane works. (Closes: #217808) + + Rewrite of HTML transformations, resulting in 30(!) time speed increase, + according to upstream. (Closes: #207439). + + -- Jerry Haltom Sat, 3 Apr 2004 13:55:03 -0600 + +yelp (2.6.0-1) experimental; urgency=low + + * New upstream release. + * Packable build system converted to cdbs. + * Took maintainership. + + -- Jerry Haltom Fri, 19 Mar 2004 17:46:05 -0600 + +yelp (2.4.2-4) unstable; urgency=low + + * Update 01_yelp-db2html.c patch to the new docbook-xml path (Closes: #231409) + + -- Christian Marillat Fri, 6 Feb 2004 15:54:31 +0100 + +yelp (2.4.2-3) unstable; urgency=low + + * Removed 04_catalog.in patch, now we use the docbook-xsl catalog, and + update dependecy to docbook-xsl 1.64.1.0-1 (Closes: #230168) + + -- Christian Marillat Thu, 29 Jan 2004 09:00:34 +0100 + +yelp (2.4.2-2) unstable; urgency=low + + * Build agaisnt the latest libxslt1-dev (Closes: #227085) + + -- Christian Marillat Sun, 11 Jan 2004 09:53:50 +0100 + +yelp (2.4.2-1) unstable; urgency=low + + * New upstream release. + * New patch to fix namespace error messages (Closes: #221484) + + -- Christian Marillat Sun, 28 Dec 2003 13:50:58 +0100 + +yelp (2.4.1-2) unstable; urgency=low + + * Update Build-Depends to GNOME 2.4 packages + + -- Christian Marillat Tue, 4 Nov 2003 16:30:49 +0100 + +yelp (2.4.1-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 14 Oct 2003 11:19:01 +0200 + +yelp (2.2.3-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Thu, 26 Jun 2003 09:08:38 +0200 + +yelp (2.2.2-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 6 Jun 2003 20:20:20 +0200 + +yelp (2.2.1-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Thu, 5 Jun 2003 21:31:02 +0200 + +yelp (2.2.0-2) unstable; urgency=low + + * Update section + + -- Christian Marillat Tue, 1 Apr 2003 18:31:44 +0200 + +yelp (2.2.0-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 20 Jan 2003 22:48:09 +0100 + +yelp (2.1.5-2) unstable; urgency=low + + * Conflicts with gman (Closes: #176902) + + -- Christian Marillat Wed, 15 Jan 2003 21:22:54 +0100 + +yelp (2.1.5-1) unstable; urgency=low + + * New upstream release. + * Use the colour text from the gtk theme (Closes: #168130) + + -- Christian Marillat Tue, 14 Jan 2003 13:02:01 +0100 + +yelp (2.1.4-1) unstable; urgency=low + + * New upstream release. + * Bump Standards-Version to 3.5.8 + + -- Christian Marillat Wed, 8 Jan 2003 17:40:28 +0100 + +yelp (1.0.7-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 19 Nov 2002 00:02:31 +0100 + +yelp (1.0.6-2) unstable; urgency=low + + * Update to standards version 3.5.7 + * Fix harcoded path to use pixmaps in the docbook-xsl package (Closes: #166956) + + -- Christian Marillat Tue, 29 Oct 2002 21:36:16 +0100 + +yelp (1.0.6-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 6 Sep 2002 13:45:39 +0200 + +yelp (1.0.5-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Thu, 29 Aug 2002 20:12:49 +0200 + +yelp (1.0.3-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Wed, 14 Aug 2002 14:26:45 +0200 + +yelp (1.0.2-2) unstable; urgency=low + + * Move yelp-db2html in /usr/lib/yelp (Closes: #156359) + + -- Christian Marillat Mon, 12 Aug 2002 09:54:34 +0200 + +yelp (1.0.2-1) unstable; urgency=low + + * New upstream release. + * Icon in about window is displayed (Closes: #155203) + + -- Christian Marillat Wed, 7 Aug 2002 11:46:10 +0200 + +yelp (1.0.1-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Wed, 19 Jun 2002 15:07:03 +0200 + +yelp (1.0-2) unstable; urgency=low + + * Compiled against the latest libgail + * Another hack to use the dtd in the docbook-xsl package + + -- Christian Marillat Mon, 17 Jun 2002 15:24:03 +0200 + +yelp (1.0-1) unstable; urgency=low + + * New upstream release + + -- Christian Marillat Mon, 10 Jun 2002 18:14:30 +0200 + +yelp (0.10-2) unstable; urgency=low + + * Compiled against the latest libraries. + + -- Christian Marillat Sun, 9 Jun 2002 18:41:33 +0200 + +yelp (0.10-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 4 Jun 2002 10:57:06 +0200 + +yelp (0.9.1-1) unstable; urgency=low + + * new upstream release. + + -- Christian Marillat Fri, 31 May 2002 14:13:32 +0200 + +yelp (0.9-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 27 May 2002 19:30:02 +0200 + +yelp (0.8-2) unstable; urgency=low + + * Should depends on libgnome2-bin + + -- Christian Marillat Tue, 21 May 2002 11:39:13 +0200 + +yelp (0.8-1) unstable; urgency=low + + * New upstream release. + * No more segfault (Closes: #147155) + + -- Christian Marillat Tue, 21 May 2002 09:49:55 +0200 + +yelp (0.7-1) unstable; urgency=low + + * New upstream release. + * Add support for DEB_HOST_GNU_TYPE DEB_BUILD_GNU_TYPE and + DEB_BUILD_OPTIONS + + -- Christian Marillat Wed, 15 May 2002 22:26:05 +0200 + +yelp (0.6.1-2) unstable; urgency=low + + * Include NEWS, README and TODO files (Closes: #145252) + * Add a Debian menu file + + -- Christian Marillat Tue, 30 Apr 2002 14:51:35 +0200 + +yelp (0.6.1-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 29 Apr 2002 17:36:32 +0200 + +yelp (0.6-1) unstable; urgency=low + + * New upstream release. + * Display an error message if documentation files are missing + (Closes: #140585) + * Doesn't crash anymore with nautilus documentation (Closes: #140584) + + -- Christian Marillat Mon, 22 Apr 2002 17:13:03 +0200 + +yelp (0.5-2) unstable; urgency=low + + * Build against the latest libraries. + + -- Christian Marillat Mon, 8 Apr 2002 23:37:20 +0200 + +yelp (0.5-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 25 Mar 2002 18:04:55 +0100 + +yelp (0.4-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 22 Mar 2002 21:12:19 +0100 + +yelp (0.3-2) unstable; urgency=low + + * Don't need to conflicts with gnome-help (Closes: #137962) + + -- Christian Marillat Wed, 13 Mar 2002 10:32:47 +0100 + +yelp (0.3-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 5 Mar 2002 14:01:17 +0100 + +yelp (0.2.1-4) unstable; urgency=low + + * Should build-depends on intltool. + + -- Christian Marillat Mon, 25 Feb 2002 15:33:35 +0100 + +yelp (0.2.1-3) unstable; urgency=low + + * Build (again) against the latest libraries. + + -- Christian Marillat Mon, 25 Feb 2002 14:42:26 +0100 + +yelp (0.2.1-2) unstable; urgency=low + + * Should depends on docbook-xsl and build against the latest libgnome2-0. + * Build against the latest libraries. + + -- Christian Marillat Sun, 24 Feb 2002 10:55:36 +0100 + +yelp (0.2.1-1) unstable; urgency=low + + * New upstream release. + * Should depends on gnome-doc-tools + * Build on latest libgtkhtml2 (Closes: #132967) + + -- Christian Marillat Sat, 16 Feb 2002 00:39:13 +0100 + +yelp (0.2-1) unstable; urgency=low + + * New upstream release + + -- Christian Marillat Wed, 30 Jan 2002 16:21:58 +0100 + +yelp (0.1-1) unstable; urgency=low + + * Initial Release. + + -- Christian Marillat Mon, 14 Jan 2002 11:15:54 +0100 + --- yelp-2.28.0+webkit.orig/debian/compat +++ yelp-2.28.0+webkit/debian/compat @@ -0,0 +1 @@ +5 --- yelp-2.28.0+webkit.orig/debian/control +++ yelp-2.28.0+webkit/debian/control @@ -0,0 +1,48 @@ +# This file is autogenerated. DO NOT EDIT! +# +# Modifications should be made to debian/control.in instead. +# This file is regenerated automatically in the clean target. + +Source: yelp +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Josselin Mouette , Marc 'HE' Brockschmidt +Standards-Version: 3.8.3 +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/yelp/ubuntu +Build-Depends: debhelper (>= 5), + gnome-pkg-tools (>= 0.10), + cdbs (>= 0.4.41), + quilt, + docbook-to-man, + intltool (>= 0.35.0), + libgconf2-dev, + libglib2.0-dev (>= 2.16), + gnome-doc-utils (>= 0.17.2), + libgtk2.0-dev (>= 2.10.0), + libxml2-dev (>= 2.6.5), + libxslt1-dev (>= 1.1.4), + libstartup-notification0-dev (>= 0.8), + libdbus-glib-1-dev, + librarian-dev (>= 0.7.0), + libxt-dev, + zlib1g-dev, + libbz2-dev, + libwebkit-dev, + liblaunchpad-integration-dev (>= 0.1.17) + +Package: yelp +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gnome-doc-utils (>= 0.17.2), + docbook-xml (>= 4.1.2), + xml-core, + man-db (>= 2.5.1-1) +Recommends: gnome-user-guide +Suggests: ttf-dejavu +Breaks: scrollkeeper (<< 0.4) +Replaces: gman +Description: Help browser for GNOME + This package contains the GNOME online help browser application. --- yelp-2.28.0+webkit.orig/debian/control.in +++ yelp-2.28.0+webkit/debian/control.in @@ -0,0 +1,43 @@ +Source: yelp +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: @GNOME_TEAM@ +Standards-Version: 3.8.3 +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/yelp/ubuntu +Build-Depends: debhelper (>= 5), + gnome-pkg-tools (>= 0.10), + cdbs (>= 0.4.41), + quilt, + docbook-to-man, + intltool (>= 0.35.0), + libgconf2-dev, + libglib2.0-dev (>= 2.16), + gnome-doc-utils (>= 0.17.2), + libgtk2.0-dev (>= 2.10.0), + libxml2-dev (>= 2.6.5), + libxslt1-dev (>= 1.1.4), + libstartup-notification0-dev (>= 0.8), + libdbus-glib-1-dev, + librarian-dev (>= 0.7.0), + libxt-dev, + zlib1g-dev, + libbz2-dev, + libwebkit-dev, + liblaunchpad-integration-dev (>= 0.1.17) + +Package: yelp +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gnome-doc-utils (>= 0.17.2), + docbook-xml (>= 4.1.2), + xml-core, + man-db (>= 2.5.1-1) +Recommends: gnome-user-guide +Suggests: ttf-dejavu +Breaks: scrollkeeper (<< 0.4) +Replaces: gman +Description: Help browser for GNOME + This package contains the GNOME online help browser application. --- yelp-2.28.0+webkit.orig/debian/copyright +++ yelp-2.28.0+webkit/debian/copyright @@ -0,0 +1,32 @@ +This package was debianized by Christian Marillat on +Mon, 14 Jan 2002 11:15:54 +0100. + +It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/yelp/ + +Copyright holders and authors: + (C) 2000-2004 Marco Pesenti Gritti + (C) 2001-2003 Mikael Hallendal + (C) 2002 Jorn Baayen + (C) 2003-2005 Shaun McCance + (C) 2003-2005 Christian Persch + (C) 2004,2005 Davyd Madeley + (C) 2005 Juerg Billeter + (C) 2005,2006 Brent Smith + (C) 2005,2006 Don Scorgie + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- yelp-2.28.0+webkit.orig/debian/links +++ yelp-2.28.0+webkit/debian/links @@ -0,0 +1 @@ +/usr/share/man/man1/yelp.1.gz /usr/share/man/man1/gnome-help.1.gz --- yelp-2.28.0+webkit.orig/debian/manpages +++ yelp-2.28.0+webkit/debian/manpages @@ -0,0 +1 @@ +debian/yelp.1 --- yelp-2.28.0+webkit.orig/debian/menu +++ yelp-2.28.0+webkit/debian/menu @@ -0,0 +1,5 @@ +?package(yelp):needs="X11"\ + section="Help"\ + hints="Gnome"\ + title="yelp"\ + command="/usr/bin/yelp" --- yelp-2.28.0+webkit.orig/debian/rules +++ yelp-2.28.0+webkit/debian/rules @@ -0,0 +1,19 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +DEB_CONFIGURE_EXTRA_FLAGS += --enable-info --enable-man \ + --with-gecko=libxul-embedding --with-search=basic + +LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed + +clean:: + rm -f debian/yelp.1 + +build/yelp:: + /usr/bin/docbook-to-man debian/yelp.sgml > debian/yelp.1 --- yelp-2.28.0+webkit.orig/debian/watch +++ yelp-2.28.0+webkit/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://ftp.gnome.org/pub/gnome/sources/yelp/([\d\.]+)/yelp-([\d\.]+)\.tar\.gz --- yelp-2.28.0+webkit.orig/debian/yelp.sgml +++ yelp-2.28.0+webkit/debian/yelp.sgml @@ -0,0 +1,87 @@ + + + + +
wasabi@larvalstage.net
+ Jerry Haltom + + 2004 + Jerry Haltom + + March 21, 2004 + + + YELP + 1 + + + yelp + browse system documentation + + + + USAGE + + yelp [file] + + The GNOME Help Browser includes detailed documentation + for the majority of applications, utilities and other + components, such as the panel or the Nautilus file manager. + + + Yelp can display some HTML and XML files when passed + on the command-line, but it's primarily called from + applications. + + You can also start Yelp by choosing Desktop->Help. + This will show the top-level help system page, listing all + GNOME documents conveniently organized by topic. + + + + OPTIONS + + This program accepts all the standard GNOME + and GTK+ options, which follow + the usual GNU command line syntax, with long options starting + with two dashes (`-'). To get more information about these + options launch Yelp with the `--help' argument. + + + + AUTHOR + + Yelp was written by Mikael + Hallendal and + Alexander + Larsson. + + + This manual page was written by Jerry Haltom + <wasabi@larvalstage.net> for the Debian system (but may + be used by others). Permission is granted to copy, distribute + and/or modify this document under the terms of the GNU + Free Documentation License, Version 1.1 or any later + version published by the Free Software Foundation; with no + Invariant Sections, no Front-Cover Texts and no Back-Cover + Texts. + + + + --- yelp-2.28.0+webkit.orig/debian/patches/01_lpi.patch +++ yelp-2.28.0+webkit/debian/patches/01_lpi.patch @@ -0,0 +1,48 @@ +# Description: add launchpad menu items to the application +# UbuntuSpecific: integration to launchpad +# +Index: yelp-2.28.0/configure.in +=================================================================== +--- yelp-2.28.0.orig/configure.in 2009-09-24 06:05:49.000000000 +1000 ++++ yelp-2.28.0/configure.in 2009-12-08 15:14:29.000000000 +1100 +@@ -58,6 +58,7 @@ + gnome-doc-utils >= 0.17.2 + gtk+-unix-print-2.0 + gtk+-2.0 >= 2.10.0 ++ launchpad-integration + libxml-2.0 >= 2.6.5 + libxslt >= 1.1.4 + libexslt >= 0.8.1 +Index: yelp-2.28.0/data/ui/yelp-ui.xml +=================================================================== +--- yelp-2.28.0.orig/data/ui/yelp-ui.xml 2009-09-24 06:05:16.000000000 +1000 ++++ yelp-2.28.0/data/ui/yelp-ui.xml 2009-12-08 15:14:29.000000000 +1100 +@@ -40,6 +40,7 @@ + + + ++ + + + +Index: yelp-2.28.0/src/yelp-window.c +=================================================================== +--- yelp-2.28.0.orig/src/yelp-window.c 2009-09-24 06:05:49.000000000 +1000 ++++ yelp-2.28.0/src/yelp-window.c 2009-12-08 15:14:29.000000000 +1100 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include + + #include "yelp-bookmarks.h" +@@ -1357,6 +1358,8 @@ + window_error (window, _("Cannot create search component"), error->message, FALSE); + } + ++ launchpad_integration_add_ui (priv->ui_manager, ++ "ui/menubar/HelpMenu/LaunchpadItems"); + yelp_bookmarks_register (window); + + action = gtk_action_group_get_action (priv->action_group, "GoBack"); --- yelp-2.28.0+webkit.orig/debian/patches/02_autoconf.patch +++ yelp-2.28.0+webkit/debian/patches/02_autoconf.patch @@ -0,0 +1,76 @@ +Index: yelp-2.28.0/configure +=================================================================== +--- yelp-2.28.0.orig/configure 2009-12-08 15:14:49.000000000 +1100 ++++ yelp-2.28.0/configure 2009-12-08 15:17:35.000000000 +1100 +@@ -13980,6 +13980,7 @@ + gnome-doc-utils >= 0.17.2 + gtk+-unix-print-2.0 + gtk+-2.0 >= 2.10.0 ++ launchpad-integration + libxml-2.0 >= 2.6.5 + libxslt >= 1.1.4 + libexslt >= 0.8.1 +@@ -13993,6 +13994,7 @@ + gnome-doc-utils >= 0.17.2 + gtk+-unix-print-2.0 + gtk+-2.0 >= 2.10.0 ++ launchpad-integration + libxml-2.0 >= 2.6.5 + libxslt >= 1.1.4 + libexslt >= 0.8.1 +@@ -14009,6 +14011,7 @@ + gnome-doc-utils >= 0.17.2 + gtk+-unix-print-2.0 + gtk+-2.0 >= 2.10.0 ++ launchpad-integration + libxml-2.0 >= 2.6.5 + libxslt >= 1.1.4 + libexslt >= 0.8.1 +@@ -14034,6 +14037,7 @@ + gnome-doc-utils >= 0.17.2 + gtk+-unix-print-2.0 + gtk+-2.0 >= 2.10.0 ++ launchpad-integration + libxml-2.0 >= 2.6.5 + libxslt >= 1.1.4 + libexslt >= 0.8.1 +@@ -14047,6 +14051,7 @@ + gnome-doc-utils >= 0.17.2 + gtk+-unix-print-2.0 + gtk+-2.0 >= 2.10.0 ++ launchpad-integration + libxml-2.0 >= 2.6.5 + libxslt >= 1.1.4 + libexslt >= 0.8.1 +@@ -14063,6 +14068,7 @@ + gnome-doc-utils >= 0.17.2 + gtk+-unix-print-2.0 + gtk+-2.0 >= 2.10.0 ++ launchpad-integration + libxml-2.0 >= 2.6.5 + libxslt >= 1.1.4 + libexslt >= 0.8.1 +@@ -14094,6 +14100,7 @@ + gnome-doc-utils >= 0.17.2 + gtk+-unix-print-2.0 + gtk+-2.0 >= 2.10.0 ++ launchpad-integration + libxml-2.0 >= 2.6.5 + libxslt >= 1.1.4 + libexslt >= 0.8.1 +@@ -14108,6 +14115,7 @@ + gnome-doc-utils >= 0.17.2 + gtk+-unix-print-2.0 + gtk+-2.0 >= 2.10.0 ++ launchpad-integration + libxml-2.0 >= 2.6.5 + libxslt >= 1.1.4 + libexslt >= 0.8.1 +@@ -14125,6 +14133,7 @@ + gnome-doc-utils >= 0.17.2 + gtk+-unix-print-2.0 + gtk+-2.0 >= 2.10.0 ++ launchpad-integration + libxml-2.0 >= 2.6.5 + libxslt >= 1.1.4 + libexslt >= 0.8.1 --- yelp-2.28.0+webkit.orig/debian/patches/02_man-utf8.patch +++ yelp-2.28.0+webkit/debian/patches/02_man-utf8.patch @@ -0,0 +1,36 @@ +Index: yelp-2.28.0/src/yelp-man-parser.c +=================================================================== +--- yelp-2.28.0.orig/src/yelp-man-parser.c 2009-09-24 06:05:17.000000000 +1000 ++++ yelp-2.28.0/src/yelp-man-parser.c 2009-12-08 15:14:40.000000000 +1100 +@@ -100,12 +100,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; --- yelp-2.28.0+webkit.orig/debian/patches/04_new_ubuntu_layout.patch +++ yelp-2.28.0+webkit/debian/patches/04_new_ubuntu_layout.patch @@ -0,0 +1,301 @@ +Index: yelp-2.25.1/data/toc.xml.in +=================================================================== +--- yelp-2.25.1.orig/data/toc.xml.in 2008-12-04 04:49:24.000000000 +0100 ++++ yelp-2.25.1/data/toc.xml.in 2009-03-04 23:01:15.000000000 +0100 +@@ -1,8 +1,37 @@ + + + +- <_title>Desktop +- <_description>Welcome to the GNOME Help Browser ++ <_title>Ubuntu Help Center ++ <_description>Welcome to the Ubuntu Help Center ++ <_desc1>To find help, insert a keyword in the search bar ++ <_common>Common Questions ++ <_q1>Connecting to the internet ++ <_q2>Enabling visual effects ++ <_q3>Playing music ++ <_q4>Importing photos ++ <_q5>Keeping your computer updated ++ ++ <_notfound>Can't find the answer? ++ <_freesupport_pre>The Ubuntu community provides extensive ++ <_freesupport_link>free support ++ <_freesupport_loc>http://www.ubuntu.com/support/free ++ <_freesupport_after> ++ <_commercialsupport_pre>Canonical, its partners and approved companies provide ++ <_commercialsupport_link>commercial technical support ++ <_commercialsupport_loc>http://www.ubuntu.com/support/paid ++ <_commercialsupport_after> ++ <_how_contribute>How to Contribute ++ <_community_pre>Ubuntu has an open and vibrant community of contributors. Find out ++ <_community_link>how to contribute ++ <_community_loc>http://www.ubuntu.com/community/participate ++ <_community_after> ++ ++ <_topic_title>Topics ++ ++ ++ <_title>General Guides ++ <_description>These guides used to be on the front page. Put here for safe keeping in their own new section. ++ + + <_title>Accessibility + <_description>Learn more about making your system more accessible for a +Index: yelp-2.25.1/src/yelp-toc.c +=================================================================== +--- yelp-2.25.1.orig/src/yelp-toc.c 2009-03-02 01:46:28.000000000 +0100 ++++ yelp-2.25.1/src/yelp-toc.c 2009-03-04 23:02:01.000000000 +0100 +@@ -384,19 +384,80 @@ + + /******************************************************************************/ + /** Threaded ******************************************************************/ ++typedef struct { ++ xmlNodePtr normal_node; ++ xmlNodePtr topics_node; ++ gboolean category; ++} AddDocData; + + static int + rrn_add_document (void *reg, void * user_data) + { +- xmlNodePtr node = (xmlNodePtr) user_data; ++ xmlNodePtr node = NULL; + RrnReg *r = (RrnReg *) reg; + xmlNodePtr new; + gchar *tmp; ++ ++ gint weight = -1; ++ ++ /* Find the FAQs. If this is one, take the special path below */ ++ if (!((AddDocData *) user_data)->category) { ++ node = ((AddDocData *) user_data)->normal_node; ++ } else if (g_str_equal (r->identifier, ++ "org.scrollkeeper.d8a3af46-8d5a-11db-8c4e-d252d62af366")) { ++ node = ((AddDocData *) user_data)->topics_node; ++ weight = 10; ++ } else if (g_str_equal (r->identifier, ++ "org.scrollkeeper.df238718-a01c-11db-96b4-f24d7bdff18d")) { ++ node = ((AddDocData *) user_data)->topics_node; ++ weight =9; ++ } else if (g_str_equal (r->identifier, ++ "org.scrollkeeper.0f191bc0-b6fe-11db-8547-ae109b6c251a")) { ++ node = ((AddDocData *) user_data)->topics_node; ++ weight =8; ++ } else if (g_str_equal (r->identifier, ++ "org.scrollkeeper.628dd582-9f6d-11db-9890-e2fbc6f27def")) { ++ node = ((AddDocData *) user_data)->topics_node; ++ weight =7; ++ } else if (g_str_equal (r->identifier, ++ "org.scrollkeeper.a4cecdc6-8d38-11db-807a-d364bb9186c1")) { ++ node = ((AddDocData *) user_data)->topics_node; ++ weight =6; ++ } else if (g_str_equal (r->identifier, ++ "org.scrollkeeper.e2be544e-8d38-11db-85e5-90c26ca97f1b")) { ++ node = ((AddDocData *) user_data)->topics_node; ++ weight =5; ++ } else if (g_str_equal (r->identifier, ++ "org.scrollkeeper.0f5d3d30-28c5-11d7-9d8d-bd839db251e3")) { ++ node = ((AddDocData *) user_data)->topics_node; ++ weight =4; ++ } else if (g_str_equal (r->identifier, ++ "org.scrollkeeper.75a2a7e0-9f74-11db-8ee5-a16b5b471285")) { ++ node = ((AddDocData *) user_data)->topics_node; ++ weight =3; ++ } else if (g_str_equal (r->identifier, ++ "org.scrollkeeper.46905562-8d39-11db-9e8e-dac9ef893e3b")) { ++ node = ((AddDocData *) user_data)->topics_node; ++ weight =2; ++ } else if (g_str_equal (r->identifier, ++ "org.scrollkeeper.ca0556e4-b4db-11db-866f-a1b2f0a0b745")) { ++ node = ((AddDocData *) user_data)->topics_node; ++ weight =1.5; ++ } else if (g_str_equal (r->identifier, ++ "org.scrollkeeper.3b215d58-ab3d-11db-9346-b6e891c8efa5")) { ++ node = ((AddDocData *) user_data)->topics_node; ++ weight =1; ++ } ++ ++ + new = xmlNewChild (node, NULL, BAD_CAST "doc", NULL); + xmlNewNsProp (new, NULL, BAD_CAST "href", BAD_CAST r->uri); + xmlNewTextChild (new, NULL, BAD_CAST "title", BAD_CAST r->name); + xmlNewTextChild (new, NULL, BAD_CAST "description", BAD_CAST r->comment); +- tmp = g_strdup_printf ("%d", r->weight); ++ if (!weight) ++ tmp = g_strdup_printf ("%d", r->weight); ++ else ++ tmp = g_strdup_printf ("%d", weight); + xmlNewNsProp (new, NULL, BAD_CAST "weight", BAD_CAST tmp); + g_free (tmp); + return FALSE; +@@ -405,6 +466,7 @@ + static void + toc_process (YelpToc *toc) + { ++ AddDocData *data = NULL; + YelpTocPriv *priv; + YelpError *error = NULL; + xmlParserCtxtPtr parserCtxt = NULL; +@@ -421,6 +483,8 @@ + xmlXPathObjectPtr obj; + gint i; + debug_print (DB_FUNCTION, "entering\n"); ++ data = g_new0 (AddDocData, 1); ++ data->category = FALSE; + + g_assert (toc != NULL && YELP_IS_TOC (toc)); + g_object_ref (toc); +@@ -449,11 +513,38 @@ + xmlNodePtr node = obj->nodesetval->nodeTab[i]; + xmlChar *icon = NULL; + xmlChar *id = NULL; +- +- xmlNodeSetLang (node, BAD_CAST g_get_language_names ()[0]); ++ xmlChar *name = NULL; + + xml_trim_titles (node, BAD_CAST "title"); + xml_trim_titles (node, BAD_CAST "description"); ++ name = xmlGetProp (node, BAD_CAST "id"); ++ if (g_str_equal (name, "Core")) { ++ xml_trim_titles (node, BAD_CAST "desc1"); ++ xml_trim_titles (node, BAD_CAST "common"); ++ xml_trim_titles (node, BAD_CAST "q1"); ++ xml_trim_titles (node, BAD_CAST "q2"); ++ xml_trim_titles (node, BAD_CAST "q3"); ++ xml_trim_titles (node, BAD_CAST "q4"); ++ xml_trim_titles (node, BAD_CAST "q5"); ++ xml_trim_titles (node, BAD_CAST "notfound"); ++ xml_trim_titles (node, BAD_CAST "freesupport_pre"); ++ xml_trim_titles (node, BAD_CAST "freesupport_link"); ++ xml_trim_titles (node, BAD_CAST "freesupport_loc"); ++ xml_trim_titles (node, BAD_CAST "freesupport_after"); ++ xml_trim_titles (node, BAD_CAST "commercialsupport_pre"); ++ xml_trim_titles (node, BAD_CAST "commercialsupport_link"); ++ xml_trim_titles (node, BAD_CAST "commercialsupport_loc"); ++ xml_trim_titles (node, BAD_CAST "commercialsupport_after"); ++ xml_trim_titles (node, BAD_CAST "how_contribute"); ++ xml_trim_titles (node, BAD_CAST "community_pre"); ++ xml_trim_titles (node, BAD_CAST "community_link"); ++ xml_trim_titles (node, BAD_CAST "community_loc"); ++ xml_trim_titles (node, BAD_CAST "community_after"); ++ xml_trim_titles (node, BAD_CAST "topic_title"); ++ data->topics_node = ++ xmlNewChild (node, NULL, BAD_CAST "topics", NULL); ++ } ++ data->normal_node = node; + + icon = xmlGetProp (node, BAD_CAST "icon"); + if (icon) { +@@ -473,9 +564,14 @@ + if (id) { + if (g_str_equal (id, "Core")) + xmlSetProp (node, BAD_CAST "id", BAD_CAST "index"); ++ if (!strcmp (id, "Core")) { ++ data->category = TRUE; ++ } else { ++ data->category = FALSE; ++ } + rrn_for_each_in_category (rrn_add_document, + (char *) id, +- (void *) node); ++ (void *) data); + xmlFree (id); + } + +Index: yelp-2.25.1/stylesheets/toc2html.xsl.in +=================================================================== +--- yelp-2.25.1.orig/stylesheets/toc2html.xsl.in 2009-03-02 02:25:39.000000000 +0100 ++++ yelp-2.25.1/stylesheets/toc2html.xsl.in 2009-03-04 23:01:15.000000000 +0100 +@@ -214,20 +214,6 @@ + + + +-
+- +- +-

+- +- +-

+-

+- +- +- +- +- +-
+
+

+ +@@ -239,42 +225,37 @@ + + + +- +- ++ ++ + + +- +-

No documents or subcategories found.

+- +- +-
+- +- ++ ++ ++
++

++ ++ ++

++ ++
+ +- +- +- +-
    +- +-
  • +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-
    • +-     +-
++

++

++
    ++
    • ++
    • ++
    • ++
    • ++
    • ++ ++
++

++

++

++

++

++ ++ + + + --- yelp-2.28.0+webkit.orig/debian/patches/04_use_doc-base.patch +++ yelp-2.28.0+webkit/debian/patches/04_use_doc-base.patch @@ -0,0 +1,31 @@ +Debian-specific patch: add /var/lib/doc-base to the list of dirs that +librarian will parse. + +Index: yelp-2.27.4/src/yelp-main.c +=================================================================== +--- yelp-2.27.4.orig/src/yelp-main.c 2009-08-07 10:18:11.000000000 +1000 ++++ yelp-2.27.4/src/yelp-main.c 2009-08-25 14:05:39.000000000 +1000 +@@ -336,6 +336,7 @@ + gboolean retval; + gboolean session_started = FALSE; + gchar *local_id; ++ gchar *xdg_dirs; + GOptionContext *context; + + g_thread_init(NULL); +@@ -351,6 +352,15 @@ + 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")); + --- yelp-2.28.0+webkit.orig/debian/patches/05_menu_tooltip.patch +++ yelp-2.28.0+webkit/debian/patches/05_menu_tooltip.patch @@ -0,0 +1,15 @@ +# Description: change title to mention Ubuntu rather than GNOME +# UbuntuSpecific: Ubuntu branding change +# +Index: yelp-2.27.2/yelp.desktop.in.in +=================================================================== +--- yelp-2.27.2.orig/yelp.desktop.in.in 2009-04-18 16:47:54.000000000 +1000 ++++ yelp-2.27.2/yelp.desktop.in.in 2009-06-30 12:32:33.000000000 +1000 +@@ -1,6 +1,6 @@ + [Desktop Entry] + _Name=Help +-_Comment=Get help with GNOME ++_Comment=Get help with Ubuntu + OnlyShowIn=GNOME; + Exec=yelp + Icon=help-browser --- yelp-2.28.0+webkit.orig/debian/patches/06_ubuntu_online_url.patch +++ yelp-2.28.0+webkit/debian/patches/06_ubuntu_online_url.patch @@ -0,0 +1,18 @@ +# Description: search on the ubuntu website rather than the GNOME one +# UbuntuSpecific: distribution branding choice +# +diff -Nur yelp-2.19.1/src/yelp-search-parser.c yelp-2.19.1.new/src/yelp-search-parser.c +--- yelp-2.19.1/src/yelp-search-parser.c 2007-07-31 00:11:53.000000000 +0200 ++++ yelp-2.19.1.new/src/yelp-search-parser.c 2007-08-01 23:35:44.000000000 +0200 +@@ -62,9 +62,9 @@ + + typedef struct _SearchContainer SearchContainer; + +-#define ONLINE_URL "http://api.gnome.org/yelp/forums?query=%s" ++#define ONLINE_URL "http://search.ubuntu.com/help?os=ubuntu&ver=8.04&q=%s" + +-#define ONLINE_NAME N_("the GNOME Support Forums") ++#define ONLINE_NAME N_("the Ubuntu Help Pages") + + enum { + NOT_SEARCHING = 0, --- yelp-2.28.0+webkit.orig/debian/patches/series +++ yelp-2.28.0+webkit/debian/patches/series @@ -0,0 +1,7 @@ +01_lpi.patch +02_autoconf.patch +02_man-utf8.patch +04_new_ubuntu_layout.patch +#04_use_doc-base.patch +05_menu_tooltip.patch +06_ubuntu_online_url.patch