Bug#351977: yelp: Please build against xulrunner when it will
reach unstable
Mike Hommey
mh at glandium.org
Wed Feb 8 21:46:18 UTC 2006
Package: yelp
Version: 2.12.2-2.1
Severity: wishlist
Tags: patch
Hi, attached here is a patch so that yelp builds against xulrunner
instead of mozilla.
Xulrunner is in the NEW queue at the moment, so I can't say for sure
when it will reach unstable.
Cheers,
Mike
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.15-1-686
Locale: LANG=ja_JP.UTF-8, LC_CTYPE=ja_JP.UTF-8 (charmap=UTF-8)
Versions of packages yelp depends on:
ii docbook-xml 4.4-4 standard XML documentation system,
ii gconf2 2.12.1-8 GNOME configuration database syste
ii gnome-doc-utils 0.5.2-1 a collection of documentation util
ii libbonobo2-0 2.10.1-1 Bonobo CORBA interfaces library
ii libbz2-1.0 1.0.3-2 high-quality block-sorting file co
ii libc6 2.3.5-13 GNU C Library: Shared libraries an
ii libgcc1 1:4.0.2-8 GCC support library
ii libgconf2-4 2.12.1-8 GNOME configuration database syste
ii libglade2-0 1:2.5.1-2 library to load .glade files at ru
ii libglib2.0-0 2.8.6-1 The GLib library of C routines
ii libgnome2-0 2.12.0.1-5 The GNOME 2 library - runtime file
ii libgnomeui-0 2.12.0-2 The GNOME 2 libraries (User Interf
ii libgnomevfs2-0 2.12.2-5 GNOME virtual file-system (runtime
ii libgtk2.0-0 2.8.10-1 The GTK+ graphical user interface
ii liborbit2 1:2.12.4-1 libraries for ORBit2 - a CORBA ORB
ii libpango1.0-0 1.10.3-1 Layout and rendering of internatio
ii libpopt0 1.7-5 lib for parsing cmdline parameters
ii libstdc++6 4.0.2-8 The GNU Standard C++ Library v3
ii libxml2 2.6.23.dfsg.2-1 GNOME XML library
ii libxslt1.1 1.1.15-3 XSLT processing library - runtime
ii libxul0d 1.8.0.1-2 Gecko engine library
ii xml-core 0.09 XML infrastructure and XML catalog
ii zlib1g 1:1.2.3-9 compression library - runtime
yelp recommends no packages.
-- no debconf information
-------------- next part --------------
diff -ruN yelp-2.12.2.orig/debian/changelog yelp-2.12.2/debian/changelog
--- yelp-2.12.2.orig/debian/changelog 2006-02-08 20:00:47.000827072 +0100
+++ yelp-2.12.2/debian/changelog 2006-02-08 20:01:26.621803768 +0100
@@ -1,3 +1,14 @@
+yelp (2.12.2-2.1) unstable; urgency=low
+
+ * Test build with xulrunner.
+ * debian/control, debian/control.in:
+ + Changed Build-deps from mozilla-dev to libxul-dev.
+ + Removed yelp's mozilla-browser dependency accordingly.
+ * debian/rules: Add --with-mozilla=xulrunner to the configure line.
+ * debian/patches/scrollbar.patch: Removed.
+
+ -- Mike Hommey <glandium at debian.org> Wed, 8 Feb 2006 20:01:15 +0100
+
yelp (2.12.2-2) unstable; urgency=low
* Upload to unstable.
diff -ruN yelp-2.12.2.orig/debian/control yelp-2.12.2/debian/control
--- yelp-2.12.2.orig/debian/control 2006-02-08 20:00:47.000827072 +0100
+++ yelp-2.12.2/debian/control 2006-02-08 18:45:07.258972736 +0100
@@ -4,11 +4,11 @@
Maintainer: Jerry Haltom <wasabi at larvalstage.net>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Akira TAGOH <tagoh at debian.org>, Andreas Rottmann <rotty at debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Carlos Perell? Mar?n <carlos at pemas.net>, Cl?ment Stenac <zorglub at debian.org>, Ed Boraas <ed at debian.org>, Edd Dumbill <ejad at debian.org>, Emil Soleyman-Zomalan <emil at nishra.com>, Guilherme de S. Pastore <guilherme.pastore at terra.com.br>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Joe Drew <drew at debian.org>, Johannes Rohr <jr.debian at rohr.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Ond?ej Sur? <ondrej at debian.org>, Rob Bradford <rob at debianplanet.org>, Robert McQueen <robot101 at debian.org>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>, Takuo KITAME <kitame at debian.org>
Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 4.1), gnome-pkg-tools, cdbs, docbook-to-man, intltool, libgnomeui-dev (>= 2.6.1.1-4), libxslt1-dev (>= 1.1.4), libgtk2.0-dev (>= 2.4.1-3), gnome-doc-utils (>= 0.3.1), mozilla-dev (>= 2:1.7.12), libbz2-dev
+Build-Depends: debhelper (>= 4.1), gnome-pkg-tools, cdbs, docbook-to-man, intltool, libgnomeui-dev (>= 2.6.1.1-4), libxslt1-dev (>= 1.1.4), libgtk2.0-dev (>= 2.4.1-3), gnome-doc-utils (>= 0.3.1), libxul-dev, libbz2-dev
Package: yelp
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-doc-utils, docbook-xml (>= 4.1.2), xml-core, mozilla-browser (>= 2:1.7.12)
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-doc-utils, docbook-xml (>= 4.1.2), xml-core
Replaces: gman
Description: Help browser for GNOME 2
This package contains the GNOME online help browser application.
diff -ruN yelp-2.12.2.orig/debian/control.in yelp-2.12.2/debian/control.in
--- yelp-2.12.2.orig/debian/control.in 2006-02-08 20:00:47.000827072 +0100
+++ yelp-2.12.2/debian/control.in 2006-02-08 18:45:07.258972736 +0100
@@ -4,11 +4,11 @@
Maintainer: Jerry Haltom <wasabi at larvalstage.net>
Uploaders: @GNOME_TEAM@
Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 4.1), gnome-pkg-tools, cdbs, docbook-to-man, intltool, libgnomeui-dev (>= 2.6.1.1-4), libxslt1-dev (>= 1.1.4), libgtk2.0-dev (>= 2.4.1-3), gnome-doc-utils (>= 0.3.1), mozilla-dev (>= 2:1.7.12), libbz2-dev
+Build-Depends: debhelper (>= 4.1), gnome-pkg-tools, cdbs, docbook-to-man, intltool, libgnomeui-dev (>= 2.6.1.1-4), libxslt1-dev (>= 1.1.4), libgtk2.0-dev (>= 2.4.1-3), gnome-doc-utils (>= 0.3.1), libxul-dev, libbz2-dev
Package: yelp
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-doc-utils, docbook-xml (>= 4.1.2), xml-core, mozilla-browser (>= 2:1.7.12)
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-doc-utils, docbook-xml (>= 4.1.2), xml-core
Replaces: gman
Description: Help browser for GNOME 2
This package contains the GNOME online help browser application.
diff -ruN yelp-2.12.2.orig/debian/patches/scrollbar.patch yelp-2.12.2/debian/patches/scrollbar.patch
--- yelp-2.12.2.orig/debian/patches/scrollbar.patch 2006-02-08 20:00:47.000827072 +0100
+++ yelp-2.12.2/debian/patches/scrollbar.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,50 +0,0 @@
-diff -PruN yelp-2.12.1.orig/src/yelp-gecko-utils.cpp yelp-2.12.1/src/yelp-gecko-utils.cpp
---- yelp-2.12.1.orig/src/yelp-gecko-utils.cpp 2005-11-16 23:19:38.000000000 +0100
-+++ yelp-2.12.1/src/yelp-gecko-utils.cpp 2005-11-16 23:52:40.000000000 +0100
-@@ -28,6 +28,8 @@
- #include <nsIInterfaceRequestorUtils.h>
- #include <nsIServiceManager.h>
- #include <nsIPrefService.h>
-+#include <nsEmbedString.h>
-+#include <content/nsIChromeRegistry.h>
- #include <stdlib.h>
-
- #include "yelp-gecko-utils.h"
-@@ -163,4 +165,13 @@
- }
-
- g_free (name);
--}
-+}
-+
-+extern "C" void
-+yelp_gecko_init_chrome (void)
-+{
-+ nsCOMPtr<nsIXULChromeRegistry> chromeRegistry = do_GetService (NS_CHROMEREGISTRY_CONTRACTID);
-+
-+ // Set skin to 'classic' so we get native scrollbars.
-+ chromeRegistry->SelectSkin (nsEmbedCString("classic/1.0"), PR_FALSE);
-+}
-diff -PruN yelp-2.12.1.orig/src/yelp-gecko-utils.h yelp-2.12.1/src/yelp-gecko-utils.h
---- yelp-2.12.1.orig/src/yelp-gecko-utils.h 2005-11-16 23:19:38.000000000 +0100
-+++ yelp-2.12.1/src/yelp-gecko-utils.h 2005-11-16 23:53:08.000000000 +0100
-@@ -33,6 +33,7 @@
- const gchar *color);
- void yelp_gecko_set_font (YelpFontType font_type,
- const gchar *fontname);
-+void yelp_gecko_init_chrome (void);
-
- G_END_DECLS
-
-diff -PruN yelp-2.12.1.orig/src/yelp-html.cpp yelp-2.12.1/src/yelp-html.cpp
---- yelp-2.12.1.orig/src/yelp-html.cpp 2005-11-16 23:19:38.000000000 +0100
-+++ yelp-2.12.1/src/yelp-html.cpp 2005-11-16 23:25:37.000000000 +0100
-@@ -154,6 +154,8 @@
- NULL);
- html_set_a11y ();
- }
-+
-+ yelp_gecko_init_chrome();
- }
-
- static void
diff -ruN yelp-2.12.2.orig/debian/rules yelp-2.12.2/debian/rules
--- yelp-2.12.2.orig/debian/rules 2006-02-08 20:00:47.000827072 +0100
+++ yelp-2.12.2/debian/rules 2006-02-08 18:45:07.258972736 +0100
@@ -6,7 +6,7 @@
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-info --enable-man
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-info --enable-man --with-mozilla=xulrunner
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
More information about the Pkg-gnome-maintainers
mailing list