diff -u blam-1.8.5/debian/control blam-1.8.5/debian/control --- blam-1.8.5/debian/control +++ blam-1.8.5/debian/control @@ -1,11 +1,12 @@ Source: blam Section: gnome Priority: optional -Maintainer: Carlos Martín Nieto +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Carlos Martín Nieto Build-Depends: debhelper (>= 5), mono-gmcs (>= 1.2.6) | c-sharp-2.0-compiler, gtk-sharp2 (>= 2.8.0), libmono-dev (>= 1.1.17), cli-common-dev (>= 0.4.4), libgecko2.0-cil (>= 0.11), libgnome2.0-cil, intltool, libmono-cairo2.0-cil, - libgconf2.0-cil, libgnomeui-dev (>= 2.2), libxul-dev (>= 1.8), cdbs, + libgconf2.0-cil, libgnomeui-dev (>= 2.2), xulrunner-1.9-dev, cdbs, libxml-parser-perl, libndesk-dbus-glib1.0-cil (>= 0.4.1) Standards-Version: 3.7.3 Homepage: http://cmartin.tk/blam.html diff -u blam-1.8.5/debian/rules blam-1.8.5/debian/rules --- blam-1.8.5/debian/rules +++ blam-1.8.5/debian/rules @@ -7,6 +7,7 @@ include /usr/share/cdbs/1/class/gnome.mk DEB_DH_MAKESHLIBS_ARGS_ALL='-n' +DEB_CONFIGURE_EXTRA_FLAGS += --with-mozilla=libxul-embedding-unstable common-binary-predeb-arch:: dh_clideps -d diff -u blam-1.8.5/debian/changelog blam-1.8.5/debian/changelog --- blam-1.8.5/debian/changelog +++ blam-1.8.5/debian/changelog @@ -1,3 +1,19 @@ +blam (1.8.5-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable (LP: #226670), remaining changes: + - xulrunner 1.9 + dependent sharp + + debian/control: raise build-depends bar to libgecko2.0-cil (>= 0.11) + + make use of standalone glue for C++ code and dependent gecko sharp + module for C# parts; fixup configure.in accordingly + - add debian/patches/10_xul1.9.patch + - Added debian/patches/PlanetUbuntu.patch + - Updated rerun autools patch: + + debian/patches/99_autotools_rerun.patch + - debian/rules: Added configure flag to pass libxul-embedding-unstable + as default, Fixes build-bustage. + + -- Andres Rodriguez Mon, 23 Jun 2008 18:48:54 -0500 + blam (1.8.5-1) unstable; urgency=low * New upstream release @@ -24,6 +40,27 @@ -- Carlos Martín Nieto Thu, 13 Mar 2008 14:59:32 +0100 +blam (1.8.4-3ubuntu2) hardy; urgency=low + + xulrunner 1.9 + dependent sharp + * raise build-depends bar to libgecko2.0-cil (>= 0.11-3ubuntu4~asac6) + - update debian/control + * make use of standalone glue for C++ code and dependent gecko sharp module + for C# parts; fixup configure.in accordingly + - add debian/patches/10_xul1.9.patch + * rerun autotools + - debian/patches/99_autotools_rerun.patch + + -- Alexander Sack Tue, 29 Jan 2008 00:43:32 +0100 + +blam (1.8.4-3ubuntu1) hardy; urgency=low + + * Merge from Debian unstable, remaining changes: + - Added debian/patches/PlanetUbuntu.patch + - Update maintainer field in debian/control. + + -- Michele Angrisano Wed, 16 Jan 2008 21:27:00 +0100 + blam (1.8.4-3) unstable; urgency=low * Delete the debug file that is created when building. If built twice, @@ -39,6 +76,15 @@ -- Carlos Martín Nieto Tue, 11 Dec 2007 19:05:33 +0100 +blam (1.8.4-2.1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Keeping our orig.tar.gz as it's differing from Debian's + - Added debian/patches/PlanetUbuntu.patch + * Set Maintainer to Ubuntu MOTU Developers + + -- Adrien Cunin Mon, 03 Dec 2007 20:46:37 +0100 + blam (1.8.4-2.1) unstable; urgency=low * Non-maintainer upload. @@ -75,6 +121,18 @@ -- Carlos Martín Nieto Tue, 12 Dec 2006 15:58:20 +0100 +blam (1.8.4-0ubuntu1) feisty; urgency=low + + * Sync with Debian unstable + * New upstream release + * Added build-dependency on gnome-sharp2 + * debian/patches/01_correct_default_theme.patch: dropped, included upstream + * Re-added the following Ubuntu changes: + - Build-Depends on firefox-dev instead of libxul-dev + - debian/patches/PlanetUbuntu.patch + + -- Adrien Cunin Fri, 2 Feb 2007 00:37:16 +0100 + blam (1.8.3-2) unstable; urgency=low * Fix default theme path (closes: #400176). @@ -103,7 +161,7 @@ * Make it work with new mono libs. (closes: #386084). -- Carlos Martin Sat, 21 Oct 2006 15:24:28 +0200 - + blam (1.8.2-2) unstable; urgency=low * Fixed so that rules now handles MONO_SHARED_DIR as described in the CLI reverted: --- blam-1.8.5/debian/patches/01_no_imendio_news.patch +++ blam-1.8.5.orig/debian/patches/01_no_imendio_news.patch @@ -1,16 +0,0 @@ -diff -u blam-1.8.5.orig/collection.xml blam-1.8.5/collection.xml ---- blam-1.8.5.orig/collection.xml 2008-03-22 11:10:19.000000000 +0100 -+++ blam-1.8.5/collection.xml 2008-03-22 11:10:37.000000000 +0100 -@@ -1,5 +1,4 @@ - -- - - - -Common subdirectories: blam-1.8.5.orig/debian and blam-1.8.5/debian -Common subdirectories: blam-1.8.5.orig/icons and blam-1.8.5/icons -Common subdirectories: blam-1.8.5.orig/lib and blam-1.8.5/lib -Common subdirectories: blam-1.8.5.orig/libblam and blam-1.8.5/libblam -Common subdirectories: blam-1.8.5.orig/po and blam-1.8.5/po -Common subdirectories: blam-1.8.5.orig/src and blam-1.8.5/src -Common subdirectories: blam-1.8.5.orig/themes and blam-1.8.5/themes only in patch2: unchanged: --- blam-1.8.5.orig/debian/patches/PlanetUbuntu.patch +++ blam-1.8.5/debian/patches/PlanetUbuntu.patch @@ -0,0 +1,10 @@ +diff -Nur blam-1.8.2/collection.xml blam-1.8.2.new/collection.xml +--- blam-1.8.2/collection.xml 2005-08-07 08:15:17.000000000 -0400 ++++ blam-1.8.2.new/collection.xml 2005-08-07 08:15:51.000000000 -0400 +@@ -14,5 +14,6 @@ + + + ++ + + only in patch2: unchanged: --- blam-1.8.5.orig/debian/patches/10_xul1.9.patch +++ blam-1.8.5/debian/patches/10_xul1.9.patch @@ -0,0 +1,141 @@ +diff -Nur -x '*.orig' -x '*~' blam-1.8.4/configure.in blam-1.8.4.new/configure.in +--- blam-1.8.4/configure.in 2007-01-06 14:43:35.000000000 +0100 ++++ blam-1.8.4.new/configure.in 2008-01-29 01:07:13.000000000 +0100 +@@ -56,7 +56,7 @@ + + PKG_CHECK_MODULES(BLAM, + gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION +- gecko-sharp-2.0 >= $GECKOSHARP_REQUIRED_VERSION ++ gecko-sharp-dependent-2.0 >= $GECKOSHARP_REQUIRED_VERSION + gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION + glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION) + +@@ -78,8 +78,8 @@ + + MOZILLA= + AC_ARG_WITH([mozilla], +- AC_HELP_STRING([--with-mozilla@<:@=mozilla|firefox|thunderbird|xulrunner|seamonkey@:>@], +- [Whether to use mozilla, firefox, thunderbird, xulrunner or seamonkey gtkmozembed (default: mozilla)]), ++ AC_HELP_STRING([--with-mozilla@<:@=mozilla|firefox|thunderbird|libxul-embedding-unstable|xulrunner|seamonkey@:>@], ++ [Whether to use mozilla, firefox, thunderbird, libxul-embedding-unstable, xulrunner or seamonkey gtkmozembed (default: mozilla)]), + [MOZILLA="$withval"]) + + dnl try to autodetect: if mozilla exists, use it, else try firefox, then thunderbird, then the rest +@@ -90,6 +90,8 @@ + MOZILLA=firefox + elif pkg-config --exists thunderbird-gtkmozembed; then + MOZILLA=thunderbird ++elif pkg-config --exists libxul-embedding-unstable; then ++ MOZILLA=libxul-embedding-unstable + elif pkg-config --exists xulrunner-gtkmozembed; then + MOZILLA=xulrunner + elif pkg-config --exists seamonkey-gtkmozembed; then +@@ -97,7 +99,7 @@ + else + AC_MSG_ERROR([no mozilla installation found]) + fi +-elif test "x$with_mozilla" != "xmozilla" -a "x$with_mozilla" != "xfirefox" -a "x$with_mozilla" != "xthunderbird"-a "x$with_mozilla" != "xxulrunner"-a "x$with_mozilla" != "xseamonkey"; then ++elif test "x$with_mozilla" != "xmozilla" -a "x$with_mozilla" != "xfirefox" -a "x$with_mozilla" != "xthunderbird"-a "x$with_mozilla" != "xxulrunner"-a "x$with_mozilla" != "xseamonkey"-a "x$with_mozilla" != "xlibxul-embedding-unstable"; then + AC_MSG_ERROR([unknown mozilla name ($MOZILLA)]) + fi + +@@ -111,22 +113,35 @@ + thunderbird) min_version=0.8 flavour=toolkit ;; + xulrunner) min_version=1.8 flavour=toolkit ;; + seamonkey) min_version=1.0 flavour=mozilla ;; ++libxul*) min_version=1.9 flavour=newtoolkit ;; + esac + + MOZILLA_FLAVOUR=$flavour + AC_SUBST(MOZILLA_FLAVOUR) + +-PKG_CHECK_MODULES(MOZILLA_COMPONENT, $MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version) ++if test $MOZILLA_FLAVOUR = newtoolkit; then ++ gtkmozembed_pc="$MOZILLA >= $min_version" ++ gtkmozembed_all_pc="$MOZILLA >= $min_version" ++else ++ gtkmozembed_pc="$MOZILLA-gtkmozembed >= $min_version" ++ gtkmozembed_all_pc="$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version" ++fi ++ ++PKG_CHECK_MODULES(MOZILLA_COMPONENT, $gtkmozembed_all_pc) + AC_SUBST(MOZILLA_COMPONENT_CFLAGS) + AC_SUBST(MOZILLA_COMPONENT_LIBS) + +-MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-gtkmozembed`" ++if test $MOZILLA_FLAVOUR = newtoolkit; then ++ MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $gtkmozembed_pc`/unstable" ++else ++ MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $gtkmozembed_pc`" ++fi + AC_SUBST(MOZILLA_INCLUDE_ROOT) + +-MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $MOZILLA-gtkmozembed`" ++MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $gtkmozembed_pc`" + AC_SUBST(MOZILLA_HOME) + +-MOZILLA_PREFIX="`$PKG_CONFIG --variable=prefix $MOZILLA-gtkmozembed`" ++MOZILLA_PREFIX="`$PKG_CONFIG --variable=prefix $gtkmozembed_pc`" + AC_SUBST(MOZILLA_PREFIX) + + dnl ************************************************************************* +@@ -226,7 +241,7 @@ + PKG_CHECK_MODULES(LIBBLAM, + gtk+-2.0 >= 2.2 + libgnomeui-2.0 >= 2.2 +- $MOZILLA-gtkmozembed) ++ $gtkmozembed_pc) + AC_SUBST(LIBBLAM_CFLAGS) + AC_SUBST(LIBBLAM_LIBS) + +diff -Nur -x '*.orig' -x '*~' blam-1.8.4/libblam/blam-gecko-utils.cpp blam-1.8.4.new/libblam/blam-gecko-utils.cpp +--- blam-1.8.4/libblam/blam-gecko-utils.cpp 2007-01-06 14:43:35.000000000 +0100 ++++ blam-1.8.4.new/libblam/blam-gecko-utils.cpp 2008-01-29 01:08:40.000000000 +0100 +@@ -22,7 +22,11 @@ + + #include + +-#include ++#ifdef XPCOM_GLUE ++# include ++#else ++# include ++#endif + + #include + +@@ -188,7 +192,34 @@ + { + gchar *profile_dir; + ++#ifdef XPCOM_GLUE ++ static const GREVersionRange greVersion = { ++ "1.9a", PR_TRUE, ++ "1.9.*", PR_TRUE ++ }; ++ char xpcomLocation[4096]; ++ nsresult rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096); ++ if (NS_FAILED(rv)) ++ exit (122); ++ ++ // Startup the XPCOM Glue that links us up with XPCOM. ++ rv = XPCOMGlueStartup(xpcomLocation); ++ if (NS_FAILED(rv)) ++ exit (123); ++ ++ rv = GTKEmbedGlueStartup(); ++ if (NS_FAILED(rv)) ++ exit (124); ++ ++ char *lastSlash = strrchr(xpcomLocation, '/'); ++ if (lastSlash) ++ *lastSlash = '\0'; ++ ++ gtk_moz_embed_set_path(xpcomLocation); ++#else + gtk_moz_embed_set_comp_path (MOZILLA_HOME); ++#endif // XPCOM_GLUE ++ + + profile_dir = g_build_filename (g_getenv ("HOME"), + ".gnome2", only in patch2: unchanged: --- blam-1.8.5.orig/debian/patches/99_autotools_rerun.patch +++ blam-1.8.5/debian/patches/99_autotools_rerun.patch @@ -0,0 +1,289 @@ +diff -Nur -x '*.orig' -x '*~' blam-1.8.5-1ubuntu1/configure blam-1.8.5-1ubuntu1.new/configure +--- blam-1.8.5-1ubuntu1/configure 2008-04-30 21:06:09.000000000 -0500 ++++ blam-1.8.5-1ubuntu1.new/configure 2008-06-23 18:47:58.000000000 -0500 +@@ -1575,10 +1575,10 @@ + --with-tags[=TAGS] include additional configurations [automatic] + --with-gconf-source=sourceaddress Config database for installing schema files. + --with-gconf-schema-file-dir=dir Directory for installing schema files. +- --with-mozilla[=mozilla|firefox|thunderbird|xulrunner|seamonkey] ++ --with-mozilla[=mozilla|firefox|thunderbird|libxul-embedding-unstable|xulrunner|seamonkey] + Whether to use mozilla, firefox, thunderbird, +- xulrunner or seamonkey gtkmozembed (default: +- mozilla) ++ libxul-embedding-unstable, xulrunner or seamonkey ++ gtkmozembed (default: mozilla) + + Some influential environment variables: + CC C compiler command +@@ -21805,12 +21805,12 @@ + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-2.0 >= \$GTKSHARP_REQUIRED_VERSION +- gecko-sharp-2.0 >= \$GECKOSHARP_REQUIRED_VERSION ++ gecko-sharp-dependent-2.0 >= \$GECKOSHARP_REQUIRED_VERSION + gconf-sharp-2.0 >= \$GTKSHARP_REQUIRED_VERSION + glade-sharp-2.0 >= \$GTKSHARP_REQUIRED_VERSION + gnome-sharp-2.0 >= \$GNOMESHARP_REQUIRED_VERSION\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION +- gecko-sharp-2.0 >= $GECKOSHARP_REQUIRED_VERSION ++ gecko-sharp-dependent-2.0 >= $GECKOSHARP_REQUIRED_VERSION + gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION + glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION + gnome-sharp-2.0 >= $GNOMESHARP_REQUIRED_VERSION") 2>&5 +@@ -21818,7 +21818,7 @@ + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_BLAM_CFLAGS=`$PKG_CONFIG --cflags "gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION +- gecko-sharp-2.0 >= $GECKOSHARP_REQUIRED_VERSION ++ gecko-sharp-dependent-2.0 >= $GECKOSHARP_REQUIRED_VERSION + gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION + glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION + gnome-sharp-2.0 >= $GNOMESHARP_REQUIRED_VERSION" 2>/dev/null` +@@ -21835,12 +21835,12 @@ + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-2.0 >= \$GTKSHARP_REQUIRED_VERSION +- gecko-sharp-2.0 >= \$GECKOSHARP_REQUIRED_VERSION ++ gecko-sharp-dependent-2.0 >= \$GECKOSHARP_REQUIRED_VERSION + gconf-sharp-2.0 >= \$GTKSHARP_REQUIRED_VERSION + glade-sharp-2.0 >= \$GTKSHARP_REQUIRED_VERSION + gnome-sharp-2.0 >= \$GNOMESHARP_REQUIRED_VERSION\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION +- gecko-sharp-2.0 >= $GECKOSHARP_REQUIRED_VERSION ++ gecko-sharp-dependent-2.0 >= $GECKOSHARP_REQUIRED_VERSION + gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION + glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION + gnome-sharp-2.0 >= $GNOMESHARP_REQUIRED_VERSION") 2>&5 +@@ -21848,7 +21848,7 @@ + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_BLAM_LIBS=`$PKG_CONFIG --libs "gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION +- gecko-sharp-2.0 >= $GECKOSHARP_REQUIRED_VERSION ++ gecko-sharp-dependent-2.0 >= $GECKOSHARP_REQUIRED_VERSION + gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION + glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION + gnome-sharp-2.0 >= $GNOMESHARP_REQUIRED_VERSION" 2>/dev/null` +@@ -21871,13 +21871,13 @@ + fi + if test $_pkg_short_errors_supported = yes; then + BLAM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION +- gecko-sharp-2.0 >= $GECKOSHARP_REQUIRED_VERSION ++ gecko-sharp-dependent-2.0 >= $GECKOSHARP_REQUIRED_VERSION + gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION + glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION + gnome-sharp-2.0 >= $GNOMESHARP_REQUIRED_VERSION"` + else + BLAM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION +- gecko-sharp-2.0 >= $GECKOSHARP_REQUIRED_VERSION ++ gecko-sharp-dependent-2.0 >= $GECKOSHARP_REQUIRED_VERSION + gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION + glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION + gnome-sharp-2.0 >= $GNOMESHARP_REQUIRED_VERSION"` +@@ -21886,7 +21886,7 @@ + echo "$BLAM_PKG_ERRORS" >&5 + + { { echo "$as_me:$LINENO: error: Package requirements (gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION +- gecko-sharp-2.0 >= $GECKOSHARP_REQUIRED_VERSION ++ gecko-sharp-dependent-2.0 >= $GECKOSHARP_REQUIRED_VERSION + gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION + glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION + gnome-sharp-2.0 >= $GNOMESHARP_REQUIRED_VERSION) were not met: +@@ -21901,7 +21901,7 @@ + See the pkg-config man page for more details. + " >&5 + echo "$as_me: error: Package requirements (gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION +- gecko-sharp-2.0 >= $GECKOSHARP_REQUIRED_VERSION ++ gecko-sharp-dependent-2.0 >= $GECKOSHARP_REQUIRED_VERSION + gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION + glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION + gnome-sharp-2.0 >= $GNOMESHARP_REQUIRED_VERSION) were not met: +@@ -22054,6 +22054,8 @@ + MOZILLA=firefox + elif pkg-config --exists thunderbird-gtkmozembed; then + MOZILLA=thunderbird ++elif pkg-config --exists libxul-embedding-unstable; then ++ MOZILLA=libxul-embedding-unstable + elif pkg-config --exists xulrunner-gtkmozembed; then + MOZILLA=xulrunner + elif pkg-config --exists seamonkey-gtkmozembed; then +@@ -22063,7 +22065,7 @@ + echo "$as_me: error: no mozilla installation found" >&2;} + { (exit 1); exit 1; }; } + fi +-elif test "x$with_mozilla" != "xmozilla" -a "x$with_mozilla" != "xfirefox" -a "x$with_mozilla" != "xthunderbird"-a "x$with_mozilla" != "xxulrunner"-a "x$with_mozilla" != "xseamonkey"; then ++elif test "x$with_mozilla" != "xmozilla" -a "x$with_mozilla" != "xfirefox" -a "x$with_mozilla" != "xthunderbird"-a "x$with_mozilla" != "xxulrunner"-a "x$with_mozilla" != "xseamonkey"-a "x$with_mozilla" != "xlibxul-embedding-unstable"; then + { { echo "$as_me:$LINENO: error: unknown mozilla name ($MOZILLA)" >&5 + echo "$as_me: error: unknown mozilla name ($MOZILLA)" >&2;} + { (exit 1); exit 1; }; } +@@ -22080,11 +22082,20 @@ + thunderbird) min_version=0.8 flavour=toolkit ;; + xulrunner) min_version=1.8 flavour=toolkit ;; + seamonkey) min_version=1.0 flavour=mozilla ;; ++libxul*) min_version=1.9 flavour=newtoolkit ;; + esac + + MOZILLA_FLAVOUR=$flavour + + ++if test $MOZILLA_FLAVOUR = newtoolkit; then ++ gtkmozembed_pc="$MOZILLA >= $min_version" ++ gtkmozembed_all_pc="$MOZILLA >= $min_version" ++else ++ gtkmozembed_pc="$MOZILLA-gtkmozembed >= $min_version" ++ gtkmozembed_all_pc="$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version" ++fi ++ + + pkg_failed=no + { echo "$as_me:$LINENO: checking for MOZILLA_COMPONENT" >&5 +@@ -22095,12 +22106,12 @@ + pkg_cv_MOZILLA_COMPONENT_CFLAGS="$MOZILLA_COMPONENT_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA-gtkmozembed >= \$min_version \$MOZILLA-xpcom >= \$min_version\"") >&5 +- ($PKG_CONFIG --exists --print-errors "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gtkmozembed_all_pc\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "$gtkmozembed_all_pc") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_MOZILLA_COMPONENT_CFLAGS=`$PKG_CONFIG --cflags "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version" 2>/dev/null` ++ pkg_cv_MOZILLA_COMPONENT_CFLAGS=`$PKG_CONFIG --cflags "$gtkmozembed_all_pc" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -22113,12 +22124,12 @@ + pkg_cv_MOZILLA_COMPONENT_LIBS="$MOZILLA_COMPONENT_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA-gtkmozembed >= \$min_version \$MOZILLA-xpcom >= \$min_version\"") >&5 +- ($PKG_CONFIG --exists --print-errors "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gtkmozembed_all_pc\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "$gtkmozembed_all_pc") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_MOZILLA_COMPONENT_LIBS=`$PKG_CONFIG --libs "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version" 2>/dev/null` ++ pkg_cv_MOZILLA_COMPONENT_LIBS=`$PKG_CONFIG --libs "$gtkmozembed_all_pc" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -22137,14 +22148,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- MOZILLA_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version"` ++ MOZILLA_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gtkmozembed_all_pc"` + else +- MOZILLA_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version"` ++ MOZILLA_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gtkmozembed_all_pc"` + fi + # Put the nasty error message in config.log where it belongs + echo "$MOZILLA_COMPONENT_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements ($MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements ($gtkmozembed_all_pc) were not met: + + $MOZILLA_COMPONENT_PKG_ERRORS + +@@ -22155,7 +22166,7 @@ + and MOZILLA_COMPONENT_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 ($MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version) were not met: ++echo "$as_me: error: Package requirements ($gtkmozembed_all_pc) were not met: + + $MOZILLA_COMPONENT_PKG_ERRORS + +@@ -22199,13 +22210,17 @@ + + + +-MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-gtkmozembed`" ++if test $MOZILLA_FLAVOUR = newtoolkit; then ++ MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $gtkmozembed_pc`/unstable" ++else ++ MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $gtkmozembed_pc`" ++fi + + +-MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $MOZILLA-gtkmozembed`" ++MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $gtkmozembed_pc`" + + +-MOZILLA_PREFIX="`$PKG_CONFIG --variable=prefix $MOZILLA-gtkmozembed`" ++MOZILLA_PREFIX="`$PKG_CONFIG --variable=prefix $gtkmozembed_pc`" + + + ac_ext=cpp +@@ -22495,16 +22510,16 @@ + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.2 + libgnomeui-2.0 >= 2.2 +- \$MOZILLA-gtkmozembed\"") >&5 ++ \$gtkmozembed_pc\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.2 + libgnomeui-2.0 >= 2.2 +- $MOZILLA-gtkmozembed") 2>&5 ++ $gtkmozembed_pc") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_LIBBLAM_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.2 + libgnomeui-2.0 >= 2.2 +- $MOZILLA-gtkmozembed" 2>/dev/null` ++ $gtkmozembed_pc" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -22519,16 +22534,16 @@ + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.2 + libgnomeui-2.0 >= 2.2 +- \$MOZILLA-gtkmozembed\"") >&5 ++ \$gtkmozembed_pc\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.2 + libgnomeui-2.0 >= 2.2 +- $MOZILLA-gtkmozembed") 2>&5 ++ $gtkmozembed_pc") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_LIBBLAM_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.2 + libgnomeui-2.0 >= 2.2 +- $MOZILLA-gtkmozembed" 2>/dev/null` ++ $gtkmozembed_pc" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -22549,18 +22564,18 @@ + if test $_pkg_short_errors_supported = yes; then + LIBBLAM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= 2.2 + libgnomeui-2.0 >= 2.2 +- $MOZILLA-gtkmozembed"` ++ $gtkmozembed_pc"` + else + LIBBLAM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.2 + libgnomeui-2.0 >= 2.2 +- $MOZILLA-gtkmozembed"` ++ $gtkmozembed_pc"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBBLAM_PKG_ERRORS" >&5 + + { { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= 2.2 + libgnomeui-2.0 >= 2.2 +- $MOZILLA-gtkmozembed) were not met: ++ $gtkmozembed_pc) were not met: + + $LIBBLAM_PKG_ERRORS + +@@ -22573,7 +22588,7 @@ + " >&5 + echo "$as_me: error: Package requirements (gtk+-2.0 >= 2.2 + libgnomeui-2.0 >= 2.2 +- $MOZILLA-gtkmozembed) were not met: ++ $gtkmozembed_pc) were not met: + + $LIBBLAM_PKG_ERRORS +