--- devhelp-0.19.orig/debian/devhelp.manpages +++ devhelp-0.19/debian/devhelp.manpages @@ -0,0 +1 @@ +debian/devhelp.1 --- devhelp-0.19.orig/debian/patches/00install-devhelp-el.patch +++ devhelp-0.19/debian/patches/00install-devhelp-el.patch @@ -0,0 +1,11 @@ +--- misc/devhelp.el~ 2003-06-29 10:24:17.000000000 -0300 ++++ misc/devhelp.el 2004-03-21 17:34:01.000000000 -0300 +@@ -8,7 +8,7 @@ + ) + + ; Example: bind F7 to start devhelp and search for the word at the point. +-; (global-set-key [f7] 'devhelp-word-at-point) ++(global-set-key [f11] 'devhelp-word-at-point) + + ; Tips: use -g WIDTHxHEIGHT+XOFF+YOFF to set the size and position of + ; the window --- devhelp-0.19.orig/debian/patches/04_devhelp-xul-1.9.m4.patch +++ devhelp-0.19/debian/patches/04_devhelp-xul-1.9.m4.patch @@ -0,0 +1,260 @@ +diff -Nur -x '*.orig' -x '*~' devhelp-0.17/configure.in devhelp-0.17.new/configure.in +--- devhelp-0.17/configure.in 2007-12-19 19:00:54.000000000 +0100 ++++ devhelp-0.17.new/configure.in 2008-01-16 11:28:49.000000000 +0100 +@@ -80,9 +80,11 @@ + *firefox) gecko_min_version=1.0 ;; + *thunderbird) gecko_min_version=1.0 ;; + xulrunner) gecko_min_version=1.8 ;; ++libxul*) gecko_min_version=1.9 ;; + esac + +-PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version]) ++PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version], ++ [],[PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO >= $gecko_min_version])]) + AC_SUBST([GECKO_CFLAGS]) + AC_SUBST([GECKO_LIBS]) + +diff -Nur -x '*.orig' -x '*~' devhelp-0.17/m4/gecko.m4 devhelp-0.17.new/m4/gecko.m4 +--- devhelp-0.17/m4/gecko.m4 2007-02-13 09:34:26.000000000 +0100 ++++ devhelp-0.17.new/m4/gecko.m4 2008-01-16 11:26:24.000000000 +0100 +@@ -51,7 +51,7 @@ + AC_MSG_CHECKING([which gecko to use]) + + AC_ARG_WITH([gecko], +- AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner@:>@], ++ AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner|libxul-embedding@:>@], + [Which gecko engine to use (autodetected by default)])) + + # Backward compat +@@ -60,12 +60,15 @@ + gecko_cv_gecko=$with_gecko + + # Autodetect gecko +-_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla" ++_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul-embedding" + if test -z "$gecko_cv_gecko"; then + for lizard in $_geckos; do + if $PKG_CONFIG --exists $lizard-xpcom; then + gecko_cv_gecko=$lizard + break; ++ elif $PKG_CONFIG --exist $lizard-unstable; then ++ gecko_cv_gecko=$lizard-unstable ++ break; + fi + done + fi +@@ -93,13 +96,22 @@ + seamonkey) gecko_cv_gecko_flavour=mozilla ;; + *firefox) gecko_cv_gecko_flavour=toolkit ;; + xulrunner) gecko_cv_gecko_flavour=toolkit ;; ++libxul-embedding) gecko_cv_gecko_flavour=toolkit ;; + esac + +-_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`" +-_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" +-_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" +-_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`" +- ++if $PKG_CONFIG --exists ${gecko_cv_gecko}-xpcom; then ++ _GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`" ++ _GECKO_CFLAGS="-I$GECKO_INCLUDE_ROOT" ++ _GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" ++ _GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" ++ _GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`" ++else ++ _GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}`/unstable" ++ _GECKO_CFLAGS="`$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --define-variable=includetype=unstable --cflags ${gecko_cv_gecko}`" ++ _GECKO_LIBDIR="`$PKG_CONFIG --variable=sdkdir ${gecko_cv_gecko}`/bin" ++ _GECKO_HOME= ++ _GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}`" ++fi + fi # if gecko_cv_have_gecko + + if test "$gecko_cv_gecko_flavour" = "toolkit"; then +@@ -111,6 +123,7 @@ + $1[]=$gecko_cv_gecko + $1[]_FLAVOUR=$gecko_cv_gecko_flavour + $1[]_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT ++$1[]_CFLAGS=$_GECKO_CFLAGS + $1[]_LIBDIR=$_GECKO_LIBDIR + $1[]_HOME=$_GECKO_HOME + $1[]_PREFIX=$_GECKO_PREFIX +@@ -184,7 +197,7 @@ + AC_LANG_PUSH([C++]) + + _SAVE_CPPFLAGS="$CPPFLAGS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT" ++CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS" + + AC_MSG_CHECKING([[whether we have a gtk 2 gecko build]]) + AC_RUN_IFELSE( +@@ -209,8 +222,10 @@ + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#include ++ #if !defined(MOZ_STORAGE) + #if !defined(MOZ_REFLOW_PERF) || !defined(MOZ_REFLOW_PERF_DSP) + #error No ++ #endif + #endif]] + )], + [gecko_cv_have_debug=yes], +@@ -241,7 +256,7 @@ + AC_LANG_PUSH([C++]) + + _SAVE_CPPFLAGS="$CPPFLAGS" +-CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT" ++CPPFLAGS="$CPPFLAGS $_GECKO_CFLAGS" + + AC_CACHE_CHECK([for gecko version], + [gecko_cv_gecko_version], +@@ -328,8 +343,8 @@ + gecko_cv_extra_pkg_dependencies= + + if test "$gecko_cv_gecko_version_int" -ge "1009000"; then +- gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul" +- gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue_s" ++# gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul" ++ gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue" + else + gecko_cv_extra_pkg_dependencies="${gecko_cv_gecko}-gtkmozembed" + fi +@@ -359,10 +374,20 @@ + _SAVE_CXXFLAGS="$CXXFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + _SAVE_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" +-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" +-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" +-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++if test "${gecko_cv_gecko}" = "libxul-embedding"; then ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl" ++else ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xapcom)" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xapcom)" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++fi ++if test -n "$_GECKO_HOME"; then ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" ++else ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS" ++fi + + _GECKO_DISPATCH_INCLUDEDIRS="$2" + +@@ -371,9 +396,11 @@ + # Mind you, it's useful to be able to test against uninstalled mozilla builds... + _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref" + +-# Now add them to CPPFLAGS ++# Now add them to CPPFLAGS - well ... not anymore since 1.9 -> test whether they exist before adding. + for i in $_GECKO_DISPATCH_INCLUDEDIRS; do +- CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ if test -d "$_GECKO_INCLUDE_ROOT/$i"; then ++ CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ fi + done + + m4_indir([$1],m4_shiftn(2,$@)) +@@ -426,11 +453,17 @@ + #include + #include + #include ++ ++#ifdef XPCOM_GLUE ++#include ++#else + #include ++#endif // XPCOM_GLUE ++ + #include + #include + #include +-#ifdef HAVE_GECKO_1_8 ++#if defined(HAVE_GECKO_1_8) || defined(HAVE_GECKO_1_9) + #include + #else + #include +@@ -438,16 +471,37 @@ + ]] + [$1], + [[ ++ ++nsresult rv; ++#ifdef XPCOM_GLUE ++ static const GREVersionRange greVersion = { ++ "1.8", PR_TRUE, ++ "2", PR_TRUE ++ }; ++ char xpcomLocation[4096]; ++ rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096); ++ if (NS_FAILED(rv)) { ++ exit(123); ++ } ++ ++ // Startup the XPCOM Glue that links us up with XPCOM. ++ XPCOMGlueStartup(xpcomLocation); ++ if (NS_FAILED(rv)) { ++ exit(124); ++ } ++#endif // XPCOM_GLUE ++ + // redirect unwanted mozilla debug output to the bit bucket + freopen ("/dev/null", "w", stdout); + +-nsresult rv; +-nsCOMPtr directory; ++nsCOMPtr directory = nsnull; ++#ifndef XPCOM_GLUE + rv = NS_NewNativeLocalFile (NS_LITERAL_CSTRING("$_GECKO_HOME"), PR_FALSE, + getter_AddRefs (directory)); + if (NS_FAILED (rv) || !directory) { + exit (126); + } ++#endif + + rv = NS_InitXPCOM2 (nsnull, directory, nsnull); + if (NS_FAILED (rv)) { +@@ -595,23 +649,31 @@ + AC_DEFUN([GECKO_XPIDL], + [AC_REQUIRE([GECKO_INIT])dnl + +-_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" ++if test ${gecko_cv_gecko} = "libxul-embedding"; then ++ _GECKO_LIBDIR="`$PKG_CONFIG pkg-config --variable=sdkdir ${gecko_cv_gecko}`/bin" ++else ++ _GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" ++fi + + AC_PATH_PROG([XPIDL],[xpidl],[no],[$_GECKO_LIBDIR:$PATH]) + ++if test ${gecko_cv_gecko} = "libxul-embedding"; then ++XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}`" ++else + XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}-xpcom`" ++fi + + # Older geckos don't have this variable, see + # https://bugzilla.mozilla.org/show_bug.cgi?id=240473 + +-if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then +- XPIDL_IDLDIR="`echo $_GECKO_LIBDIR | sed -e s!lib!share/idl!`" +-fi +- +-# Some distributions (Gentoo) have it in unusual places +- +-if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then +- XPIDL_IDLDIR="$_GECKO_INCLUDE_ROOT/idl" ++if test ${gecko_cv_gecko} != "libxul-embedding"; then ++ if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then ++ XPIDL_IDLDIR="`echo $_GECKO_LIBDIR | sed -e s!lib!share/idl!`" ++ fi ++ # Some distributions (Gentoo) have it in unusual places ++ if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then ++ XPIDL_IDLDIR="$_GECKO_INCLUDE_ROOT/idl" ++ fi + fi + + if test "$XPIDL" != "no" -a -n "$XPIDL_IDLDIR" -a -f "$XPIDL_IDLDIR/nsISupports.idl"; then --- devhelp-0.19.orig/debian/patches/05_autotools_update.patch +++ devhelp-0.19/debian/patches/05_autotools_update.patch @@ -0,0 +1,1417 @@ +diff -Nur -x '*.orig' -x '*~' devhelp-0.19/aclocal.m4 devhelp-0.19.new/aclocal.m4 +--- devhelp-0.19/aclocal.m4 2008-02-07 12:39:43.000000000 +0000 ++++ devhelp-0.19.new/aclocal.m4 2008-02-07 23:55:30.000000000 +0000 +@@ -60,8 +60,8 @@ + # Owen Taylor 1997-2001 + + dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or +-dnl gthread is specified in MODULES, pass to pkg-config ++dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, ++dnl gthread, or gio is specified in MODULES, pass to pkg-config + dnl + AC_DEFUN([AM_PATH_GLIB_2_0], + [dnl +@@ -86,10 +86,13 @@ + gthread) + pkg_config_args="$pkg_config_args gthread-2.0" + ;; ++ gio*) ++ pkg_config_args="$pkg_config_args $module-2.0" ++ ;; + esac + done + +- PKG_PROG_PKG_CONFIG([0.7]) ++ PKG_PROG_PKG_CONFIG([0.16]) + + no_glib="" + +@@ -368,8 +371,7 @@ + #----------------- + glib_DEFUN([GLIB_WITH_NLS], + dnl NLS is obligatory +- [AC_REQUIRE([AC_CANONICAL_HOST])dnl +- USE_NLS=yes ++ [USE_NLS=yes + AC_SUBST(USE_NLS) + + gt_cv_have_gettext=no +@@ -701,7 +703,7 @@ + + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + +-# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL ++# serial 51 Debian 1.5.24-2ubuntu2 AC_PROG_LIBTOOL + + + # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +diff -Nur -x '*.orig' -x '*~' devhelp-0.19/configure devhelp-0.19.new/configure +--- devhelp-0.19/configure 2008-02-07 12:39:49.000000000 +0000 ++++ devhelp-0.19.new/configure 2008-02-07 23:55:34.000000000 +0000 +@@ -899,6 +899,9 @@ + INTLTOOL_THEME_RULE + INTLTOOL_SERVICE_RULE + INTLTOOL_POLICY_RULE ++XGETTEXT ++MSGMERGE ++MSGFMT + INTLTOOL_EXTRACT + INTLTOOL_MERGE + INTLTOOL_UPDATE +@@ -947,10 +950,8 @@ + Z_LIBS + GETTEXT_PACKAGE + USE_NLS +-MSGFMT + MSGFMT_OPTS + GMSGFMT +-XGETTEXT + CATALOGS + CATOBJEXT + GMOFILES +@@ -1597,7 +1598,7 @@ + --with-gconf-source=sourceaddress Config database for installing schema files. + --with-gconf-schema-file-dir=dir Directory for installing schema files. + --with-compile-warnings=no/yes/error Compiler warnings +- --with-gecko[=mozilla|firefox|seamonkey|xulrunner] ++ --with-gecko[=mozilla|firefox|seamonkey|xulrunner|libxul-embedding] + Which gecko engine to use (autodetected by default) + + --with-zlib=DIR use libz in DIR +@@ -5477,7 +5478,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 5480 "configure"' > conftest.$ac_ext ++ echo '#line 5481 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -7342,11 +7343,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7345: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7346: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7349: \$? = $ac_status" >&5 ++ echo "$as_me:7350: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -7632,11 +7633,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7635: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7636: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7639: \$? = $ac_status" >&5 ++ echo "$as_me:7640: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -7736,11 +7737,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7739: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7740: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:7743: \$? = $ac_status" >&5 ++ echo "$as_me:7744: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -10098,7 +10099,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5) ++ (eval echo "\"\$as_me:12622: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:12625: \$? = $ac_status" >&5 ++ echo "$as_me:12626: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -12722,11 +12723,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:12725: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12726: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:12729: \$? = $ac_status" >&5 ++ echo "$as_me:12730: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -14299,11 +14300,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14302: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14303: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:14306: \$? = $ac_status" >&5 ++ echo "$as_me:14307: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -14403,11 +14404,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14406: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14407: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:14410: \$? = $ac_status" >&5 ++ echo "$as_me:14411: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -16603,11 +16604,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16606: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16607: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16610: \$? = $ac_status" >&5 ++ echo "$as_me:16611: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -16893,11 +16894,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16896: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16897: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16900: \$? = $ac_status" >&5 ++ echo "$as_me:16901: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -16997,11 +16998,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17000: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17001: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:17004: \$? = $ac_status" >&5 ++ echo "$as_me:17005: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -19687,6 +19688,9 @@ + gthread) + pkg_config_args="$pkg_config_args gthread-2.0" + ;; ++ gio*) ++ pkg_config_args="$pkg_config_args $module-2.0" ++ ;; + esac + done + +@@ -19797,7 +19801,7 @@ + + fi + if test -n "$PKG_CONFIG"; then +- _pkg_min_version=0.7 ++ _pkg_min_version=0.16 + { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 + echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +@@ -20134,6 +20138,141 @@ + + + ++# Check the gettext tools to make sure they are GNU ++# Extract the first word of "xgettext", so it can be a program name with args. ++set dummy xgettext; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_XGETTEXT+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $XGETTEXT in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++XGETTEXT=$ac_cv_path_XGETTEXT ++if test -n "$XGETTEXT"; then ++ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 ++echo "${ECHO_T}$XGETTEXT" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++# Extract the first word of "msgmerge", so it can be a program name with args. ++set dummy msgmerge; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_MSGMERGE+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $MSGMERGE in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++MSGMERGE=$ac_cv_path_MSGMERGE ++if test -n "$MSGMERGE"; then ++ { echo "$as_me:$LINENO: result: $MSGMERGE" >&5 ++echo "${ECHO_T}$MSGMERGE" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++# Extract the first word of "msgfmt", so it can be a program name with args. ++set dummy msgfmt; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_MSGFMT+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $MSGFMT in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++MSGFMT=$ac_cv_path_MSGFMT ++if test -n "$MSGFMT"; then ++ { echo "$as_me:$LINENO: result: $MSGFMT" >&5 ++echo "${ECHO_T}$MSGFMT" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then ++ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 ++echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" ++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" ++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" ++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then ++ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 ++echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ + # Use the tools built into the package, not the ones that are installed. + INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract' + +@@ -21059,12 +21198,15 @@ + gecko_cv_gecko=$with_gecko + + # Autodetect gecko +-_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla" ++_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul-embedding" + if test -z "$gecko_cv_gecko"; then + for lizard in $_geckos; do + if $PKG_CONFIG --exists $lizard-xpcom; then + gecko_cv_gecko=$lizard + break; ++ elif $PKG_CONFIG --exist $lizard-unstable; then ++ gecko_cv_gecko=$lizard-unstable ++ break; + fi + done + fi +@@ -21097,13 +21239,22 @@ + seamonkey) gecko_cv_gecko_flavour=mozilla ;; + *firefox) gecko_cv_gecko_flavour=toolkit ;; + xulrunner) gecko_cv_gecko_flavour=toolkit ;; ++libxul-embedding) gecko_cv_gecko_flavour=toolkit ;; + esac + +-_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`" +-_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" +-_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" +-_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`" +- ++if $PKG_CONFIG --exists ${gecko_cv_gecko}-xpcom; then ++ _GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`" ++ _GECKO_CFLAGS="-I$GECKO_INCLUDE_ROOT" ++ _GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" ++ _GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" ++ _GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`" ++else ++ _GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}`/unstable" ++ _GECKO_CFLAGS="`$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --define-variable=includetype=unstable --cflags ${gecko_cv_gecko}`" ++ _GECKO_LIBDIR="`$PKG_CONFIG --variable=sdkdir ${gecko_cv_gecko}`/bin" ++ _GECKO_HOME= ++ _GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}`" ++fi + fi # if gecko_cv_have_gecko + + if test "$gecko_cv_gecko_flavour" = "toolkit"; then +@@ -21126,6 +21277,7 @@ + GECKO=$gecko_cv_gecko + GECKO_FLAVOUR=$gecko_cv_gecko_flavour + GECKO_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT ++GECKO_CFLAGS=$_GECKO_CFLAGS + GECKO_LIBDIR=$_GECKO_LIBDIR + GECKO_HOME=$_GECKO_HOME + GECKO_PREFIX=$_GECKO_PREFIX +@@ -21265,7 +21417,7 @@ + + + _SAVE_CPPFLAGS="$CPPFLAGS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT" ++CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS" + + { echo "$as_me:$LINENO: checking whether we have a gtk 2 gecko build" >&5 + echo $ECHO_N "checking whether we have a gtk 2 gecko build... $ECHO_C" >&6; } +@@ -21337,9 +21489,11 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include ++ #if !defined(MOZ_STORAGE) + #if !defined(MOZ_REFLOW_PERF) || !defined(MOZ_REFLOW_PERF_DSP) + #error No + #endif ++ #endif + + _ACEOF + rm -f conftest.$ac_objext +@@ -21416,7 +21570,7 @@ + + + _SAVE_CPPFLAGS="$CPPFLAGS" +-CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT" ++CPPFLAGS="$CPPFLAGS $_GECKO_CFLAGS" + + { echo "$as_me:$LINENO: checking for gecko version" >&5 + echo $ECHO_N "checking for gecko version... $ECHO_C" >&6; } +@@ -21610,8 +21764,8 @@ + gecko_cv_extra_pkg_dependencies= + + if test "$gecko_cv_gecko_version_int" -ge "1009000"; then +- gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul" +- gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue_s" ++# gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul" ++ gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue" + else + gecko_cv_extra_pkg_dependencies="${gecko_cv_gecko}-gtkmozembed" + fi +@@ -21635,6 +21789,7 @@ + *firefox) gecko_min_version=1.0 ;; + *thunderbird) gecko_min_version=1.0 ;; + xulrunner) gecko_min_version=1.8 ;; ++libxul*) gecko_min_version=1.9 ;; + esac + + +@@ -21696,7 +21851,180 @@ + # Put the nasty error message in config.log where it belongs + echo "$GECKO_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements ($GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version) were not met: ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ ++pkg_failed=no ++{ echo "$as_me:$LINENO: checking for GECKO" >&5 ++echo $ECHO_N "checking for GECKO... $ECHO_C" >&6; } ++ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GECKO_CFLAGS"; then ++ pkg_cv_GECKO_CFLAGS="$GECKO_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GECKO_EXTRA_PKG_DEPENDENCIES \$GECKO >= \$gecko_min_version\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO >= $gecko_min_version") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO >= $gecko_min_version" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GECKO_LIBS"; then ++ pkg_cv_GECKO_LIBS="$GECKO_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GECKO_EXTRA_PKG_DEPENDENCIES \$GECKO >= \$gecko_min_version\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO >= $gecko_min_version") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO >= $gecko_min_version" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO >= $gecko_min_version"` ++ else ++ GECKO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO >= $gecko_min_version"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GECKO_PKG_ERRORS" >&5 ++ ++ { { echo "$as_me:$LINENO: error: Package requirements ($GECKO_EXTRA_PKG_DEPENDENCIES $GECKO >= $gecko_min_version) were not met: ++ ++$GECKO_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables GECKO_CFLAGS ++and GECKO_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" >&5 ++echo "$as_me: error: Package requirements ($GECKO_EXTRA_PKG_DEPENDENCIES $GECKO >= $gecko_min_version) were not met: ++ ++$GECKO_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables GECKO_CFLAGS ++and GECKO_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" >&2;} ++ { (exit 1); exit 1; }; } ++elif test $pkg_failed = untried; then ++ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables GECKO_CFLAGS ++and GECKO_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see . ++See \`config.log' for more details." >&5 ++echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables GECKO_CFLAGS ++and GECKO_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see . ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++else ++ GECKO_CFLAGS=$pkg_cv_GECKO_CFLAGS ++ GECKO_LIBS=$pkg_cv_GECKO_LIBS ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ : ++fi ++elif test $pkg_failed = untried; then ++ ++pkg_failed=no ++{ echo "$as_me:$LINENO: checking for GECKO" >&5 ++echo $ECHO_N "checking for GECKO... $ECHO_C" >&6; } ++ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GECKO_CFLAGS"; then ++ pkg_cv_GECKO_CFLAGS="$GECKO_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GECKO_EXTRA_PKG_DEPENDENCIES \$GECKO >= \$gecko_min_version\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO >= $gecko_min_version") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO >= $gecko_min_version" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GECKO_LIBS"; then ++ pkg_cv_GECKO_LIBS="$GECKO_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GECKO_EXTRA_PKG_DEPENDENCIES \$GECKO >= \$gecko_min_version\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO >= $gecko_min_version") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO >= $gecko_min_version" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO >= $gecko_min_version"` ++ else ++ GECKO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO >= $gecko_min_version"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GECKO_PKG_ERRORS" >&5 ++ ++ { { echo "$as_me:$LINENO: error: Package requirements ($GECKO_EXTRA_PKG_DEPENDENCIES $GECKO >= $gecko_min_version) were not met: + + $GECKO_PKG_ERRORS + +@@ -21707,7 +22035,7 @@ + and GECKO_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements ($GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version) were not met: ++echo "$as_me: error: Package requirements ($GECKO_EXTRA_PKG_DEPENDENCIES $GECKO >= $gecko_min_version) were not met: + + $GECKO_PKG_ERRORS + +@@ -21748,6 +22076,13 @@ + echo "${ECHO_T}yes" >&6; } + : + fi ++else ++ GECKO_CFLAGS=$pkg_cv_GECKO_CFLAGS ++ GECKO_LIBS=$pkg_cv_GECKO_LIBS ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ : ++fi + + + +@@ -21781,10 +22116,20 @@ + _SAVE_CXXFLAGS="$CXXFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + _SAVE_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" +-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" +-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" +-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++if test "${gecko_cv_gecko}" = "libxul-embedding"; then ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl" ++else ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xapcom)" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xapcom)" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++fi ++if test -n "$_GECKO_HOME"; then ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" ++else ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS" ++fi + + _GECKO_DISPATCH_INCLUDEDIRS="content" + +@@ -21793,9 +22138,11 @@ + # Mind you, it's useful to be able to test against uninstalled mozilla builds... + _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref" + +-# Now add them to CPPFLAGS ++# Now add them to CPPFLAGS - well ... not anymore since 1.9 -> test whether they exist before adding. + for i in $_GECKO_DISPATCH_INCLUDEDIRS; do +- CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ if test -d "$_GECKO_INCLUDE_ROOT/$i"; then ++ CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ fi + done + + cat >conftest.$ac_ext <<_ACEOF +@@ -21888,10 +22235,20 @@ + _SAVE_CXXFLAGS="$CXXFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + _SAVE_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" +-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" +-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" +-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++if test "${gecko_cv_gecko}" = "libxul-embedding"; then ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl" ++else ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xapcom)" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xapcom)" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++fi ++if test -n "$_GECKO_HOME"; then ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" ++else ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS" ++fi + + _GECKO_DISPATCH_INCLUDEDIRS="" + +@@ -21900,9 +22257,11 @@ + # Mind you, it's useful to be able to test against uninstalled mozilla builds... + _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref" + +-# Now add them to CPPFLAGS ++# Now add them to CPPFLAGS - well ... not anymore since 1.9 -> test whether they exist before adding. + for i in $_GECKO_DISPATCH_INCLUDEDIRS; do +- CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ if test -d "$_GECKO_INCLUDE_ROOT/$i"; then ++ CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ fi + done + + +@@ -22545,7 +22904,7 @@ + + fi + fi +- USE_NLS=yes ++ USE_NLS=yes + + + gt_cv_have_gettext=no +@@ -25015,6 +25374,9 @@ + INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim + INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim + INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim ++XGETTEXT!$XGETTEXT$ac_delim ++MSGMERGE!$MSGMERGE$ac_delim ++MSGFMT!$MSGFMT$ac_delim + INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim + INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim + INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim +@@ -25063,10 +25425,8 @@ + Z_LIBS!$Z_LIBS$ac_delim + GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim + USE_NLS!$USE_NLS$ac_delim +-MSGFMT!$MSGFMT$ac_delim + MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim + GMSGFMT!$GMSGFMT$ac_delim +-XGETTEXT!$XGETTEXT$ac_delim + CATALOGS!$CATALOGS$ac_delim + CATOBJEXT!$CATOBJEXT$ac_delim + GMOFILES!$GMOFILES$ac_delim +@@ -25078,7 +25438,6 @@ + POSUB!$POSUB$ac_delim + MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim + PYTHON!$PYTHON$ac_delim +-PYTHON_VERSION!$PYTHON_VERSION$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -25120,6 +25479,7 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++PYTHON_VERSION!$PYTHON_VERSION$ac_delim + PYTHON_PREFIX!$PYTHON_PREFIX$ac_delim + PYTHON_EXEC_PREFIX!$PYTHON_EXEC_PREFIX$ac_delim + PYTHON_PLATFORM!$PYTHON_PLATFORM$ac_delim +@@ -25131,7 +25491,7 @@ + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 10; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +diff -Nur -x '*.orig' -x '*~' devhelp-0.19/contrib/Makefile.in devhelp-0.19.new/contrib/Makefile.in +--- devhelp-0.19/contrib/Makefile.in 2008-02-07 12:39:46.000000000 +0000 ++++ devhelp-0.19.new/contrib/Makefile.in 2008-02-07 23:55:37.000000000 +0000 +@@ -143,6 +143,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +diff -Nur -x '*.orig' -x '*~' devhelp-0.19/data/dtd/Makefile.in devhelp-0.19.new/data/dtd/Makefile.in +--- devhelp-0.19/data/dtd/Makefile.in 2008-02-07 12:39:47.000000000 +0000 ++++ devhelp-0.19.new/data/dtd/Makefile.in 2008-02-07 23:55:37.000000000 +0000 +@@ -153,6 +153,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +diff -Nur -x '*.orig' -x '*~' devhelp-0.19/data/icons/Makefile.in devhelp-0.19.new/data/icons/Makefile.in +--- devhelp-0.19/data/icons/Makefile.in 2008-02-07 12:39:47.000000000 +0000 ++++ devhelp-0.19.new/data/icons/Makefile.in 2008-02-07 23:55:37.000000000 +0000 +@@ -161,6 +161,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +diff -Nur -x '*.orig' -x '*~' devhelp-0.19/data/Makefile.in devhelp-0.19.new/data/Makefile.in +--- devhelp-0.19/data/Makefile.in 2008-02-07 12:39:47.000000000 +0000 ++++ devhelp-0.19.new/data/Makefile.in 2008-02-07 23:55:37.000000000 +0000 +@@ -167,6 +167,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +diff -Nur -x '*.orig' -x '*~' devhelp-0.19/data/ui/Makefile.in devhelp-0.19.new/data/ui/Makefile.in +--- devhelp-0.19/data/ui/Makefile.in 2008-02-07 12:39:47.000000000 +0000 ++++ devhelp-0.19.new/data/ui/Makefile.in 2008-02-07 23:55:37.000000000 +0000 +@@ -156,6 +156,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +diff -Nur -x '*.orig' -x '*~' devhelp-0.19/intltool-extract.in devhelp-0.19.new/intltool-extract.in +--- devhelp-0.19/intltool-extract.in 2008-01-30 14:05:20.000000000 +0000 ++++ devhelp-0.19.new/intltool-extract.in 2008-02-07 23:53:19.000000000 +0000 +@@ -32,7 +32,7 @@ + ## Release information + my $PROGRAM = "intltool-extract"; + my $PACKAGE = "intltool"; +-my $VERSION = "0.36.2"; ++my $VERSION = "0.37.0"; + + ## Loaded modules + use strict; +@@ -161,7 +161,8 @@ + --type=TYPE Specify the file type of FILENAME. Currently supports: + "gettext/glade", "gettext/ini", "gettext/keys" + "gettext/rfc822deb", "gettext/schemas", +- "gettext/scheme", "gettext/xml", "gettext/quoted" ++ "gettext/scheme", "gettext/xml", "gettext/quoted", ++ "gettext/quotedxml" + -l, --local Writes output into current working directory + (conflicts with --update) + --update Writes output into the same directory the source file +@@ -218,6 +219,7 @@ + &type_schemas if $gettext_type eq "schemas"; + &type_rfc822deb if $gettext_type eq "rfc822deb"; + &type_quoted if $gettext_type eq "quoted"; ++ &type_quotedxml if $gettext_type eq "quotedxml"; + } + + sub entity_decode_minimal +@@ -731,6 +733,18 @@ + } + } + ++sub type_quotedxml { ++ while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) { ++ my $message = $1; ++ my $before = $`; ++ $message =~ s/\\\"/\"/g; ++ $message = entity_decode($message); ++ $before =~ s/[^\n]//g; ++ $messages{$message} = []; ++ $loc{$message} = length ($before) + 2; ++ } ++} ++ + sub type_glade { + ### For translatable Glade XML files ### + +diff -Nur -x '*.orig' -x '*~' devhelp-0.19/intltool-merge.in devhelp-0.19.new/intltool-merge.in +--- devhelp-0.19/intltool-merge.in 2008-01-30 14:05:20.000000000 +0000 ++++ devhelp-0.19.new/intltool-merge.in 2008-02-07 23:53:19.000000000 +0000 +@@ -35,7 +35,7 @@ + ## Release information + my $PROGRAM = "intltool-merge"; + my $PACKAGE = "intltool"; +-my $VERSION = "0.36.2"; ++my $VERSION = "0.37.0"; + + ## Loaded modules + use strict; +@@ -61,6 +61,7 @@ + my $SCHEMAS_STYLE_ARG = 0; + my $RFC822DEB_STYLE_ARG = 0; + my $QUOTED_STYLE_ARG = 0; ++my $QUOTEDXML_STYLE_ARG = 0; + my $QUIET_ARG = 0; + my $PASS_THROUGH_ARG = 0; + my $UTF8_ARG = 0; +@@ -81,6 +82,7 @@ + "schemas-style|s" => \$SCHEMAS_STYLE_ARG, + "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG, + "quoted-style" => \$QUOTED_STYLE_ARG, ++ "quotedxml-style" => \$QUOTEDXML_STYLE_ARG, + "pass-through|p" => \$PASS_THROUGH_ARG, + "utf8|u" => \$UTF8_ARG, + "multiple-output|m" => \$MULTIPLE_OUTPUT, +@@ -148,7 +150,7 @@ + &utf8_sanity_check; + &preparation; + &print_message; +- &keys_merge_translations; ++ &keys_merge_translations; + &finalize; + } + elsif ($DESKTOP_STYLE_ARG && @ARGV > 2) +@@ -174,12 +176,12 @@ + &rfc822deb_merge_translations; + &finalize; + } +-elsif ($QUOTED_STYLE_ARG && @ARGV > 2) ++elsif (($QUOTED_STYLE_ARG || $QUOTEDXML_STYLE_ARG) && @ARGV > 2) + { + &utf8_sanity_check; + &preparation; + &print_message; +- "ed_merge_translations; ++ "ed_merge_translations($QUOTEDXML_STYLE_ARG); + &finalize; + } + else +@@ -219,6 +221,7 @@ + -s, --schemas-style includes translations in the schemas style + -r, --rfc822deb-style includes translations in the RFC822 style + --quoted-style includes translations in the quoted string style ++ --quotedxml-style includes translations in the quoted xml string style + -x, --xml-style includes translations in the standard xml style + + Other options: +@@ -292,10 +295,9 @@ + { + next if /^#/; + +- if (/([-a-zA-Z_@.]+)\n/) ++ for my $lang (split) + { +- my $lang = $1; +- ++ chomp ($lang); + my $po_file = $PO_DIR . "/" . $lang . ".po"; + if (-e $po_file) { + $po_files_by_lang{$lang} = $po_file; +@@ -576,6 +578,7 @@ + return "&" if $_ == 38; + return "'" if $_ == 39; + return "<" if $_ == 60; ++ return ">" if $_ == 62; + return chr $_; + } + +@@ -1076,43 +1079,74 @@ + close OUTPUT; + print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG; + } +- } +- open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n"; +- binmode (OUTPUT) if $^O eq 'MSWin32'; +- my $tree = readXml($FILE); +- print_header($FILE, \*OUTPUT); +- parseTree(\*OUTPUT, $tree); +- close OUTPUT; +- print "CREATED $OUTFILE\n" unless $QUIET_ARG; ++ if ( ! -d "C" ) { ++ mkdir "C" or -d "C" or die "Cannot create subdirectory C: $!\n"; ++ } ++ open OUTPUT, ">C/$OUTFILE" or die "Cannot open C/$OUTFILE: $!\n"; ++ binmode (OUTPUT) if $^O eq 'MSWin32'; ++ my $tree = readXml($FILE); ++ print_header($FILE, \*OUTPUT); ++ parseTree(\*OUTPUT, $tree); ++ close OUTPUT; ++ print "CREATED C/$OUTFILE\n" unless $QUIET_ARG; ++ } else { ++ open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n"; ++ binmode (OUTPUT) if $^O eq 'MSWin32'; ++ my $tree = readXml($FILE); ++ print_header($FILE, \*OUTPUT); ++ parseTree(\*OUTPUT, $tree); ++ close OUTPUT; ++ print "CREATED $OUTFILE\n" unless $QUIET_ARG; ++ } + } + +-sub keys_merge_translations ++sub keys_merge_translation + { +- open INPUT, "<${FILE}" or die; +- open OUTPUT, ">${OUTFILE}" or die; ++ my ($lang) = @_; ++ ++ if ( ! -d $lang && $MULTIPLE_OUTPUT) ++ { ++ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n"; ++ } ++ ++ open INPUT, "<${FILE}" or die "Cannot open ${FILE}: $!\n"; ++ open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n"; + binmode (OUTPUT) if $^O eq 'MSWin32'; + +- while () ++ while () + { +- if (s/^(\s*)_(\w+=(.*))/$1$2/) ++ if (s/^(\s*)_(\w+=(.*))/$1$2/) + { +- my $string = $3; ++ my $string = $3; + +- print OUTPUT; ++ if (!$MULTIPLE_OUTPUT) ++ { ++ print OUTPUT; + +- my $non_translated_line = $_; ++ my $non_translated_line = $_; + +- for my $lang (sort keys %po_files_by_lang) ++ for my $lang (sort keys %po_files_by_lang) ++ { ++ my $translation = $translations{$lang, $string}; ++ next if !$translation; ++ ++ $_ = $non_translated_line; ++ s/(\w+)=.*/[$lang]$1=$translation/; ++ print OUTPUT; ++ } ++ } ++ else + { +- my $translation = $translations{$lang, $string}; +- next if !$translation; ++ my $non_translated_line = $_; ++ my $translation = $translations{$lang, $string}; ++ $translation = $string if !$translation; + + $_ = $non_translated_line; +- s/(\w+)=.*/[$lang]$1=$translation/; ++ s/(\w+)=.*/$1=$translation/; + print OUTPUT; + } +- } +- else ++ } ++ else + { + print OUTPUT; + } +@@ -1120,6 +1154,24 @@ + + close OUTPUT; + close INPUT; ++ ++ print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG; ++} ++ ++sub keys_merge_translations ++{ ++ if ($MULTIPLE_OUTPUT) ++ { ++ for my $lang (sort keys %po_files_by_lang) ++ { ++ keys_merge_translation ($lang); ++ } ++ keys_merge_translation ("C"); ++ } ++ else ++ { ++ keys_merge_translation ("."); ++ } + } + + sub desktop_merge_translations +@@ -1415,19 +1467,22 @@ + + sub quoted_translation + { +- my ($lang, $string) = @_; ++ my ($xml_mode, $lang, $string) = @_; + ++ $string = entity_decode($string) if $xml_mode; + $string =~ s/\\\"/\"/g; + + my $translation = $translations{$lang, $string}; + $translation = $string if !$translation; +- ++ $translation = entity_encode($translation) if $xml_mode; + $translation =~ s/\"/\\\"/g; + return $translation + } + + sub quoted_merge_translations + { ++ my ($xml_mode) = @_; ++ + if (!$MULTIPLE_OUTPUT) { + print "Quoted only supports Multiple Output.\n"; + exit(1); +@@ -1442,7 +1497,7 @@ + binmode (OUTPUT) if $^O eq 'MSWin32'; + while () + { +- s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($lang, $1) . "\""/ge; ++ s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($xml_mode, $lang, $1) . "\""/ge; + print OUTPUT; + } + close OUTPUT; +diff -Nur -x '*.orig' -x '*~' devhelp-0.19/intltool-update.in devhelp-0.19.new/intltool-update.in +--- devhelp-0.19/intltool-update.in 2008-01-30 14:05:20.000000000 +0000 ++++ devhelp-0.19.new/intltool-update.in 2008-02-07 23:53:19.000000000 +0000 +@@ -30,7 +30,7 @@ + + ## Release information + my $PROGRAM = "intltool-update"; +-my $VERSION = "0.36.2"; ++my $VERSION = "0.37.0"; + my $PACKAGE = "intltool"; + + ## Loaded modules +@@ -334,7 +334,7 @@ + push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/; + push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/; + push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/; +- }, "$SRCDIR/.."; ++ }, "$SRCDIR/.." if "$SRCDIR" ne "."; + + open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n"; + @buf_potfiles = grep !/^(#|\s*$)/, ; +@@ -434,8 +434,8 @@ + last; + } + +- ## N_ Q_ and _ are the three macros defined in gi8n.h +- if (/[NQ]?_ *\(QUOTEDTEXT/) ++ ## C_ N_ Q_ and _ are the macros defined in gi8n.h ++ if (/[CNQ]?_ *\(QUOTEDTEXT/) + { + if (defined isNotValidMissing (unpack("x3 A*", $file))) { + ## Remove the first 3 chars and add newline +@@ -777,7 +777,7 @@ + my $XGETTEXT_KEYWORDS = &FindPOTKeywords; + push @xgettext_argument, $XGETTEXT_KEYWORDS; + my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress; +- push @xgettext_argument, "--msgid-bugs-address\=$MSGID_BUGS_ADDRESS" if $MSGID_BUGS_ADDRESS; ++ push @xgettext_argument, "--msgid-bugs-address\=\"$MSGID_BUGS_ADDRESS\"" if $MSGID_BUGS_ADDRESS; + push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii); + push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS; + my $xgettext_command = join ' ', @xgettext_argument; +diff -Nur -x '*.orig' -x '*~' devhelp-0.19/ltmain.sh devhelp-0.19.new/ltmain.sh +--- devhelp-0.19/ltmain.sh 2007-08-14 18:43:36.000000000 +0100 ++++ devhelp-0.19.new/ltmain.sh 2008-01-22 15:51:52.000000000 +0000 +@@ -43,7 +43,7 @@ + + PROGRAM=ltmain.sh + PACKAGE=libtool +-VERSION="1.5.24 Debian 1.5.24-1ubuntu1" ++VERSION="1.5.24 Debian 1.5.24-2ubuntu2" + TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" + + # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). +diff -Nur -x '*.orig' -x '*~' devhelp-0.19/m4/intltool.m4 devhelp-0.19.new/m4/intltool.m4 +--- devhelp-0.19/m4/intltool.m4 2008-01-30 14:05:20.000000000 +0000 ++++ devhelp-0.19.new/m4/intltool.m4 2008-02-07 23:53:19.000000000 +0000 +@@ -87,6 +87,20 @@ + AC_SUBST(INTLTOOL_SERVICE_RULE) + AC_SUBST(INTLTOOL_POLICY_RULE) + ++# Check the gettext tools to make sure they are GNU ++AC_PATH_PROG(XGETTEXT, xgettext) ++AC_PATH_PROG(MSGMERGE, msgmerge) ++AC_PATH_PROG(MSGFMT, msgfmt) ++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then ++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) ++fi ++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" ++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" ++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" ++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then ++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) ++fi ++ + # Use the tools built into the package, not the ones that are installed. + AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') + AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge') +diff -Nur -x '*.orig' -x '*~' devhelp-0.19/Makefile.in devhelp-0.19.new/Makefile.in +--- devhelp-0.19/Makefile.in 2008-02-07 12:39:48.000000000 +0000 ++++ devhelp-0.19.new/Makefile.in 2008-02-07 23:55:38.000000000 +0000 +@@ -182,6 +182,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +diff -Nur -x '*.orig' -x '*~' devhelp-0.19/misc/gedit-plugin/devhelp/Makefile.in devhelp-0.19.new/misc/gedit-plugin/devhelp/Makefile.in +--- devhelp-0.19/misc/gedit-plugin/devhelp/Makefile.in 2008-02-07 12:39:47.000000000 +0000 ++++ devhelp-0.19.new/misc/gedit-plugin/devhelp/Makefile.in 2008-02-07 23:55:38.000000000 +0000 +@@ -153,6 +153,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +diff -Nur -x '*.orig' -x '*~' devhelp-0.19/misc/gedit-plugin/Makefile.in devhelp-0.19.new/misc/gedit-plugin/Makefile.in +--- devhelp-0.19/misc/gedit-plugin/Makefile.in 2008-02-07 12:39:47.000000000 +0000 ++++ devhelp-0.19.new/misc/gedit-plugin/Makefile.in 2008-02-07 23:55:38.000000000 +0000 +@@ -165,6 +165,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +diff -Nur -x '*.orig' -x '*~' devhelp-0.19/misc/Makefile.in devhelp-0.19.new/misc/Makefile.in +--- devhelp-0.19/misc/Makefile.in 2008-02-07 12:39:47.000000000 +0000 ++++ devhelp-0.19.new/misc/Makefile.in 2008-02-07 23:55:37.000000000 +0000 +@@ -155,6 +155,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +diff -Nur -x '*.orig' -x '*~' devhelp-0.19/src/Makefile.in devhelp-0.19.new/src/Makefile.in +--- devhelp-0.19/src/Makefile.in 2008-02-07 12:39:48.000000000 +0000 ++++ devhelp-0.19.new/src/Makefile.in 2008-02-07 23:55:38.000000000 +0000 +@@ -82,10 +82,12 @@ + libdevhelp_1_la-dh-parser.lo libdevhelp_1_la-dh-preferences.lo \ + libdevhelp_1_la-dh-util.lo libdevhelp_1_la-dh-window.lo \ + libdevhelp_1_la-eggfindbar.lo +-libdevhelp_1_la_OBJECTS = $(am_libdevhelp_1_la_OBJECTS) +-libdevhelp_1_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libdevhelp_1_la_CFLAGS) \ +- $(CFLAGS) $(libdevhelp_1_la_LDFLAGS) $(LDFLAGS) -o $@ ++nodist_libdevhelp_1_la_OBJECTS = libdevhelp_1_la-dummy.lo ++libdevhelp_1_la_OBJECTS = $(am_libdevhelp_1_la_OBJECTS) \ ++ $(nodist_libdevhelp_1_la_OBJECTS) ++libdevhelp_1_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ ++ $(CXXFLAGS) $(libdevhelp_1_la_LDFLAGS) $(LDFLAGS) -o $@ + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(bin_PROGRAMS) + am_devhelp_OBJECTS = devhelp-dh-main.$(OBJEXT) +@@ -116,7 +118,7 @@ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libcppwrapper_la_SOURCES) $(libdevhelp_1_la_SOURCES) \ +- $(devhelp_SOURCES) ++ $(nodist_libdevhelp_1_la_SOURCES) $(devhelp_SOURCES) + DIST_SOURCES = $(libcppwrapper_la_SOURCES) $(libdevhelp_1_la_SOURCES) \ + $(devhelp_SOURCES) + default_prefsDATA_INSTALL = $(INSTALL_DATA) +@@ -224,6 +226,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +@@ -336,7 +339,7 @@ + $(DEVHELP_LIBS) \ + libdevhelp-1.la + +-devhelp_LDFLAGS = -R$(GECKO_HOME) $(AM_LDFLAGS) ++devhelp_LDFLAGS = $(AM_LDFLAGS) + + # Build the C++ code in a separate library so we can use our warning + # flags for the C code. +@@ -396,6 +399,9 @@ + dh-window.h \ + eggfindbar.h + ++nodist_libdevhelp_1_la_SOURCES = \ ++ dummy.cpp ++ + libdevhelp_1_la_SOURCES = \ + bacon-message-connection.c \ + bacon-message-connection.h \ +@@ -430,7 +436,7 @@ + $(GECKO_LIBS) \ + $(GECKO_EXTRA_LIBS) + +-libdevhelp_1_la_LDFLAGS = -R$(GECKO_HOME) $(AM_LDFLAGS) ++libdevhelp_1_la_LDFLAGS = $(AM_LDFLAGS) + default_prefs_in_FILES = \ + default-prefs-common.js \ + default-prefs-mozilla.js \ +@@ -452,7 +458,7 @@ + $(devhelpinclude_HEADERS) \ + $(default_prefs_in_FILES) + +-CLEANFILES = $(BUILT_SOURCES) $(default_prefs_DATA) ++CLEANFILES = $(BUILT_SOURCES) $(default_prefs_DATA) dummy.cpp + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + +@@ -581,6 +587,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdevhelp_1_la-dh-search.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdevhelp_1_la-dh-util.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdevhelp_1_la-dh-window.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdevhelp_1_la-dummy.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdevhelp_1_la-eggfindbar.Plo@am__quote@ + + .c.o: +@@ -751,6 +758,13 @@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcppwrapper_la_CPPFLAGS) $(CPPFLAGS) $(libcppwrapper_la_CXXFLAGS) $(CXXFLAGS) -c -o libcppwrapper_la-dh-gecko-utils.lo `test -f 'dh-gecko-utils.cpp' || echo '$(srcdir)/'`dh-gecko-utils.cpp + ++libdevhelp_1_la-dummy.lo: dummy.cpp ++@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdevhelp_1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libdevhelp_1_la-dummy.lo -MD -MP -MF $(DEPDIR)/libdevhelp_1_la-dummy.Tpo -c -o libdevhelp_1_la-dummy.lo `test -f 'dummy.cpp' || echo '$(srcdir)/'`dummy.cpp ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libdevhelp_1_la-dummy.Tpo $(DEPDIR)/libdevhelp_1_la-dummy.Plo ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='dummy.cpp' object='libdevhelp_1_la-dummy.lo' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdevhelp_1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libdevhelp_1_la-dummy.lo `test -f 'dummy.cpp' || echo '$(srcdir)/'`dummy.cpp ++ + mostlyclean-libtool: + -rm -f *.lo + +@@ -1000,6 +1014,9 @@ + + default-prefs.js: $(default_prefs_files) + cat $^ > $@ ++ ++dummy.cpp: ++ echo 'static void __YYYY_dummy();' > $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: --- devhelp-0.19.orig/debian/patches/03html2diff_close_sub.patch +++ devhelp-0.19/debian/patches/03html2diff_close_sub.patch @@ -0,0 +1,30 @@ +--- devhelp-0.9.old/misc/html2xml.py 2004-04-20 19:55:14.000000000 +0100 ++++ devhelp-0.9/misc/html2xml.py 2004-06-29 14:33:56.000000000 +0100 +@@ -131,17 +131,17 @@ + print '' + for chap in dict['order']: + print ' ' % (chap, dict[chap]['link']) +- if not dict[chap].has_key ('order'): +- continue +- for sub in dict[chap]['order']: +- if not does_dict_have_keys (dict[chap][sub], ['link']): +- print ' ' % (sub, dict[chap][sub]['link']) ++ if dict[chap].has_key ('order'): ++ for sub in dict[chap]['order']: ++ if not does_dict_have_keys (dict[chap][sub], ['link']): ++ print ' ' % (sub, dict[chap][sub]['link']) + +- for sub2 in dict[chap][sub]['order']: +- print ' ' % (sub2, dict[chap][sub][sub2]['link']) +- print ' ' +- else: +- print ' ' % (sub, dict[chap][sub]['link']) ++ for sub2 in dict[chap][sub]['order']: ++ print ' ' % (sub2, dict[chap][sub][sub2]['link']) ++ print ' ' ++ else: ++ print ' ' % (sub, dict[chap][sub]['link']) ++ + print ' ' + print + --- devhelp-0.19.orig/debian/patches/04_devhelp-xul-1.9.patch +++ devhelp-0.19/debian/patches/04_devhelp-xul-1.9.patch @@ -0,0 +1,155 @@ +diff -Nur -x '*.orig' -x '*~' devhelp-0.17/src/default-prefs-gecko-1-9.js devhelp-0.17.new/src/default-prefs-gecko-1-9.js +--- devhelp-0.17/src/default-prefs-gecko-1-9.js 2007-04-20 10:44:13.000000000 +0200 ++++ devhelp-0.17.new/src/default-prefs-gecko-1-9.js 2008-01-16 11:44:13.000000000 +0100 +@@ -1,2 +1,2 @@ +-pref("browser.display.use_document_colors", false); ++pref("browser.display.use_document_colors", true); + +diff -Nur -x '*.orig' -x '*~' devhelp-0.17/src/dh-gecko-utils.cpp devhelp-0.17.new/src/dh-gecko-utils.cpp +--- devhelp-0.17/src/dh-gecko-utils.cpp 2007-12-19 18:30:30.000000000 +0100 ++++ devhelp-0.17.new/src/dh-gecko-utils.cpp 2008-01-16 11:45:11.000000000 +0100 +@@ -21,6 +21,9 @@ + */ + + #include ++#ifdef XPCOM_GLUE ++# include ++#endif + #include + #include + +@@ -41,7 +44,7 @@ + + #include + +-#ifndef HAVE_GECKO_1_8 ++#if !defined(HAVE_GECKO_1_8) && !defined(HAVE_GECKO_1_9) + #if defined (HAVE_CHROME_NSICHROMEREGISTRYSEA_H) + #include + #elif defined(MOZ_NSIXULCHROMEREGISTRY_SELECTSKIN) +@@ -226,7 +229,7 @@ + g_free (name); + } + +-#ifndef HAVE_GECKO_1_8 ++#if !defined(HAVE_GECKO_1_8) && !defined(HAVE_GECKO_1_9) + + static nsresult + getUILang (nsAString& aUILang) +@@ -286,7 +289,7 @@ + #endif + } + +-#endif /* !HAVE_GECKO_1_8 */ ++#endif /* !HAVE_GECKO_1_8 && !HAVE_GECKO_1_9 */ + + static nsresult + gecko_utils_init_prefs (void) +@@ -318,11 +321,57 @@ + NS_LogInit (); + #endif + ++nsresult rv; ++#ifdef XPCOM_GLUE ++ static const GREVersionRange greVersion = { ++ "1.9a", PR_TRUE, ++ "1.9.*", PR_TRUE ++ }; ++ char xpcomLocation[4096]; ++ rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096); ++ if (NS_FAILED (rv)) ++ { ++ g_warning ("Could not determine locale!\n"); ++ return; ++ } ++ ++ // Startup the XPCOM Glue that links us up with XPCOM. ++ rv = XPCOMGlueStartup(xpcomLocation); ++ if (NS_FAILED (rv)) ++ { ++ g_warning ("Could not determine locale!\n"); ++ return; ++ } ++ ++ rv = GTKEmbedGlueStartup(); ++ if (NS_FAILED (rv)) ++ { ++ g_warning ("Could not startup embed glue!\n"); ++ return; ++ } ++ ++ #ifdef GTKEmbedGlueStartupInternal ++ rv = GTKEmbedGlueStartupInternal(); ++ if (NS_FAILED (rv)) ++ { ++ g_warning ("Could not startup embed glue (internal)!\n"); ++ return; ++ } ++ #endif ++ ++ char *lastSlash = strrchr(xpcomLocation, '/'); ++ if (lastSlash) ++ *lastSlash = '\0'; ++ ++ gtk_moz_embed_set_path(xpcomLocation); ++ ++#else + #ifdef HAVE_GECKO_1_9 + gtk_moz_embed_set_path (GECKO_HOME); + #else + gtk_moz_embed_set_comp_path (GECKO_HOME); + #endif ++#endif // XPCOM_GLUE + + gchar *profile_dir = g_build_filename (g_get_home_dir (), + ".gnome2", +@@ -336,7 +383,7 @@ + + gecko_utils_init_prefs (); + +-#ifndef HAVE_GECKO_1_8 ++#if !defined(HAVE_GECKO_1_8) && !defined(HAVE_GECKO_1_9) + gecko_utils_init_chrome (); + #endif + } +diff -Nur -x '*.orig' -x '*~' devhelp-0.17/src/Makefile.am devhelp-0.17.new/src/Makefile.am +--- devhelp-0.17/src/Makefile.am 2007-04-20 10:54:09.000000000 +0200 ++++ devhelp-0.17.new/src/Makefile.am 2008-01-16 11:44:13.000000000 +0100 +@@ -25,7 +25,7 @@ + $(DEVHELP_LIBS) \ + libdevhelp-1.la + +-devhelp_LDFLAGS = -R$(GECKO_HOME) $(AM_LDFLAGS) ++devhelp_LDFLAGS = $(AM_LDFLAGS) + + # Build the C++ code in a separate library so we can use our warning + # flags for the C code. +@@ -87,6 +87,9 @@ + dh-window.h \ + eggfindbar.h + ++nodist_libdevhelp_1_la_SOURCES = \ ++ dummy.cpp ++ + libdevhelp_1_la_SOURCES = \ + bacon-message-connection.c \ + bacon-message-connection.h \ +@@ -121,7 +124,7 @@ + $(GECKO_LIBS) \ + $(GECKO_EXTRA_LIBS) + +-libdevhelp_1_la_LDFLAGS = -R$(GECKO_HOME) $(AM_LDFLAGS) ++libdevhelp_1_la_LDFLAGS = $(AM_LDFLAGS) + + dh-marshal.h: dh-marshal.list + (cd $(srcdir) && \ +@@ -171,4 +174,8 @@ + $(devhelpinclude_HEADERS) \ + $(default_prefs_in_FILES) + +-CLEANFILES = $(BUILT_SOURCES) $(default_prefs_DATA) ++dummy.cpp: ++ echo 'static void __YYYY_dummy();' > $@ ++ ++CLEANFILES = $(BUILT_SOURCES) $(default_prefs_DATA) dummy.cpp ++ --- devhelp-0.19.orig/debian/patches/01_do_not_clober_global_w_on_el.patch +++ devhelp-0.19/debian/patches/01_do_not_clober_global_w_on_el.patch @@ -0,0 +1,12 @@ +--- misc/devhelp.el~ 2003-06-29 10:24:17.000000000 -0300 ++++ misc/devhelp.el 2005-08-12 22:11:59.270346712 -0300 +@@ -3,8 +3,7 @@ + (defun devhelp-word-at-point () + "runs devhelp" + (interactive) +- (setq w (current-word)) +- (start-process-shell-command "devhelp" nil "devhelp" "-s" w) ++ (start-process-shell-command "devhelp" nil "devhelp" "-s" (current-word)) + ) + + ; Example: bind F7 to start devhelp and search for the word at the point. --- devhelp-0.19.orig/debian/devhelp.1 +++ devhelp-0.19/debian/devhelp.1 @@ -0,0 +1,36 @@ +.TH "devhelp" "1" "0.2" "Johan Dahlin " "devhelp" +.SH "NAME" +.LP +devhelp \- A developers help program. +.SH "SYNTAX" +.LP +devhelp [\fIOPTIONS\fP] +.SH "DESCRIPTION" +.LP +DevHelp is a help system for GNOME. +.br +.SH "OPTIONS" +.LP +.TP +\fB\-s, \-\-search\fR=STRING +Search for a function. +.SH "EXAMPLES" +.LP +To run this program the standard way type: +.LP +devhelp +.LP +If you would like to search for a function, type: +.LP +devhelp -s search-string +.SH "AUTHORS" +.LP +Copyright (C) 2000, 2001 The Free Software Foundation +.LP +DevHelp was written by Johan Dahlin , Mikael Hallendal and Richard Hult . +.LP +This manual page is Copyright (c) 2001 Johan Dahlin . +It has been written for the Debian GNU/Linux distribution and is distributed under the GNU General Public License. As such, it may be used, modified and distributed by anyone else as long as this copyright notice is preserved. +.SH "SEE ALSO" +.LP +gnome(1) --- devhelp-0.19.orig/debian/copyright +++ devhelp-0.19/debian/copyright @@ -0,0 +1,25 @@ +This package was debianized by Johan Dahlin on +Thu, 7 Jun 2001 20:06:40 -0400 and Gustavo Noronha Silva +started packaging it officialy on Thu, 28 Feb 2002 00:30:19 -0300. + +It was downloaded from http://www.imendio.com/projects/devhelp/ + +Upstream Maintainer: Mikael Hallendal + +Copyright: + +Copyright (C) 2000, 2001 The Free Software Foundation + +This program 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 program 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. + +On Debian GNU/Linux systems, the full text of the GNU General Public +License can be found in the file /usr/share/common-licenses/GPL. + --- devhelp-0.19.orig/debian/devhelp.menu +++ devhelp-0.19/debian/devhelp.menu @@ -0,0 +1,7 @@ +?package(devhelp):\ +needs="x11"\ +section="Applications/Programming"\ +title="DevHelp"\ +longtitle="DevHelp: developer's documentation browser and helper"\ +icon="/usr/share/pixmaps/devhelp-debian.xpm"\ +command="/usr/bin/devhelp" --- devhelp-0.19.orig/debian/watch +++ devhelp-0.19/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://ftp.gnome.org/pub/GNOME/sources/devhelp/([\d\.]+\d)/devhelp-(.*)\.tar\.gz --- devhelp-0.19.orig/debian/libdevhelp-1-dev.install +++ devhelp-0.19/debian/libdevhelp-1-dev.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/libdevhelp-1.so usr/lib/ +debian/tmp/usr/lib/pkgconfig/* usr/lib/pkgconfig/ +debian/tmp/usr/include/* usr/include/ --- devhelp-0.19.orig/debian/devhelp-debian.xpm +++ devhelp-0.19/debian/devhelp-debian.xpm @@ -0,0 +1,322 @@ +/* XPM */ +static char * devhelp_debian_xpm[] = { +"32 32 287 2", +" c None", +". c #000000", +"+ c #010000", +"@ c #210200", +"# c #5C0200", +"$ c #650000", +"% c #630000", +"& c #620000", +"* c #600000", +"= c #5F0000", +"- c #5E0000", +"; c #5C0000", +"> c #5B0000", +", c #590000", +"' c #580000", +") c #560000", +"! c #440402", +"~ c #150807", +"{ c #030000", +"] c #3F0300", +"^ c #780200", +"/ c #8A0000", +"( c #880000", +"_ c #860000", +": c #840000", +"< c #810000", +"[ c #7F0000", +"} c #7C0000", +"| c #7A0000", +"1 c #780000", +"2 c #750000", +"3 c #730000", +"4 c #6B0100", +"5 c #4E312E", +"6 c #4B4949", +"7 c #250200", +"8 c #680400", +"9 c #990000", +"0 c #980000", +"a c #950000", +"b c #930000", +"c c #900000", +"d c #8E0000", +"e c #8C0000", +"f c #870000", +"g c #850000", +"h c #820000", +"i c #800000", +"j c #720201", +"k c #522825", +"l c #888888", +"m c #4C4C4C", +"n c #050100", +"o c #340400", +"p c #8A0200", +"q c #A30100", +"r c #A30000", +"s c #A10000", +"t c #9E0000", +"u c #9C0000", +"v c #970000", +"w c #940000", +"x c #920000", +"y c #8B0000", +"z c #591F1C", +"A c #7B7676", +"B c #7C7C7C", +"C c #4F4F4F", +"D c #1B0200", +"E c #6C0400", +"F c #AC0100", +"G c #B20000", +"H c #B00000", +"I c #AE0000", +"J c #AB0000", +"K c #A90000", +"L c #A70000", +"M c #A40000", +"N c #A20000", +"O c #9F0000", +"P c #9D0000", +"Q c #9A0000", +"R c #900100", +"S c #621410", +"T c #7D7C7C", +"U c #808080", +"V c #757575", +"W c #474747", +"X c #3F0100", +"Y c #900200", +"Z c #BD0100", +"` c #BE0000", +" . c #BB0000", +".. c #B90000", +"+. c #B60000", +"@. c #B40000", +"#. c #B10000", +"$. c #AF0000", +"%. c #AC0000", +"&. c #AA0000", +"*. c #A80000", +"=. c #A60000", +"-. c #720E0B", +";. c #776867", +">. c #7E7E7E", +",. c #767676", +"'. c #6B6B6B", +"). c #212121", +"!. c #130000", +"~. c #430000", +"{. c #890000", +"]. c #830000", +"^. c #4A2C2C", +"/. c #797979", +"(. c #7A7A7A", +"_. c #6F6F6F", +":. c #1F1F1F", +"<. c #280000", +"[. c #9B0000", +"}. c #C10000", +"|. c #C20000", +"1. c #C30000", +"2. c #C40000", +"3. c #522121", +"4. c #737373", +"5. c #363636", +"6. c #2B0000", +"7. c #AD0000", +"8. c #D70000", +"9. c #D80000", +"0. c #572020", +"a. c #383838", +"b. c #020202", +"c. c #592121", +"d. c #030303", +"e. c #270000", +"f. c #CA0000", +"g. c #C90000", +"h. c #390303", +"i. c #181818", +"j. c #160000", +"k. c #740000", +"l. c #720000", +"m. c #710000", +"n. c #6F0000", +"o. c #6E0000", +"p. c #6D0000", +"q. c #6C0000", +"r. c #6B0000", +"s. c #6A0000", +"t. c #690202", +"u. c #690303", +"v. c #331818", +"w. c #4A4A4A", +"x. c #1D0505", +"y. c #300000", +"z. c #260100", +"A. c #070000", +"B. c #150000", +"C. c #410200", +"D. c #960200", +"E. c #960000", +"F. c #910000", +"G. c #7D0201", +"H. c #502422", +"I. c #707070", +"J. c #545454", +"K. c #340202", +"L. c #600100", +"M. c #432725", +"N. c #212020", +"O. c #020000", +"P. c #470000", +"Q. c #890100", +"R. c #7E0000", +"S. c #7D0000", +"T. c #5C1210", +"U. c #766E6D", +"V. c #7F7F7F", +"W. c #727272", +"X. c #626262", +"Y. c #1D1212", +"Z. c #570100", +"`. c #4A1613", +" + c #848383", +".+ c #373737", +"++ c #B30000", +"@+ c #B50000", +"#+ c #B80000", +"$+ c #BA0000", +"%+ c #760F0F", +"&+ c #5F5D5D", +"*+ c #747474", +"=+ c #686868", +"-+ c #1C0909", +";+ c #5A0100", +">+ c #561F1D", +",+ c #848180", +"'+ c #717171", +")+ c #303030", +"!+ c #890202", +"~+ c #D20303", +"{+ c #D20404", +"]+ c #D30303", +"^+ c #D30404", +"/+ c #D30202", +"(+ c #D30101", +"_+ c #820F0F", +":+ c #605E5E", +"<+ c #6C6C6C", +"[+ c #262222", +"}+ c #580100", +"|+ c #5D0804", +"1+ c #797473", +"2+ c #2F2F2F", +"3+ c #8C0303", +"4+ c #D80707", +"5+ c #D90808", +"6+ c #D90909", +"7+ c #D80606", +"8+ c #D80909", +"9+ c #881313", +"0+ c #585656", +"a+ c #2A2020", +"b+ c #510000", +"c+ c #6E110E", +"d+ c #766A69", +"e+ c #777777", +"f+ c #676767", +"g+ c #202020", +"h+ c #890707", +"i+ c #D50606", +"j+ c #D50808", +"k+ c #D40707", +"l+ c #D40606", +"m+ c #D40505", +"n+ c #D40404", +"o+ c #800909", +"p+ c #211E1E", +"q+ c #660000", +"r+ c #594644", +"s+ c #868686", +"t+ c #292929", +"u+ c #690101", +"v+ c #A20101", +"w+ c #A10303", +"x+ c #A00404", +"y+ c #9E0303", +"z+ c #9E0404", +"A+ c #9D0303", +"B+ c #9D0404", +"C+ c #9C0303", +"D+ c #9B0202", +"E+ c #9B0303", +"F+ c #9A0202", +"G+ c #9A0303", +"H+ c #440000", +"I+ c #3F3A3A", +"J+ c #313131", +"K+ c #240000", +"L+ c #330000", +"M+ c #2D0000", +"N+ c #3C0000", +"O+ c #7B0000", +"P+ c #D30000", +"Q+ c #CB0000", +"R+ c #413B3B", +"S+ c #404040", +"T+ c #060606", +"U+ c #400000", +"V+ c #CF0000", +"W+ c #3F3838", +"X+ c #010101", +"Y+ c #410000", +"Z+ c #C60000", +"`+ c #D20000", +" @ c #211818", +".@ c #0E0E0E", +"+@ c #320000", +"@@ c #2E0000", +"#@ c #230000", +"$@ c #220000", +"%@ c #210000", +"&@ c #200000", +"*@ c #1F0000", +"=@ c #1E0000", +"-@ c #1D0000", +" ", +" ", +" ", +" . . . . . + + + + + + + . ", +" @ # $ % & * = - ; > , ' ) ! ~ ", +" { ] ^ / ( _ : < [ } | 1 2 3 4 5 6 . ", +" 7 8 9 0 a b c d e / f g h i j k l m . . ", +" n o p q r s t u 9 v w x c d y ( z A B C . . ", +" D E F G H I J K L M N O P Q 0 R S T U V W . . ", +" X Y Z ` ...+.@.#.$.%.&.*.=.r s -.;.>.,.'.).. . ", +" !.~.g e y {.{.( f g : : ].h < < i [ ^./.(._.:.. . . ", +" <.[.}.}.}.|.|.1.1.1.1.1.2.2.2.2.1.2.3.4._.5.. . . ", +" 6.7.8.8.8.9.8.9.9.9.9.9.9.9.9.8.9.9.0.'.a.b.. . ", +" 6.7.9.8.9.9.8.8.9.9.9.9.9.9.9.9.9.9.c.W d.. . . ", +" e.N f.f.f.f.f.f.f.f.f.f.f.f.g.g.g.g.h.i.d.. . . ", +" j.= k.3 l.m.m.n.n.o.p.p.q.r.r.s.t.u.v.w.x.y.z.A. ", +" B.C.D.t Q Q 9 v E.a w x F.c d e G.H.>.'.I.J.K.L.M.N. ", +" O.P.Q.v w c d y ( _ : h i R.S.} | T.U.V.W.X.Y.Z.`. +.+. . ", +" 2 H #.++@.@++.#+....$+$+$+$+ . . .%+&+*+=+-+;+>+,+'+)+. . ", +" !+~+{+~+]+{+^+]+^+/+^+]+/+(+/+]+/+_+:+<+[+}+|+1+U 4.2+. . ", +" 3+4+5+6+7+5+6+4+8+7+4+4+7+7+4+7+4+9+0+a+b+c+d+U e+f+g+. . ", +" h+i+i+j+k+l+k+m+l+l+m+l+m+m+m+n+n+o+p+6.q+r+s+4.(.t+b.. . ", +" u+v+v+w+x+y+y+z+y+A+B+C+D+E+F+G+0 > H+@.++I+4.4.J+. . . ", +" K+L+M+N+O+].].: ].g : g _ g : _ f _ @.P+Q+R+/.S+T+. . ", +" U+g.9.9.9.9.9.9.9.9.9.9.9.9.9.9.9.V+W+w.X+. . ", +" Y+Z+P+`+P+P+P+P+P+P+P+P+P+P+P+P+P+Q+ @.@. . . ", +" +@x P P u u [.Q Q 9 9 9 v v v E.a c A.. . . ", +" @@@@<.K+K+#@#@$@$@%@%@&@*@*@*@=@-@+ . . ", +" ", +" ", +" ", +" "}; --- devhelp-0.19.orig/debian/control +++ devhelp-0.19/debian/control @@ -0,0 +1,105 @@ +Source: devhelp +Section: devel +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Bradley Smith +Uploaders: Debian GNOME Maintainers , Josselin Mouette , Sebastian Dröge +Build-Depends: cdbs, + debhelper (>= 5), + libgtk2.0-dev (>= 2.8.17-1), + libglade2-dev (>= 1:2.4.0-1), + libgconf2-dev (>= 2.6.0), + libwnck-dev (>= 2.14.1), + xulrunner-1.9-dev (>= 1.9~b3~), + libxml-parser-perl, + gnome-pkg-tools, + dpkg-dev (>= 1.13.19), + libglib2.0-dev (>= 2.8.0), + python-dev, + python-support (>= 0.3), + chrpath +Standards-Version: 3.7.3 + +Package: libdevhelp-1-0 +Section: libs +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + devhelp-common (= ${source:Version}) +Conflicts: devhelp (<< 0.8.1-1) +Replaces: devhelp (<< 0.9-5) +Description: Library providing documentation browser functionality + This library provides embedable widgets from the Devhelp program to + be integrated in tools like the Anjuta IDE for browsing API reference + documentation. + +Package: libdevhelp-1-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, + libgtk2.0-dev (>= 2.8.17-1), + libdevhelp-1-0 (= ${binary:Version}), + libwnck-dev (>= 2.14.1), + libgconf2-dev (>= 2.6.0), + libglade2-dev (>= 1:2.4.0-1) +Description: Library providing documentation browser functionality (development) + This library provides embedable widgets from the Devhelp program to + be integrated in tools like the Anjuta IDE for browsing API reference + documentation. + . + This package contains the development files. + +Package: devhelp +Section: devel +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, + xulrunner-1.9 (>= 1.9~b3~) +Recommends: libgtk2.0-doc (>= 2.2.0), + libglib2.0-doc (>= 2.2.0), + libpango1.0-doc +Conflicts: devhelp-books (<= 0.2-8), + devhelp-book-autotools (<= 0.2-8), + devhelp-book-binutils (<= 0.2-8), + devhelp-book-cvs (<= 0.2-8), + devhelp-book-emacs (<= 0.2-8), + devhelp-book-make (<= 0.2-8), + devhelp-book-ggad (<= 0.2-8), + devhelp-book-gnome (<= 0.2-8), + devhelp-book-gtk (<= 0.2-8), + devhelp-book-gtk2 (<= 0.2-8), + devhelp-book-glibc (<= 0.2-8), + devhelp-book-gdb (<= 0.2-8), + devhelp-book-python (<= 0.2-8), + devhelp-book-pygtk2 (<= 0.2-8), + devhelp-book-sdl (<= 0.2-8) +Description: A GNOME developers help program + Devhelp's primary goal is to be an API documentation browser for GNOME. + It is able to scan for .devhelp files generated automatically for + packages that use gtk-doc-tools to generate documentation for libraries + and programs. + . + Devhelp uses Gecko, the Mozilla rendering engine to render the HTML + manuals. It also provides Bonobo functionality, which is used to + allow command-line searches, emacs integration and embedding in + applications like the Anjuta IDE. + +Package: devhelp-common +Section: devel +Architecture: all +Depends: ${misc:Depends}, ${python:Depends} +Conflicts: devhelp (<< 0.16.1), + libdevhelp-1-0 (<< 0.9-6) +Replaces: devhelp (<< 0.16.1), + libdevhelp-1-0 (<< 0.9-6) +Description: common files for devhelp and its library + Devhelp's primary goal is to be an API documentation browser for GNOME. + It is able to scan for .devhelp files generated automatically for + packages that use gtk-doc-tools to generate documentation for libraries + and programs. + . + Devhelp uses Gecko, the Mozilla rendering engine to render the HTML + manuals. It also provides Bonobo functionality, which is used to + allow command-line searches, emacs integration and embedding in + applications like the Anjuta IDE. + . + This package provides internationalization files, mainly. --- devhelp-0.19.orig/debian/devhelp.postrm +++ devhelp-0.19/debian/devhelp.postrm @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" = purge ]; then + rmdir /etc/emacs/site-start.d > /dev/null 2>&1 || true + rmdir /etc/emacs > /dev/null 2>&1 || true +fi --- devhelp-0.19.orig/debian/libdevhelp-1-0.install +++ devhelp-0.19/debian/libdevhelp-1-0.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/libdevhelp-1.so.* usr/lib/ +debian/tmp/etc/* etc/ --- devhelp-0.19.orig/debian/devhelp.install +++ devhelp-0.19/debian/devhelp.install @@ -0,0 +1,2 @@ +debian/tmp/usr/share/applications/* usr/share/applications/ +debian/tmp/usr/bin/* usr/bin/ --- devhelp-0.19.orig/debian/rules +++ devhelp-0.19/debian/rules @@ -0,0 +1,48 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.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 += --disable-install-schemas --with-gecko=libxul-embedding + +DEB_DH_MAKESHLIBS_ARGS_ALL += -V 'libdevhelp-1-0 (>= 0.14)' + +X_TOOLS += misc/devhelp.vim \ + misc/html2funcs.py \ + misc/html2xml.py \ + misc/man2xml.py + +clean:: + -rm -f debian/devhelp.emacsen-startup + -rm -f src/dh-marshal.h + -rm -f debian/shlibs.local + +binary-install/devhelp-common:: + dh_pysupport -p$(cdbs_curpkg) /usr/lib/gedit-2/plugins/devhelp + +# this creates a debian/shlibs.local forcing very strict interdependencies +binary-post-install/libdevhelp-1-0:: +# chrpath -d `pwd`/debian/libdevhelp-1-0/usr/lib/libdevhelp-1.so.0.0.0 + dh_makeshlibs -plibdevhelp-1-0 -n \ + -V "libdevhelp-1-0 (= $(DEB_VERSION))" + mv debian/libdevhelp-1-0/DEBIAN/shlibs \ + debian/shlibs.local + +binary-post-install/devhelp:: +# chrpath -d `pwd`/debian/devhelp/usr/bin/devhelp + dh_link -pdevhelp usr/share/man/man1/devhelp.1.gz \ + usr/share/man/man1/devhelp-bin.1.gz + install -d `pwd`/debian/devhelp/usr/share/pixmaps/ + install -m 644 debian/devhelp-debian.xpm \ + `pwd`/debian/devhelp/usr/share/pixmaps/ + install -d `pwd`/debian/devhelp/usr/share/doc/devhelp/tools/ + install -m 644 $(X_TOOLS) \ + `pwd`/debian/devhelp/usr/share/doc/devhelp/tools/ + +pre-build:: + cp misc/devhelp.el debian/devhelp.emacsen-startup --- devhelp-0.19.orig/debian/devhelp.preinst +++ devhelp-0.19/debian/devhelp.preinst @@ -0,0 +1,21 @@ +#!/bin/sh + +set -e + +if [ "$1" = "upgrade" ] && [ "$1" = "install" ]; then + if [ -n "$2" ]; then + if dpkg --compare-versions "$2" lt "0.6.0-1"; then + test -f /etc/gconf/schemas/devhelp.schemas && \ + rm -f /etc/gconf/schemas/devhelp.schemas + + test -d /etc/gconf/gconf.xml.defaults/apps/devhelp && \ + rm -fr /etc/gconf/gconf.xml.defaults/apps/devhelp + + test -d /etc/gconf/gconf.xml.defaults/schemas/apps/devhelp && \ + rm -fr /etc/gconf/gconf.xml.defaults/schemas/apps/devhelp + fi + fi + true +fi + +#DEBHELPER# --- devhelp-0.19.orig/debian/changelog +++ devhelp-0.19/debian/changelog @@ -0,0 +1,816 @@ +devhelp (0.19-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #190269), Ubuntu remaining changes: + - debian/control{.in}: use xulrunner-1.9-dev as build dep instead of + libxul-dev + - add xulrunner 1.9 standalone glue and .m4 code + - add debian/patches/04_devhelp-xul-1.9.patch + - add debian/patches/04_devhelp-xul-1.9.m4.patch + - rerun autotools accordingly + - update 05_autotools_update.patch + - use --with-gecko=libxul-embedding as configure argument (instead of + firefox) + - update debian/rules + + -- Pedro Fragoso Thu, 07 Feb 2008 22:37:03 +0000 + +devhelp (0.19-1) unstable; urgency=low + + * New upstream bugfix release. + + -- Sebastian Dröge Thu, 07 Feb 2008 17:26:39 +0100 + +devhelp (0.18-1) unstable; urgency=low + + * New upstream bugfix release. + + -- Sebastian Dröge Wed, 30 Jan 2008 13:26:58 +0100 + +devhelp (0.17-1ubuntu3) hardy; urgency=low + + * properly fix Depends to point to xulrunner-1.9 as well + + -- Alexander Sack Thu, 17 Jan 2008 13:27:54 +0100 + +devhelp (0.17-1ubuntu2) hardy; urgency=low + + * only use GTKEmbedGlueStartupInternal if its actually defined in + gtkmozembed_glue.cpp + - update debian/patches/04_devhelp-xul-1.9.patch + + -- Alexander Sack Wed, 16 Jan 2008 14:14:37 +0100 + +devhelp (0.17-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control{.in}: use xulrunner-1.9-dev as build dep instead of + libxul-dev + - add xulrunner 1.9 standalone glue and .m4 code + - add debian/patches/04_devhelp-xul-1.9.patch + - add debian/patches/04_devhelp-xul-1.9.m4.patch + - rerun autotools accordingly + - update 05_autotools_update.patch + - use --with-gecko=libxul-embedding as configure argument (instead of + firefox) + - update debian/rules + + -- Alexander Sack Tue, 08 Jan 2008 09:42:15 +0000 + +devhelp (0.17-1) unstable; urgency=low + + [ Bradley Smith ] + * Update to use new standards version. + + [ Sebastian Dröge ] + * New upstream release: + + debian/control.in: + - Remove unneeded gnomevfs build dependency and update dependencies of + the -dev package. + + -- Sebastian Dröge Mon, 07 Jan 2008 21:34:56 +0100 + +devhelp (0.16.1-3ubuntu2) hardy; urgency=low + + * debian/rules: + - don't use chrpath so firefox libs are correcly loaded (LP: #164895) + + -- Sebastien Bacher Tue, 04 Dec 2007 17:21:38 +0100 + +devhelp (0.16.1-3ubuntu1) hardy; urgency=low + + * Sync with Debian + * debian/control.in: + - gedit plugin moved, update the devhelp replaces version + - update maintainer information + - use firefox and not xulrunner + * debian/rules: + - use firefox gecko + + -- Sebastien Bacher Tue, 20 Nov 2007 14:41:33 +0100 + +devhelp (0.16.1-3) unstable; urgency=low + + [ Josselin Mouette ] + * Set maintainer to the GNOME team. + * Use F11 instead of F7 for the emacs keybinding. Closes: #446191. + + [ Bradley Smith ] + * New Maintainer. Closes: #450879, #451064. + * Remove lintian warning about rpath. + * Remove lintian warning about Apps menu section. + + -- Josselin Mouette Thu, 15 Nov 2007 21:56:32 +0100 + +devhelp (0.16.1-2) unstable; urgency=low + + * Orphaning the package + + -- Gustavo Noronha Silva Sun, 11 Nov 2007 18:15:41 -0200 + +devhelp (0.16.1-1) unstable; urgency=low + + [ Kilian Krause ] + * Use binary:version and source:Version for binnNMU-safe uploads as + added in dpkg-dev 1.13.19. Add to Build-Depends accordingly. + + [ Sebastian Dröge ] + * New upstream release with many translation updates. + + -- Sebastian Dröge Mon, 08 Oct 2007 08:12:30 +0200 + +devhelp (0.16-1) unstable; urgency=low + + * New upstream release; no API change. + * Cleanup whitespaces. + + -- Loic Minier Sun, 16 Sep 2007 19:37:30 +0200 + +devhelp (0.15-1) unstable; urgency=low + + * Cleanups. + * New upstream release; no API change. + - Drop patch 80_desktop-file-all-icon-formats, merged upstream. + + -- Loic Minier Tue, 19 Jun 2007 12:15:17 +0200 + +devhelp (0.14-1) unstable; urgency=low + + * Wrap build-deps and deps. + * Drop Tag: defs. + * Cleanups: drop DEB_MAKE_INVOKE def, don't let rm calls error out, etc. + * New upstream stable release with API additions. + - Bump shlibs to >= 0.14. + - Drop patch 02_README_search_path_fix, merged upstream. + - Adds typeahead support; GNOME #116322; closes: #389151. + * Bump up Debhelper compatibility level to 5. + - Drop spurious reference to usr/lib/libdevhelp-1.a, usr/share/man, and + usr/share/mime-info. + * Include CDBS' utils. + * Install the scalable SVG icon too; ship the icon in devhelp-common. + * New patch, 80_desktop-file-all-icon-formats, fixes hardcoding of .png + format in devhelp's desktop file. + * Ship Gedit plugin in devhelp-common. + - Instal .gedit-plugin and *.py files in gedit-common. + - Build-dep on python-support (0.3). + - Call dh_pysupport in binary-install/devhelp-common:: on + usr/lib/gedit-2/plugins/devhelp. + - Depend on ${python:Depends}. + + -- Loic Minier Tue, 22 May 2007 15:03:27 +0200 + +devhelp (0.13-3) unstable; urgency=low + + [ Josselin Mouette ] + * libdevhelp-1-dev depends on libwnck-dev, libgnomeui-dev, + libgnomevfs2-dev, libgconf2-dev and libglade2-dev (closes: #422394). + + -- Gustavo Noronha Silva Fri, 11 May 2007 00:16:37 -0300 + +devhelp (0.13-2) unstable; urgency=low + + * debian/NEWS.Debian, debian/README.Debian: + - add information about devhelp no longer using ~/.devhelp/books, but + using the XDG basedir spec location instead; thanks to Sven Arvidsson + for pointing this out (Closes: #411714) + * debian/patches/02_README_search_path_fix.diff: + - also fix the information given by the README + * debian/watch: + - adapted in order to also track odd-ended version numbers + + -- Gustavo Noronha Silva Sat, 3 Mar 2007 13:07:15 -0300 + +devhelp (0.13-1) unstable; urgency=low + + * Add a get-orig-source target to retrieve the upstream tarball. + * New upstream release; bug fixes. + - Bump up shlibs for API and ABI additions. + - Drop patch 02_transparent_header_fix, merged upstream. + * Rename X-TOOLS to X_TOOLS. + * Use DEB_VERSION instead of computing VERSION. + * Don't overwrite DEB_CONFIGURE_EXTRA_FLAGS. + * Use devhelp.manpages instead of DEB_INSTALL_MANPAGES_devhelp. + + -- Loic Minier Sat, 3 Feb 2007 11:53:29 +0100 + +devhelp (0.12-2) unstable; urgency=low + + Loic Minier : + * Fix watch file to track stable releases. + + Gustavo Noronha: + * debian/patches/02_transparent_header_fix.diff: + - patch grabbed from upstream CVS to fix the 'header is transparent' + problem (Closes: #383027) + * debian/control.in: + - added debtags Tag fields using Enrico's debtags-updatecontrol with + a slight modification to use debian/control.in if it exists + + -- Gustavo Noronha Silva Sun, 10 Sep 2006 18:04:20 -0300 + +devhelp (0.12-1) unstable; urgency=low + + * Fix typo in the changelog of 0.11-5. + * New upstream release, with API additions. + - Add a missing libglib2.0-dev (>= 2.8.0) build-dep. + - Build-depend on python-dev for the new Gedit plugin. + - Update the location of devhelp.png from /usr/share/pixmaps to + /usr/share/icons/hicolor/48x48/apps. + + -- Loic Minier Mon, 7 Aug 2006 21:38:07 +0200 + +devhelp (0.11-5) unstable; urgency=low + + * Make package bin-NMU-able. + - Add a dpkg-dev >= 1.13.19 build-dep. + [debian/control, debian/control.in] + - Use ${source:Version} instead of ${Source-Version} to let libdevhelp-1-0 + depend on devhelp-common. + [debian/control, debian/control.in] + * Bump up Standards-Version to 3.7.2. + [debian/control, debian/control.in] + * Add ${misc:Depends} where missing. + [debian/control, debian/control.in] + * Drop what looks like bogus build-deps on automake, liborbit2-dev, gettext, + [debian/control, debian/control.in] + * Replace intltool build-dep with a libxml-parser-perl one. + [debian/control, debian/control.in] + * Simple rebuild to pull a correct libwnck18 shlib dep. + + -- Loic Minier Fri, 9 Jun 2006 16:51:15 +0200 + +devhelp (0.11-4) unstable; urgency=low + + * Bump up build-deps to libgtk2.0-dev >= 2.8.17-1, libwnck-dev >= 2.14.1, + libgnomevfs2-dev >= 2.14.0-3 to avoid any reference to Xrender.la and + Xcursor.la in .la files. + [debian/control, debian/control.in] + * Bump up deps of libdevhelp-1-dev to libgtk2.0-dev >= 2.8.17-1 to pull + packages without any reference to Xcursor.la or Xrender.la. + [debian/control, debian/control.in] + * Stop shipping *.la files in libdevhelp-1-dev. + [debian/libdevhelp-1-dev.install] + + -- Loic Minier Sun, 23 Apr 2006 22:37:49 +0200 + +devhelp (0.11-3) unstable; urgency=low + + * Built with xulrunner (Closes: #352085, #283364) + + Mike Hommey : + * Test build with xulrunner. + * debian/control, debian/control.in: + + Changed Build-deps from mozilla-browser to libxul-dev. + + Changed libdevhelp-1-0's dependencies and conflicts accordingly. + * debian/rules: Add --with-gecko=xulrunner to the configure line. + + -- Gustavo Noronha Silva Thu, 23 Feb 2006 11:55:39 -0300 + +devhelp (0.11-2) unstable; urgency=high + + [ Gustavo Noronha Silva ] + * debian/watch: + - updated for 0.11.* + + [ Loic Minier ] + * Rebuild to fix the dependencies borken in the libwnck-related binNMU. + + -- Loic Minier Fri, 20 Jan 2006 13:41:07 +0100 + +devhelp (0.11-1) unstable; urgency=low + + * New upstream release + - handle new gtk-doc format for devhelp books, used by + glib (Closes: #344407, #341100) + * debian/README.Debian: + - clarify that most books are installed by the normal documentation + packages and that more books are no longer made available due to + licensing problems + * debian/control.in: + - updated Build-Depends according to pkg-config requirements on + configure.in - raise GTK+ b-d to at least 2.6.0, added gconf >= 2.6.0, + and libwnck >= 2.10 + + -- Gustavo Noronha Silva Tue, 3 Jan 2006 21:49:40 -0200 + +devhelp (0.10-6) unstable; urgency=high + + * Add ${misc:Depends} to devhelp and libdevhelp-1-0. (Closes: #343661) + + -- Loic Minier Sat, 17 Dec 2005 11:21:12 +0100 + +devhelp (0.10-5) unstable; urgency=low + + [ Gustavo Noronha Silva ] + * debian/control.in: + - devhelp no longer Suggests devhelp-books which no longer exists + (Closes: #325326) + + [ Loic Minier ] + * Update debian/control. + * Release to unstable. + + -- Loic Minier Fri, 11 Nov 2005 12:39:44 +0100 + +devhelp (0.10-4) unstable; urgency=low + + * debian/libdevhelp-1-0.postinst: + - removed; gnome.mk does what I was doing manual and with the + correct path (Closes: #323455) + + -- Gustavo Noronha Silva Tue, 16 Aug 2005 19:46:42 -0300 + +devhelp (0.10-3) unstable; urgency=low + + * debian/devhelp.postrm: + - fix typo in redirection &> -> >& + + -- Gustavo Noronha Silva Sat, 13 Aug 2005 02:35:54 -0300 + +devhelp (0.10-2) unstable; urgency=low + + * debian/patches/01_do_not_clober_global_w_on_el.patch: + - do not setq the w variable unecessarily in the emacs + integration script (Closes: #318985) + * debian/control.in: + - Standards-Version increased to 3.6.2 with no changes + * debian/rules: + - include cdbs' gnome.mk so that dh_gconf and dh_desktop + will do their job; this is real late, btw =(... gah! + * debian/devhelp.preinst: + - fixed bashism on condition checking + + -- Gustavo Noronha Silva Fri, 12 Aug 2005 22:54:50 -0300 + +devhelp (0.10-1) unstable; urgency=low + + * New upstream release. + * debian/devhelp.menu: + - removed the hints field, it's not really needed (Closes: #292655) + * debian/control.in: + - removed libgnomeui-dev from Build-Deps as it is no longer needed + + -- Gustavo Noronha Silva Sun, 8 May 2005 19:17:01 -0300 + +devhelp (0.9.3-2) UNRELEASED; urgency=low + + * debian/watch: + - changed to use http method instead + + -- Gustavo Noronha Silva Sun, 17 Apr 2005 13:30:08 -0300 + +devhelp (0.9.3-1) unstable; urgency=low + + * New upstream release. + + -- Gustavo Noronha Silva Fri, 22 Oct 2004 22:00:26 -0300 + +devhelp (0.9.2-1) unstable; urgency=low + + * New upstream release. + + -- J.H.M. Dassen (Ray) Wed, 29 Sep 2004 21:21:11 +0200 + +devhelp (0.9.1-1) unstable; urgency=low + + * New upstream release. + * debian/patches/01export_ld_library_path.patch: + - removed, this upstream version fixes this + * debian/patches/02relibtoolize.patch: + - removed, this upstream version is libtoolized with a + newer libtool already + * debian/patches/04book_search_path_fix.patch: + - this came from upstream's CVS, and is in this release + so no longer needed + + -- Gustavo Noronha Silva Sat, 31 Jul 2004 12:54:20 -0300 + +devhelp (0.9-8) unstable; urgency=low + + * debian/devhelp.postinst -> debian/libdevhelp-1-0.postinst: + - the package that provides the schema file should be + the one installing it! + * debian/rules: + - create shlibs.local to override dependency information + for libdevhelp-1-0, so that devhelp will depend on the + exact version of the library (Closes: #256852) + - moved the command that copies the elisp file to debian/ + to a pre-build:: rule, so it will be there when dh_installemacsen + runs (Closes: #257177) + * debian/control.in: + - replaced all 'DevHelp' ocurrences with 'Devhelp', as it seems + to be the "official" name given upstream. + * debian/patches/02relibtoolize.diff: + - renamed to end with .patch instead, to be consistent with + the other ones + * debian/patches/03html2diff_close_sub.patch: + - adding patch from Richard Cohen + for html2xml.py to close tags (Closes: #256848) + * debian/patches/04book_search_path_fix.patch: + - adding patch from upstream's CVS to have ~/.devhelp + override system-wide books in case of duplicates and + to avoid '.' and '..' while searching for books. + + -- Gustavo Noronha Silva Fri, 2 Jul 2004 17:04:50 -0300 + +devhelp (0.9-7) unstable; urgency=low + + * debian/changelog: + - updated entries from the branch that was being maintained + for unstable before + * debian/control.in: + - up-ported changed from 0.8-4, uploaded previously + - make devhelp-common Replace and Conflict with libdevhelp-1-0, + as it distributes files it once contained + * debian/patches/02relibtoolize.diff: + - updated to include /usr/include/mozilla in INCLUDES and + MOZILLA_COMPONENT_LIBS to devhelp_LDADD in src/Makefile.am + + -- Gustavo Noronha Silva Fri, 25 Jun 2004 16:39:16 -0300 + +devhelp (0.9-6) unstable; urgency=low + + * First release to unstable + * debian/control.in, debian/devhelp-common.install: + - create a new devhelp-common package to contain all the + non-arch-specific files + * debian/control.in: + - update all build-deps to tighten them up with unstable's + versions of gnome2.6 stuff + + -- Gustavo Noronha Silva Thu, 27 May 2004 19:31:17 -0300 + +devhelp (0.9-5) experimental; urgency=low + + * debian/libdevhelp-1-0.install, debian/devhelp.install: + - etc/* should be in libdevhelp-1-0, done that (Closes: #244593) + * debian/control.in: + - libdevhelp-1-0 Replaces devhelp << 0.9-5 (this revision) + * debian/pacthes/01relibtoolize.diff: + - relibtoolize devhelp to remove uneeded dependencies + + -- Gustavo Noronha Silva Mon, 19 Apr 2004 19:07:03 -0300 + +devhelp (0.9-4) experimental; urgency=low + + * debian/rules: + - remove DEB_DH_LINK_ARGS and call dh_link explicitely to + avoid having the link added to every package + (Closes: #241881) + + -- Gustavo Noronha Silva Sun, 4 Apr 2004 15:23:31 -0300 + +devhelp (0.9-3) experimental; urgency=low + + * debian/control.in: + - Build-Depends on intltool (Closes: #241468) + * debian/rules: + - create a link from the manpage for devhelp to + devhelp-bin + + -- Gustavo Noronha Silva Sat, 3 Apr 2004 12:42:52 -0300 + +devhelp (0.9-2) experimental; urgency=low + + * Gustavo Noronha Silva : + + debian/patches/01export_ld_library_path.patch: + - add patch to the devhelp's wrapper script so that it + exports LD_LIBRARY_PATH + + -- Gustavo Noronha Silva Wed, 24 Mar 2004 22:31:19 -0300 + +devhelp (0.9-1) experimental; urgency=low + + * New upstream release + * Gustavo Noronha Silva : + + debian/rules: + - no need to ask for building with Gecko, as it is the + default now + - no need to rm the libegg/util/eggmarshalers.c file, + as this version no longer uses egg stuff + + debian/devhelp.install, debian/devhelp-wrapper, debian/rules: + - devhelp now provides its own wrapper, which it + would install into /usr/bin/devhelp, and which calls + /usr/bin/devhelp-bin + + debian/control: + - build-depends on gtk >= 2.3.1, libglade2-dev >= 1.3.6 and + mozilla-dev >= 1.6 + + debian/devhelp.postinst: + - install the devhelp's schema file correctly + + -- Gustavo Noronha Silva Tue, 23 Mar 2004 18:30:30 -0300 + +devhelp (0.8.1-4) unstable; urgency=low + + * debian/control.in: + - updated dependencies and build-deps for mozilla 1.7 + - conflicts with mozilla >= 1.8 (Closes: #256047) + * debian/patches/01relibtoolize.diff: + - updated to have HTML_WIDGET_LIBS added to devhelp_LDADD + on src/Makefile.am + + -- Gustavo Noronha Silva Fri, 25 Jun 2004 12:47:12 -0300 + +devhelp (0.8.1-3) unstable; urgency=low + + * debian/patches/01relibtoolize.diff: + - litboolize'd source to remove uneeded dependecies + + -- Gustavo Noronha Silva Mon, 19 Apr 2004 17:00:35 -0300 + +devhelp (0.8.1-2) unstable; urgency=low + + * [debian/control.in] Added build dependency on libxml-parser-perl to fix + FTBFS. (Closes: #241468) + + -- J.H.M. Dassen (Ray) Sun, 11 Apr 2004 14:07:43 +0200 + +devhelp (0.8.1-1) unstable; urgency=low + + * New upstream release + * Gustavo Noronha Silva : + + debian/rules: + - include gnome-pkg-tools debian/control generation + rules + - made devhelp be built using gecko as the html rendering + engine + + debian/control.in: + - created, to generate debian/control + - build-depend on mozilla-dev and on gnome-pkg-tools + - libdevhelp-1-0 needs to depend on current + mozilla-browser + - created the libdevhelp-1-0 and libdevhelp-1-dev + packages + - improved devhelp's decription + + -- Gustavo Noronha Silva Sun, 21 Mar 2004 18:16:59 -0300 + +devhelp (0.7-7) unstable; urgency=low + + * The "It's ironic looking at some previous changelog entries" + (a.k.a. "gnome2.4 is here!") release + * debian/devhelp-debian.xpm: + - used gimp-1.3 to recreate from the original ui/devhelp.png + file, thus making the black put there by imagemagick's convert + thing go away (Closes: #220209) + + -- Gustavo Noronha Silva Sat, 6 Dec 2003 00:29:11 -0200 + +devhelp (0.7-6) unstable; urgency=low + + * The "Sorry, I was too eager, could not wait!" release. + (a.k.a.: "source-only uploads would be nice" release) + - build with pbuilder locally, so that no gnome2.4 dependencies + will be used (Closes: #215218). + + -- Gustavo Noronha Silva Sun, 12 Oct 2003 21:37:08 -0200 + +devhelp (0.7-5) unstable; urgency=low + + * debian/control: + - added Uploaders header based on file-roller's one + - increased Standards-Version to 3.6.1, no changes. + + -- Gustavo Noronha Silva Fri, 10 Oct 2003 00:22:51 -0300 + +devhelp (0.7-4) unstable; urgency=low + + * debian/postrm: + - also remove /etc/emacs if empty + + -- Gustavo Noronha Silva Sun, 27 Jul 2003 06:15:29 -0300 + +devhelp (0.7-3) unstable; urgency=low + + * debian/README.Debian: + - clarify the new book format stuff a bit more (Closes: #195507) + * debian/postrm: + - remove /etc/emacs/site-start.d if it is empty (Closes: #201981) + + -- Gustavo Noronha Silva Sat, 26 Jul 2003 02:19:10 -0300 + +devhelp (0.7-2) unstable; urgency=low + + * debian/rules: + - adopting cdbs + - install all scripts from misc/ (Closes: #200055) + * debian/patches/00install-devhelp-el: + - edited misc/devhelp.el to enable the 'f7' keybinding + by default + * debian/copyright: + - updated information on author/site + + -- Gustavo Noronha Silva Sat, 12 Jul 2003 17:11:34 -0300 + +devhelp (0.7-1) unstable; urgency=low + + * New upstream release + * debian/rules: + - does not install emacs and vim stuff myself, as upstream + is taking care of that himself + - added aditional clean stuff to remove the marshallers + files that are auto-generated during the build + * debian/control: + - Build-Dep on debhelper (>= 4.0.0) + * debian/compat: + - new file, compat for debhelper + * debian/docs: + - removed TODO + * src/Makefile.in: + - removed -rpath stuff + * debian/devhelp-debian.xpm: + - removed the color limitation stuff, as it is + not mandated by the menu policy anymore + + -- Gustavo Noronha Silva Wed, 2 Jul 2003 01:46:58 -0300 + +devhelp (0.6.0-2) unstable; urgency=low + + * Rebuilt to depend on the right version of the library + (I thought libgtkhtml2-dev would depend on the right + package... I was proven wrong) (Closes: #193098) + + -- Gustavo Noronha Silva Tue, 13 May 2003 22:10:17 -0300 + +devhelp (0.6.0-1) unstable; urgency=low + + * New upstream release (Closes: #183125) + - debian packaging somewhat redone to clean debian diff + - spec-only books now seem to work alright -- I tested with + bonobo.devhelp (Closes: #139031) + - relative links seem to work now (Closes: #158498) + - devhelp changed a LOT, it now uses other libraries and + behaves very differently on using books, so I guess I + can close this bug. If this is still a problem, reopen + the bug (Closes: #149171) + * debian/postinst: + - do not need it anymore, there's no schema file to install + * debian/preinst: + - remove old cruft left after purging on earlier versions + if found (Closes: #160297) + * debian/control: + - Standards-Version to 3.5.9 (no changes) + - fixed the Build-Depends line + - Recommends the -doc packages that contain .devhelp files + + -- Gustavo Noronha Silva Sat, 10 May 2003 15:22:27 -0300 + +devhelp (0.5.0-1) unstable; urgency=low + + * New upstream release + * debian/rules: + - support nostrip on DEB_BUILD_OPTIONS + + -- Gustavo Noronha Silva Sat, 12 Apr 2003 03:39:22 -0300 + +devhelp (0.4-6) unstable; urgency=low + + * src/Makefile: + - remove -rpath when linking the la lib + + -- Gustavo Noronha Silva Tue, 8 Apr 2003 04:38:11 -0300 + +devhelp (0.4-5) unstable; urgency=low + + * Rebuilt to depend on new libgal (Closes: #188062) + * debian/control: + - upgrade to Standards-Version 3.5.9 + - removed full stop from short description + * debian/devhelp-debian.xpm: + - remove colors not in Debian's cmap + + -- Gustavo Noronha Silva Tue, 8 Apr 2003 04:18:41 -0300 + +devhelp (0.4-4) unstable; urgency=low + + * updated libtool related stuff (Closes: #168641) + + -- Gustavo Noronha Silva Tue, 12 Nov 2002 01:07:03 -0200 + +devhelp (0.4-3) unstable; urgency=low + + * debian/rules: + - install emacs elisp file as startup file to emacs and ship + the vim thing on /usr/share/doc/devhelp (Closes: #164281) + * misc/devhelp.el: + - modified to bind f7 automatically + + -- Gustavo Noronha Silva Mon, 11 Nov 2002 02:32:25 -0200 + +devhelp (0.4-2) unstable; urgency=low + + * debian/control: + - Build-Depends on libjpeg62-dev (Closes: #158449) + + -- Gustavo Noronha Silva Thu, 5 Sep 2002 02:12:42 -0300 + +devhelp (0.4-1) unstable; urgency=low + + * New upstream version, cleaned-up some patches + * debian/control: + - changed recommends to suggests: devhelp-books to + make dselect users happy (Closes: #140883) + - removed lib* packages, the libs that are built should + not be public + + -- Gustavo Noronha Silva Tue, 7 May 2002 21:55:29 +0000 + +devhelp (0.3-10) unstable; urgency=low + + * Added entry to devhelp on the Debian menu system + (Closes: #141133) + + -- Gustavo Noronha Silva Fri, 5 Apr 2002 02:10:43 -0300 + +devhelp (0.3-9) unstable; urgency=low + + * src/devhelp-window.c: + - modified to have medium fonts when configuration is + not reachable (Closes: #139973) (which should by no + means be 'normal', btw, but wishlist) + + -- Gustavo Noronha Silva Tue, 2 Apr 2002 01:53:34 -0300 + +devhelp (0.3-8) unstable; urgency=low + + * src/install.c: + - changed the command that is run by devhelp to be posix-shell + compliant, thanks to Manuel Estrada Sainz + + -- Gustavo Noronha Silva Tue, 26 Mar 2002 03:33:31 -0300 + +devhelp (0.3-7) unstable; urgency=low + + * src/bookshelf.c: + - also add books from /usr/local/share/devhelp + * debian/README.Debian: + - explains what I've done to bookshelf and mentions the + devhelp-book-* packages + + -- Gustavo Noronha Silva Sun, 24 Mar 2002 03:37:21 -0300 + +devhelp (0.3-6) unstable; urgency=low + + * more missing Build-Depends: liborbit-dev, xlibs-dev and 'gettext' + let's hope this now really fixes the problems =/ + + -- Gustavo Noronha Silva Sat, 16 Mar 2002 00:50:08 -0300 + +devhelp (0.3-5) unstable; urgency=low + + * added Build-Depends: on libbonobo-dev, this hopefully + really fixes the autobuilders' problems + + -- Gustavo Noronha Silva Fri, 15 Mar 2002 04:26:18 -0300 + +devhelp (0.3-4) unstable; urgency=low + + * added build-depends on automake, this should fix the + problems building on autobuilders (Closes: #138175) + + -- Gustavo Noronha Silva Wed, 13 Mar 2002 15:21:57 -0300 + +devhelp (0.3-3) unstable; urgency=low + + * I'm now taking official maintaince of this package + for Debian (Closes: #131127) + * depcomp: + - removed dangling symlink + * CVS: + - removed all CVS directories + * debian/control: + - changed Maintainer field + - added Build-Depends field + * debian/rules: + - added configure: target + - builds libdevhelp0 and libdevhelp-dev packages + * debian/postinst: + - install gconf's schema with gconftool + * debian/control: + - added libdevhelp0 and libdevhelp-dev packages + - Recommends: devhelp-books + * src/bookshelf.c: + - edited to select '/usr/share' manually as DATA_DIR, + I just can't think of any reason why it would be selecting + /usr/local/share but it is, even if DATA_DIR=/usr/share... + a quick hack, will come fix this issue the right way later + + -- Gustavo Noronha Silva Thu, 28 Feb 2002 02:59:52 -0300 + +devhelp (0.3-2) unstable; urgency=low + + * Built against latest libraries in unstable + + -- Johan Dahlin Tue, 15 Jan 2002 16:38:30 -0400 + +devhelp (0.3-1) unstable; urgency=low + + * New upstream release. + + -- Johan Dahlin Sun, 1 Dec 2001 20:20:13 -0400 + +devhelp (0.2.0.99-1) unstable; urgency=low + + * Initial release. + + -- Johan Dahlin Wed, 6 Jun 2001 00:12:09 -0400 + --- devhelp-0.19.orig/debian/README.Debian +++ devhelp-0.19/debian/README.Debian @@ -0,0 +1,45 @@ +------------------ +DevHelp for Debian +------------------ + +Contents: + +* Packaged Books +* New Book Format +* Installing a new book + +* Packaged Books + +DevHelp is just a book browser. The GTK+ source documentation tool, +gtk-doc is able to create devhelp books. Many libraries of the GNOME +family use this feature, so you just have to install the package +that contains the documentation of that library to have it available +in DevHelp. Notice that some libraries provide the documentation in a +separate -doc package (libglib2.0-doc, for one), and some provide it +in the -dev package (libgconf2-dev, for example). + +Some other books used to be packaged for Debian, but are no longer +available in newer Debian releases because most of them are licensed +with the GNU FDL, which does not comply with the DFSG curerntly. + +* New Book Format + +Unfortunately devhelp's book format was a bit unstable for quite some +time, so many of the books available (mainly from LIDN's website[0]) +are not working anymore. + +If the book you are looking for is not available as a Debian package, +nor from the Internet you can build your own book using the tools +avilable on /usr/share/doc/devhelp/tools directory. + +* Installing a new, not packaged, book + +As long as the book follows the new book format you can simply unpack +the book at the $XDG_DATA_HOME/gtk-doc/html directory, and it will be +available in devhelp. Notice that if an explicit value has not been +given to XDG_DATA_HOME, the default is $HOME/.local/share/. See the +XDG Base Directory Specification for more information on the +XDG_DATA_HOME environment variable. + + -- Gustavo Noronha Silva , Sat, 3 Mar 2007 12:57:31 -0300 + --- devhelp-0.19.orig/debian/NEWS.Debian +++ devhelp-0.19/debian/NEWS.Debian @@ -0,0 +1,16 @@ +devhelp (0.13-2) unstable; urgency=low + + Since version 0.13 devhelp follows the XDG specs for book searching. + This means that if you have been using the .devhelp/books directory for + reading your own devhelp books they will not be available unless you + move them to $XDG_DATA_HOME/gtk-doc/html/ (if $XDG_DATA_HOME is not + explicitely set, use $HOME/.local/share) or $XDG_DATA_HOME/devhelp/books/. + + See the XDG spec for more information: + + http://standards.freedesktop.org/basedir-spec/basedir-spec-0.6.html#variables + + Thanks to Sven Arvidsson for pointing this out. + + -- Gustavo Noronha Silva Sat, 3 Mar 2007 12:36:08 -0300 + --- devhelp-0.19.orig/debian/devhelp-common.install +++ devhelp-0.19/debian/devhelp-common.install @@ -0,0 +1,5 @@ +debian/tmp/usr/lib/gedit-2/plugins/devhelp.gedit-plugin +debian/tmp/usr/lib/gedit-2/plugins/devhelp/*.py +debian/tmp/usr/share/devhelp/* usr/share/devhelp/ +debian/tmp/usr/share/locale/* usr/share/locale/ +debian/tmp/usr/share/icons/hicolor --- devhelp-0.19.orig/debian/docs +++ devhelp-0.19/debian/docs @@ -0,0 +1,2 @@ +AUTHORS +README --- devhelp-0.19.orig/debian/control.in +++ devhelp-0.19/debian/control.in @@ -0,0 +1,105 @@ +Source: devhelp +Section: devel +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Bradley Smith +Uploaders: @GNOME_TEAM@ +Build-Depends: cdbs, + debhelper (>= 5), + libgtk2.0-dev (>= 2.8.17-1), + libglade2-dev (>= 1:2.4.0-1), + libgconf2-dev (>= 2.6.0), + libwnck-dev (>= 2.14.1), + xulrunner-1.9-dev (>= 1.9~b3~), + libxml-parser-perl, + gnome-pkg-tools, + dpkg-dev (>= 1.13.19), + libglib2.0-dev (>= 2.8.0), + python-dev, + python-support (>= 0.3), + chrpath +Standards-Version: 3.7.3 + +Package: libdevhelp-1-0 +Section: libs +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + devhelp-common (= ${source:Version}) +Conflicts: devhelp (<< 0.8.1-1) +Replaces: devhelp (<< 0.9-5) +Description: Library providing documentation browser functionality + This library provides embedable widgets from the Devhelp program to + be integrated in tools like the Anjuta IDE for browsing API reference + documentation. + +Package: libdevhelp-1-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, + libgtk2.0-dev (>= 2.8.17-1), + libdevhelp-1-0 (= ${binary:Version}), + libwnck-dev (>= 2.14.1), + libgconf2-dev (>= 2.6.0), + libglade2-dev (>= 1:2.4.0-1) +Description: Library providing documentation browser functionality (development) + This library provides embedable widgets from the Devhelp program to + be integrated in tools like the Anjuta IDE for browsing API reference + documentation. + . + This package contains the development files. + +Package: devhelp +Section: devel +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, + xulrunner-1.9 (>= 1.9~b3~) +Recommends: libgtk2.0-doc (>= 2.2.0), + libglib2.0-doc (>= 2.2.0), + libpango1.0-doc +Conflicts: devhelp-books (<= 0.2-8), + devhelp-book-autotools (<= 0.2-8), + devhelp-book-binutils (<= 0.2-8), + devhelp-book-cvs (<= 0.2-8), + devhelp-book-emacs (<= 0.2-8), + devhelp-book-make (<= 0.2-8), + devhelp-book-ggad (<= 0.2-8), + devhelp-book-gnome (<= 0.2-8), + devhelp-book-gtk (<= 0.2-8), + devhelp-book-gtk2 (<= 0.2-8), + devhelp-book-glibc (<= 0.2-8), + devhelp-book-gdb (<= 0.2-8), + devhelp-book-python (<= 0.2-8), + devhelp-book-pygtk2 (<= 0.2-8), + devhelp-book-sdl (<= 0.2-8) +Description: A GNOME developers help program + Devhelp's primary goal is to be an API documentation browser for GNOME. + It is able to scan for .devhelp files generated automatically for + packages that use gtk-doc-tools to generate documentation for libraries + and programs. + . + Devhelp uses Gecko, the Mozilla rendering engine to render the HTML + manuals. It also provides Bonobo functionality, which is used to + allow command-line searches, emacs integration and embedding in + applications like the Anjuta IDE. + +Package: devhelp-common +Section: devel +Architecture: all +Depends: ${misc:Depends}, ${python:Depends} +Conflicts: devhelp (<< 0.16.1), + libdevhelp-1-0 (<< 0.9-6) +Replaces: devhelp (<< 0.16.1), + libdevhelp-1-0 (<< 0.9-6) +Description: common files for devhelp and its library + Devhelp's primary goal is to be an API documentation browser for GNOME. + It is able to scan for .devhelp files generated automatically for + packages that use gtk-doc-tools to generate documentation for libraries + and programs. + . + Devhelp uses Gecko, the Mozilla rendering engine to render the HTML + manuals. It also provides Bonobo functionality, which is used to + allow command-line searches, emacs integration and embedding in + applications like the Anjuta IDE. + . + This package provides internationalization files, mainly. --- devhelp-0.19.orig/debian/compat +++ devhelp-0.19/debian/compat @@ -0,0 +1 @@ +5 --- devhelp-0.19.orig/config.log +++ devhelp-0.19/config.log @@ -0,0 +1,333 @@ +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by Devhelp configure 0.17, which was +generated by GNU Autoconf 2.61. Invocation command line was + + $ /tmp/devhelp-0.17/./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libexecdir=${prefix}/lib/devhelp --disable-maintainer-mode --disable-dependency-tracking --srcdir=. --disable-install-schemas --with-gecko=libxul-embedding + +## --------- ## +## Platform. ## +## --------- ## + +hostname = hector +uname -m = x86_64 +uname -r = 2.6.24-4-generic +uname -s = Linux +uname -v = #1 SMP Mon Jan 14 18:19:11 UTC 2008 + +/usr/bin/uname -p = unknown +/bin/uname -X = unknown + +/bin/arch = unknown +/usr/bin/arch -k = unknown +/usr/convex/getsysinfo = unknown +/usr/bin/hostinfo = unknown +/bin/machine = unknown +/usr/bin/oslevel = unknown +/bin/universe = unknown + +PATH: /home/asac/local/bin +PATH: /usr/local/sbin +PATH: /usr/local/bin +PATH: /usr/sbin +PATH: /usr/bin +PATH: /sbin +PATH: /bin +PATH: /usr/bin/X11 +PATH: /usr/games + + +## ----------- ## +## Core tests. ## +## ----------- ## + +configure:2111: checking for a BSD-compatible install +configure:2167: result: /usr/bin/install -c +configure:2178: checking whether build environment is sane +configure:2221: result: yes +configure:2249: checking for a thread-safe mkdir -p +configure:2288: result: /bin/mkdir -p +configure:2301: checking for gawk +configure:2317: found /usr/bin/gawk +configure:2328: result: gawk +configure:2339: checking whether make sets $(MAKE) +configure:2360: result: yes +configure:2553: checking whether build environment is sane + +## ---------------- ## +## Cache variables. ## +## ---------------- ## + +ac_cv_env_CCC_set= +ac_cv_env_CCC_value= +ac_cv_env_CC_set=set +ac_cv_env_CC_value=cc +ac_cv_env_CFLAGS_set=set +ac_cv_env_CFLAGS_value='-g -Wall -O2' +ac_cv_env_CPPFLAGS_set=set +ac_cv_env_CPPFLAGS_value= +ac_cv_env_CPP_set= +ac_cv_env_CPP_value= +ac_cv_env_CXXCPP_set= +ac_cv_env_CXXCPP_value= +ac_cv_env_CXXFLAGS_set=set +ac_cv_env_CXXFLAGS_value='-g -Wall -O2' +ac_cv_env_CXX_set=set +ac_cv_env_CXX_value=g++ +ac_cv_env_DEVHELP_CFLAGS_set= +ac_cv_env_DEVHELP_CFLAGS_value= +ac_cv_env_DEVHELP_LIBS_set= +ac_cv_env_DEVHELP_LIBS_value= +ac_cv_env_F77_set= +ac_cv_env_F77_value= +ac_cv_env_FFLAGS_set= +ac_cv_env_FFLAGS_value= +ac_cv_env_GECKO_CFLAGS_set= +ac_cv_env_GECKO_CFLAGS_value= +ac_cv_env_GECKO_LIBS_set= +ac_cv_env_GECKO_LIBS_value= +ac_cv_env_LDFLAGS_set=set +ac_cv_env_LDFLAGS_value= +ac_cv_env_LIBDEVHELP_CFLAGS_set= +ac_cv_env_LIBDEVHELP_CFLAGS_value= +ac_cv_env_LIBDEVHELP_LIBS_set= +ac_cv_env_LIBDEVHELP_LIBS_value= +ac_cv_env_LIBS_set= +ac_cv_env_LIBS_value= +ac_cv_env_PKG_CONFIG_set= +ac_cv_env_PKG_CONFIG_value= +ac_cv_env_build_alias_set=set +ac_cv_env_build_alias_value=x86_64-linux-gnu +ac_cv_env_host_alias_set= +ac_cv_env_host_alias_value= +ac_cv_env_target_alias_set= +ac_cv_env_target_alias_value= +ac_cv_path_install='/usr/bin/install -c' +ac_cv_path_mkdir=/bin/mkdir +ac_cv_prog_AWK=gawk +ac_cv_prog_make_make_set=yes + +## ----------------- ## +## Output variables. ## +## ----------------- ## + +ACLOCAL='${SHELL} /tmp/devhelp-0.17/missing --run aclocal-1.10' +ALL_LINGUAS='' +AMDEPBACKSLASH='' +AMDEP_FALSE='' +AMDEP_TRUE='' +AMTAR='${SHELL} /tmp/devhelp-0.17/missing --run tar' +AR='' +AUTOCONF='${SHELL} /tmp/devhelp-0.17/missing --run autoconf' +AUTOHEADER='${SHELL} /tmp/devhelp-0.17/missing --run autoheader' +AUTOMAKE='${SHELL} /tmp/devhelp-0.17/missing --run automake-1.10' +AWK='gawk' +CATALOGS='' +CATOBJEXT='' +CC='cc' +CCDEPMODE='' +CFLAGS='-g -Wall -O2' +CPP='' +CPPFLAGS='' +CXX='g++' +CXXCPP='' +CXXDEPMODE='' +CXXFLAGS='-g -Wall -O2' +CYGPATH_W='echo' +DATADIRNAME='' +DEFS='' +DEPDIR='' +DEVHELP_CFLAGS='' +DEVHELP_LIBS='' +ECHO='echo' +ECHO_C='' +ECHO_N='-n' +ECHO_T='' +EGREP='' +EXEEXT='' +F77='' +FFLAGS='' +GCONFTOOL='' +GCONF_SCHEMAS_INSTALL_FALSE='' +GCONF_SCHEMAS_INSTALL_TRUE='' +GCONF_SCHEMA_CONFIG_SOURCE='' +GCONF_SCHEMA_FILE_DIR='' +GECKO='' +GECKO_CFLAGS='' +GECKO_EXTRA_LIBS='' +GECKO_FLAVOUR='' +GECKO_HOME='' +GECKO_INCLUDE_ROOT='' +GECKO_LIBS='' +GECKO_PREFIX='' +GECKO_WARN_CXXFLAGS='' +GETTEXT_PACKAGE='' +GLIB_CFLAGS='' +GLIB_GENMARSHAL='' +GLIB_LIBS='' +GLIB_MKENUMS='' +GMOFILES='' +GMSGFMT='' +GOBJECT_QUERY='' +GREP='' +HAVE_GECKO_1_7_FALSE='' +HAVE_GECKO_1_7_TRUE='' +HAVE_GECKO_1_8_1_FALSE='' +HAVE_GECKO_1_8_1_TRUE='' +HAVE_GECKO_1_8_FALSE='' +HAVE_GECKO_1_8_TRUE='' +HAVE_GECKO_1_9_FALSE='' +HAVE_GECKO_1_9_TRUE='' +HAVE_GECKO_DEBUG_FALSE='' +HAVE_GECKO_DEBUG_TRUE='' +HAVE_MOZILLA_TOOLKIT_FALSE='' +HAVE_MOZILLA_TOOLKIT_TRUE='' +HAVE_PLATFORM_OSX_FALSE='' +HAVE_PLATFORM_OSX_TRUE='' +HAVE_PLATFORM_X11_FALSE='' +HAVE_PLATFORM_X11_TRUE='' +INSTALL_DATA='${INSTALL} -m 644' +INSTALL_PROGRAM='${INSTALL}' +INSTALL_SCRIPT='${INSTALL}' +INSTALL_STRIP_PROGRAM='$(install_sh) -c -s' +INSTOBJEXT='' +INTLLIBS='' +INTLTOOL_CAVES_RULE='' +INTLTOOL_DESKTOP_RULE='' +INTLTOOL_DIRECTORY_RULE='' +INTLTOOL_EXTRACT='' +INTLTOOL_KBD_RULE='' +INTLTOOL_KEYS_RULE='' +INTLTOOL_MERGE='' +INTLTOOL_OAF_RULE='' +INTLTOOL_PERL='' +INTLTOOL_POLICY_RULE='' +INTLTOOL_PONG_RULE='' +INTLTOOL_PROP_RULE='' +INTLTOOL_SCHEMAS_RULE='' +INTLTOOL_SERVER_RULE='' +INTLTOOL_SERVICE_RULE='' +INTLTOOL_SHEET_RULE='' +INTLTOOL_SOUNDLIST_RULE='' +INTLTOOL_THEME_RULE='' +INTLTOOL_UI_RULE='' +INTLTOOL_UPDATE='' +INTLTOOL_XAM_RULE='' +INTLTOOL_XML_NOMERGE_RULE='' +INTLTOOL_XML_RULE='' +LDFLAGS='' +LIBDEVHELP_CFLAGS='' +LIBDEVHELP_LIBS='' +LIBOBJS='' +LIBS='' +LIBTOOL='' +LN_S='' +LTLIBOBJS='' +MAINT='' +MAINTAINER_MODE_FALSE='' +MAINTAINER_MODE_TRUE='' +MAKEINFO='${SHELL} /tmp/devhelp-0.17/missing --run makeinfo' +MKINSTALLDIRS='' +MSGFMT='' +MSGFMT_OPTS='' +MSGMERGE='' +OBJEXT='' +PACKAGE='devhelp' +PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=devhelp' +PACKAGE_NAME='Devhelp' +PACKAGE_STRING='Devhelp 0.17' +PACKAGE_TARNAME='devhelp' +PACKAGE_VERSION='0.17' +PATH_SEPARATOR=':' +PKG_CONFIG='' +PLATFORM_CFLAGS='' +PLATFORM_LDFLAGS='' +POFILES='' +POSUB='' +PO_IN_DATADIR_FALSE='' +PO_IN_DATADIR_TRUE='' +PYTHON='' +PYTHON_EXEC_PREFIX='' +PYTHON_PLATFORM='' +PYTHON_PREFIX='' +PYTHON_VERSION='' +RANLIB='' +REQUIRES_LIBWNCK='' +SED='' +SET_MAKE='' +SHELL='/bin/bash' +STRIP='' +USE_NLS='' +VERSION='0.17' +WARN_CFLAGS='' +XGETTEXT='' +Z_CFLAGS='' +Z_LIBS='' +ac_ct_CC='' +ac_ct_CXX='' +ac_ct_F77='' +am__fastdepCC_FALSE='' +am__fastdepCC_TRUE='' +am__fastdepCXX_FALSE='' +am__fastdepCXX_TRUE='' +am__include='' +am__isrc='' +am__leading_dot='.' +am__quote='' +am__tar='${AMTAR} chof - "$$tardir"' +am__untar='${AMTAR} xf -' +bindir='${exec_prefix}/bin' +build='x86_64-linux-gnu' +build_alias='x86_64-linux-gnu' +build_cpu='' +build_os='' +build_vendor='' +datadir='${datarootdir}' +datarootdir='${prefix}/share' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +dvidir='${docdir}' +exec_prefix='NONE' +host='' +host_alias='' +host_cpu='' +host_os='' +host_vendor='' +htmldir='${docdir}' +includedir='${prefix}/include' +infodir='${prefix}/share/info' +install_sh='$(SHELL) /tmp/devhelp-0.17/install-sh' +libdir='${exec_prefix}/lib' +libexecdir='${prefix}/lib/devhelp' +localedir='${datarootdir}/locale' +localstatedir='/var' +mandir='${prefix}/share/man' +mkdir_p='/bin/mkdir -p' +oldincludedir='/usr/include' +pdfdir='${docdir}' +pkgpyexecdir='' +pkgpythondir='' +prefix='/usr' +program_transform_name='s,x,x,' +psdir='${docdir}' +pyexecdir='' +pythondir='' +sbindir='${exec_prefix}/sbin' +sharedstatedir='${prefix}/com' +sysconfdir='/etc' +target_alias='' + +## ----------- ## +## confdefs.h. ## +## ----------- ## + +#define PACKAGE_NAME "Devhelp" +#define PACKAGE_TARNAME "devhelp" +#define PACKAGE_VERSION "0.17" +#define PACKAGE_STRING "Devhelp 0.17" +#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=devhelp" +#define PACKAGE "devhelp" +#define VERSION "0.17" + +configure: caught signal 2 +configure: exit 1