diff -Nru /tmp/IBGahwxFbJ/xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/changelog /tmp/XtH1Q7dl4F/xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/changelog --- xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/changelog 2009-08-09 11:00:22.000000000 +0100 +++ xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/changelog 2009-08-09 10:36:45.000000000 +0100 @@ -1,3 +1,81 @@ +xulrunner-1.9.1 (2:1.9.1.1+build1+nobinonly-0ubuntu2~ppa1) jaunty; urgency=low + + * backport to jaunty + + -- Aleksey Lim Sun, 09 Aug 2009 09:36:01 +0000 + +xulrunner-1.9.1 (1:1.9.1.1+build1+nobinonly-0ubuntu2~ppa4) karmic; urgency=low + + * add epoch number to preserve PPA package + + -- Aleksey Lim Tue, 04 Aug 2009 07:31:35 +0000 + +xulrunner-1.9.1 (1.9.1.1+build1+nobinonly-0ubuntu2~ppa3) karmic; urgency=low + + * revert python-xpcom sub-package + + -- Aleksey Lim Mon, 03 Aug 2009 12:17:21 +0000 + +xulrunner-1.9.1 (1.9.1.1+build1+nobinonly-0ubuntu1) karmic; urgency=low + + * security/stability update v1.9.1.1 build1 (FIREFOX_1_5_1_BUILD1) + * tighten depends of xulrunner-1.9.1-dev; use xulrunner-1.9.1 (= ${binary:Version}) + - update debian/control + * prepare package for launchpad translations; open up EM_TRANSLATION + versions (min: 1.9.1 / max: 1.9.1.*) + - update debian/rules + + -- Alexander Sack Thu, 16 Jul 2009 18:26:43 +0200 + +xulrunner-1.9.1 (1.9.1+nobinonly-0ubuntu1) karmic; urgency=low + + * New upstream release taken from tag FIREFOX_3_5_RELEASE + * Add libxul-dev and libmozjs-dev to Conflicts of the main + xulrunner-1.9.1 package + - update debian/control + * Change the id of the langpacks to 1.9.1 + - update debian/translation-support/install.rdf.in + + -- Fabien Tassin Tue, 30 Jun 2009 19:55:54 +0200 + +xulrunner-1.9.1 (1.9.1~rc2+nobinonly-0ubuntu1) karmic; urgency=low + + * New upstream release taken from tag FIREFOX_3_5rc2_RELEASE + * Bump requirement for system nspr to >= 4.8 (bmo 492464), for sqlite + to >= 3.6.10 (bmo 478297) and for cairo to >= 1.6.0 (bmo 428563) + - update debian/rules + * Bump Standards-Version to 3.8.1 + - update debian/control + * Make the -dbg package strictly depend on the main package, and move it + to the debug section, and assign its priority to extra + - update debian/control + * Fix crash on shutdown by leaking env between firefox and xulrunner + - add debian/patches/bz473629_lp319480_leak_setenv_apprunner.patch + - update debian/patches/series + * Update diverged patches: + - update debian/patches/bzXXX_fix_test_suite_bashisms.patch + - update debian/patches/bzXXX_urlclassifier_prefs_in_toolkit.patch + + -- Fabien Tassin Fri, 19 Jun 2009 18:55:00 +0200 + +xulrunner-1.9.1 (1.9.1~b4+nobinonly-0ubuntu1) karmic; urgency=low + + [ Fabien Tassin ] + * Bump requirement for system nss to >= 3.12.3 since Mozilla bug 485052 landed + - update debian/rules + * Update diverged patches: + - update debian/patches/bzXXX_fix_test_suite_bashisms.patch + - update debian/patches/bz461277_att344402_eliminate_deprecated_gtk_type_macros.patch + + [ Alexander Sack ] + * Update diverged patches: + - update debian/patches/bzXXX_pc_honour_system_nspr_nss.patch + * drop patch after upstream fix landing + - drop debian/patches/bz478871_att369648_new_pango_api.patch + - update debian/patches/series + + -- Alexander Sack Wed, 29 Apr 2009 14:01:47 +0200 + xulrunner-1.9.1 (1.9.1~b4~hg20090330r24021+nobinonly-0ubuntu1) jaunty; urgency=low * New upstream snapshot, needed to match the firefox 3.1->3.5 transition (LP: #352995) diff -Nru /tmp/IBGahwxFbJ/xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/control /tmp/XtH1Q7dl4F/xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/control --- xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/control 2009-08-09 11:00:22.000000000 +0100 +++ xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/control 2009-08-09 10:14:26.000000000 +0100 @@ -22,19 +22,19 @@ libkrb5-dev, libasound2-dev, python-dev, python-support (>= 0.3), - binutils (>= 2.17-1) [mips mipsel], + binutils (>= 2.17) [mips mipsel], libhunspell-dev (>= 1.1.5-2), libnspr4-dev (>= 4.7.1~beta2), libnss3-dev (>= 3.12.0~beta3), libsqlite3-dev, mozilla-devscripts (>= 0.08~) -Standards-Version: 3.8.0 +Standards-Version: 3.8.1 Package: xulrunner-1.9.1 Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: libcanberra0 -Conflicts: j2re1.4 +Conflicts: j2re1.4, libxul-dev, libmozjs-dev Description: XUL + XPCOM application runner XULRunner is a single "gecko runtime" that can be used to bootstrap multiple XUL + XPCOM applications that are as rich as Firefox and @@ -53,16 +53,16 @@ Package: xulrunner-1.9.1-dbg Architecture: any -Section: devel -Priority: optional -Depends: ${shlibs:Depends}, ${misc:Depends} +Section: debug +Priority: extra +Depends: ${shlibs:Depends}, ${misc:Depends}, xulrunner-1.9.1 (= ${binary:Version}) Description: xulrunner-1.9.1 debug symbols Debug symbols for XULRunner 1.9.1. Package: xulrunner-1.9.1-dev Section: devel Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, xulrunner-1.9.1 (>= ${source:Upstream-Version}), libnspr4-dev, libnss3-dev +Depends: ${shlibs:Depends}, ${misc:Depends}, xulrunner-1.9.1 (= ${binary:Version}), libnspr4-dev, libnss3-dev Conflicts: libxul-dev, mozilla-dev, xulrunner-1.9-dev, xulrunner-1.9.2-dev Description: XUL + XPCOM development files This package contains the development headers, idl files and static libraries @@ -72,9 +72,9 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, xulrunner-1.9.1 (= ${binary:Version}) -Description: Support for Gnome in xulrunner-1.9.1 applications +Description: Support for GNOME in xulrunner-1.9.1 applications This is an extension to xulrunner-1.9.1 that allows XUL applications to use - protocol handlers from Gnome-VFS, such as smb or sftp, and other Gnome + protocol handlers from GnomeVFS, such as smb or sftp, and other GNOME integration features. Package: xulrunner-1.9.1-testsuite @@ -91,3 +91,23 @@ Conflicts: xulrunner-1.9.2-testsuite-dev Description: Test Suite development files for XULRunner 1.9.1 This package contains the development files for the Test Suite of XULRunner 1.9.1 + +Package: python-xpcom +Section: python +Priority: extra +Architecture: any +Provides: ${python:Provides} +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Conflicts: epiphany-browser +XB-Python-Version: ${python:Versions} +Description: XPCOM bindings for Python + PyXPCOM allows for communication between Python and XPCOM, such that a + Python application can access XPCOM objects, and XPCOM can access any + Python class that implements an XPCOM interface. + With PyXPCOM, a developer can talk to XPCOM or embed Gecko from a + Python application. PyXPCOM is similar to JavaXPCOM (Java-XPCOM bridge) + or XPConnect (JavaScript-XPCOM bridge). + . + Install this package if you wish to access XPCOM objects from Python, or + want to use Python components from XPCOM. +Homepage: http://developer.mozilla.org/en/docs/pyxpcom diff -Nru /tmp/IBGahwxFbJ/xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/copyright /tmp/XtH1Q7dl4F/xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/copyright --- xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/copyright 2009-08-09 11:00:22.000000000 +0100 +++ xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/copyright 2009-08-09 10:14:26.000000000 +0100 @@ -46,7 +46,7 @@ aim is to have a full tree with these tri-license terms, there are at the moment quite some exceptions as following: -(Note that I sometimes assumed files not explicitely licensed to be licensed +(Note that I sometimes assumed files not explicitly licensed to be licensed under the same terms as the files around them and that a lot of the information has been extracted automatically, thus maybe leaving some doubt. Again, if you find "bugs", please contact me by email or via the BTS.) diff -Nru /tmp/IBGahwxFbJ/xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/patches/bz461277_att344402_eliminate_deprecated_gtk_type_macros.patch /tmp/XtH1Q7dl4F/xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/patches/bz461277_att344402_eliminate_deprecated_gtk_type_macros.patch --- xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/patches/bz461277_att344402_eliminate_deprecated_gtk_type_macros.patch 2009-08-09 11:00:22.000000000 +0100 +++ xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/patches/bz461277_att344402_eliminate_deprecated_gtk_type_macros.patch 2009-08-09 10:14:26.000000000 +0100 @@ -1,7 +1,17 @@ -diff -r ee5135f3f773 embedding/browser/gtk/src/gtkmozembed.h ---- a/embedding/browser/gtk/src/gtkmozembed.h Sat Oct 11 23:30:14 2008 -0700 -+++ b/embedding/browser/gtk/src/gtkmozembed.h Sun Oct 12 16:10:14 2008 +0200 -@@ -82,10 +82,10 @@ +--- + embedding/browser/gtk/src/gtkmozembed.h | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +Index: mozilla/embedding/browser/gtk/src/gtkmozembed.h +=================================================================== +--- mozilla.orig/embedding/browser/gtk/src/gtkmozembed.h ++++ mozilla/embedding/browser/gtk/src/gtkmozembed.h +@@ -77,20 +77,20 @@ + #define GTKMOZEMBED_API(type, name, params) NS_EXPORT_(type) name params; + #else + #define GTKMOZEMBED_API(type,name, params) NS_IMPORT_(type) name params; + #endif + #endif /* XPCOM_GLUE */ #define GTK_TYPE_MOZ_EMBED (gtk_moz_embed_get_type()) @@ -16,7 +26,17 @@ typedef struct _GtkMozEmbed GtkMozEmbed; typedef struct _GtkMozEmbedClass GtkMozEmbedClass; -@@ -253,10 +253,10 @@ + + struct _GtkMozEmbed + { + GtkBin bin; + void *data; +@@ -248,20 +248,20 @@ + GTK_MOZ_EMBED_FLAG_OPENASDIALOG = 1073741824U, + GTK_MOZ_EMBED_FLAG_OPENASCHROME = 2147483648U + } GtkMozEmbedChromeFlags; + + /* this is a singleton object that you can hook up to to get signals that are not handed out on a per widget basis. */ #define GTK_TYPE_MOZ_EMBED_SINGLE (gtk_moz_embed_single_get_type()) @@ -31,39 +51,8 @@ #define GTK_MOZ_EMBED_SINGLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MOZ_EMBED_SINGLE, GtkMozEmbedSingleClass)) typedef struct _GtkMozEmbedSingle GtkMozEmbedSingle; -diff -r ee5135f3f773 embedding/browser/gtk/src/gtkmozembed_common.h ---- a/embedding/browser/gtk/src/gtkmozembed_common.h Sat Oct 11 23:30:14 2008 -0700 -+++ b/embedding/browser/gtk/src/gtkmozembed_common.h Sun Oct 12 16:10:14 2008 +0200 -@@ -73,10 +73,10 @@ - #endif - #endif // XPCOM_GLUE - #define GTK_TYPE_MOZ_EMBED_COMMON (gtk_moz_embed_common_get_type()) --#define GTK_MOZ_EMBED_COMMON(obj) GTK_CHECK_CAST((obj), GTK_TYPE_MOZ_EMBED_COMMON, GtkMozEmbedCommon) --#define GTK_MOZ_EMBED_COMMON_CLASS(klass) GTK_CHECK_CLASS_CAST((klass), GTK_TYPE_MOZ_EMBED_COMMON, GtkMozEmbedCommonClass) --#define GTK_IS_MOZ_EMBED_COMMON(obj) GTK_CHECK_TYPE((obj), GTK_TYPE_MOZ_EMBED_COMMON) --#define GTK_IS_MOZ_EMBED_COMMON_CLASS(klass) GTK_CHECK_CLASS_TYPE((klass), GTK_TYPE_MOZ_EMBED_COMMON) -+#define GTK_MOZ_EMBED_COMMON(obj) G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_MOZ_EMBED_COMMON, GtkMozEmbedCommon) -+#define GTK_MOZ_EMBED_COMMON_CLASS(klass) G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_MOZ_EMBED_COMMON, GtkMozEmbedCommonClass) -+#define GTK_IS_MOZ_EMBED_COMMON(obj) G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_MOZ_EMBED_COMMON) -+#define GTK_IS_MOZ_EMBED_COMMON_CLASS(klass) G_TYPE_CHECK_CLASS_TYPE((klass), GTK_TYPE_MOZ_EMBED_COMMON) - typedef struct _GtkMozEmbedCommon GtkMozEmbedCommon; - typedef struct _GtkMozEmbedCommonClass GtkMozEmbedCommonClass; - struct _GtkMozEmbedCommon -diff -r ee5135f3f773 embedding/browser/gtk/src/gtkmozembed_download.h ---- a/embedding/browser/gtk/src/gtkmozembed_download.h Sat Oct 11 23:30:14 2008 -0700 -+++ b/embedding/browser/gtk/src/gtkmozembed_download.h Sun Oct 12 16:10:14 2008 +0200 -@@ -72,10 +72,10 @@ - #endif // XPCOM_GLUE - - #define GTK_TYPE_MOZ_EMBED_DOWNLOAD (gtk_moz_embed_download_get_type()) --#define GTK_MOZ_EMBED_DOWNLOAD(obj) GTK_CHECK_CAST((obj), GTK_TYPE_MOZ_EMBED_DOWNLOAD, GtkMozEmbedDownload) --#define GTK_MOZ_EMBED_DOWNLOAD_CLASS(klass) GTK_CHECK_CLASS_CAST((klass), GTK_TYPE_MOZ_EMBED_DOWNLOAD, GtkMozEmbedDownloadClass) --#define GTK_IS_MOZ_EMBED_DOWNLOAD(obj) GTK_CHECK_TYPE((obj), GTK_TYPE_MOZ_EMBED_DOWNLOAD) --#define GTK_IS_MOZ_EMBED_DOWNLOAD_CLASS(klass) GTK_CHECK_CLASS_TYPE((klass), GTK_TYPE_MOZ_EMBED_DOWNLOAD) -+#define GTK_MOZ_EMBED_DOWNLOAD(obj) G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_MOZ_EMBED_DOWNLOAD, GtkMozEmbedDownload) -+#define GTK_MOZ_EMBED_DOWNLOAD_CLASS(klass) G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_MOZ_EMBED_DOWNLOAD, GtkMozEmbedDownloadClass) -+#define GTK_IS_MOZ_EMBED_DOWNLOAD(obj) G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_MOZ_EMBED_DOWNLOAD) -+#define GTK_IS_MOZ_EMBED_DOWNLOAD_CLASS(klass) G_TYPE_CHECK_CLASS_TYPE((klass), GTK_TYPE_MOZ_EMBED_DOWNLOAD) + typedef struct _GtkMozEmbedSingleClass GtkMozEmbedSingleClass; - typedef struct _GtkMozEmbedDownload GtkMozEmbedDownload; - typedef struct _GtkMozEmbedDownloadClass GtkMozEmbedDownloadClass; + struct _GtkMozEmbedSingle + { + GtkObject object; diff -Nru /tmp/IBGahwxFbJ/xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/patches/bz473629_lp319480_leak_setenv_apprunner.patch /tmp/XtH1Q7dl4F/xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/patches/bz473629_lp319480_leak_setenv_apprunner.patch --- xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/patches/bz473629_lp319480_leak_setenv_apprunner.patch 1970-01-01 01:00:00.000000000 +0100 +++ xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/patches/bz473629_lp319480_leak_setenv_apprunner.patch 2009-08-09 10:14:26.000000000 +0100 @@ -0,0 +1,33 @@ +--- + toolkit/xre/nsAppRunner.cpp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +Index: mozilla/toolkit/xre/nsAppRunner.cpp +=================================================================== +--- mozilla.orig/toolkit/xre/nsAppRunner.cpp ++++ mozilla/toolkit/xre/nsAppRunner.cpp +@@ -282,16 +282,24 @@ + #endif + #include + #ifdef MOZ_X11 + #include + #endif /* MOZ_X11 */ + #include "nsGTKToolkit.h" + #endif + ++void _SetEnvDup(const char* env) ++{ ++ if (env != NULL) ++ PR_SetEnv (strdup (env)); ++} ++ ++#define PR_SetEnv(x) _SetEnvDup(x) ++ + // Save the given word to the specified environment variable. + static void + SaveWordToEnv(const char *name, const nsACString & word) + { + char *expr = PR_smprintf("%s=%s", name, PromiseFlatCString(word).get()); + if (expr) + PR_SetEnv(expr); + // We intentionally leak |expr| here since it is required by PR_SetEnv. diff -Nru /tmp/IBGahwxFbJ/xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/patches/bz478871_att369648_new_pango_api.patch /tmp/XtH1Q7dl4F/xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/patches/bz478871_att369648_new_pango_api.patch --- xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/patches/bz478871_att369648_new_pango_api.patch 2009-08-09 11:00:22.000000000 +0100 +++ xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/patches/bz478871_att369648_new_pango_api.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,46 +0,0 @@ ---- - gfx/thebes/src/gfxPangoFonts.cpp | 21 +++++++++++++++++++-- - 1 file changed, 19 insertions(+), 2 deletions(-) - -Index: mozilla/gfx/thebes/src/gfxPangoFonts.cpp -=================================================================== ---- mozilla.orig/gfx/thebes/src/gfxPangoFonts.cpp -+++ mozilla/gfx/thebes/src/gfxPangoFonts.cpp -@@ -1832,18 +1832,35 @@ - - PangoFcFontMapClass *fcfontmap_class = PANGO_FC_FONT_MAP_CLASS (klass); - fcfontmap_class->get_resolution = gfx_pango_font_map_get_resolution; - // context_key_* virtual functions are only necessary if we want to - // dynamically respond to changes in the screen cairo_font_options_t. - - // context_substitute and get_font are not likely to be used but - // implemented because the class makes them available. -- fcfontmap_class->context_substitute = gfx_pango_font_map_context_substitute; -- fcfontmap_class->create_font = gfx_pango_font_map_create_font; -+ if (pango_version() < PANGO_VERSION_ENCODE(1,23,0)) { -+ // Since gfx has the implementation of fontmap->get_resolution, -+ // fontset->get_font and fontset->foreach, these callback -+ // aren't necesscarry if pango >= 1.23 -+#if PANGO_VERSION_CHECK(1,23,0) -+ // From 1.23, these callback defines are changed. -+ // fontset_key_subtitute (from 1.23) and context_substitue (until 1.22) -+ // is same offset -+ fcfontmap_class->fontset_key_substitute = -+ (void (*)(PangoFcFontMap*, PangoFcFontsetKey*, FcPattern*)) -+ gfx_pango_font_map_context_substitute; -+ fcfontmap_class->create_font = -+ (PangoFcFont* (*)(PangoFcFontMap*, PangoFcFontKey*)) -+ gfx_pango_font_map_create_font; -+#else -+ fcfontmap_class->context_substitute = gfx_pango_font_map_context_substitute; -+ fcfontmap_class->create_font = gfx_pango_font_map_create_font; -+#endif -+ } - } - - /** - ** gfxPangoFontGroup - **/ - - struct FamilyCallbackData { - FamilyCallbackData(nsTArray *aFcFamilyList, diff -Nru /tmp/IBGahwxFbJ/xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/patches/bzXXX_fix_test_suite_bashisms.patch /tmp/XtH1Q7dl4F/xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/patches/bzXXX_fix_test_suite_bashisms.patch --- xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/patches/bzXXX_fix_test_suite_bashisms.patch 2009-08-09 11:00:22.000000000 +0100 +++ xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/patches/bzXXX_fix_test_suite_bashisms.patch 2009-08-09 10:14:26.000000000 +0100 @@ -6,22 +6,22 @@ =================================================================== --- mozilla.orig/config/tests/src-simple/Makefile.in +++ mozilla/config/tests/src-simple/Makefile.in -@@ -57,17 +57,17 @@ - +@@ -58,17 +58,17 @@ check-%:: if test -d $(FINAL_TARGET); then rm -rf $(FINAL_TARGET); fi; - make realchrome MOZ_CHROME_FILE_FORMAT=$* + $(MAKE) realchrome MOZ_CHROME_FILE_FORMAT=$* @echo "Comparing manifests..." - @if ! sort $(MY_MANIFEST) | diff -u $(srcdir)/../$(REF_MANIFEST).$* - ; then \ - echo "FAIL: different content in manifest!" ; \ + @if ! sort $(MY_MANIFEST) | diff --text -U 0 $(srcdir)/../$(REF_MANIFEST).$* - ; then \ + echo "TEST-UNEXPECTED-FAIL | config/tests/$(REF_MANIFEST).$* | differing content in manifest!" ; \ + false; \ fi -- @if [ $* == "jar" ]; then \ -+ @if test "$*" = "jar"; then \ +- @if [ $* = "jar" ]; then \ ++ @if [ "$*" = "jar" ]; then \ $(UNZIP) -d $(FINAL_TARGET)/chrome/test $(FINAL_TARGET)/chrome/test.jar; \ fi @echo "Comparing packages..." @if ! diff -ur $(srcdir)/../ref-simple $(FINAL_TARGET)/chrome/test ; then\ - echo "FAIL: different content in jar!" ; \ + echo "TEST-UNEXPECTED-FAIL | config/tests/ref-simple | different content in jar" ; \ + false; \ fi - include $(topsrcdir)/config/rules.mk diff -Nru /tmp/IBGahwxFbJ/xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/patches/bzXXX_pc_honour_system_nspr_nss.patch /tmp/XtH1Q7dl4F/xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/patches/bzXXX_pc_honour_system_nspr_nss.patch --- xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/patches/bzXXX_pc_honour_system_nspr_nss.patch 2009-08-09 11:00:22.000000000 +0100 +++ xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/patches/bzXXX_pc_honour_system_nspr_nss.patch 2009-08-09 10:14:26.000000000 +0100 @@ -1,15 +1,15 @@ --- - xulrunner/installer/Makefile.in | 17 ++++++++++++++--- + xulrunner/installer/Makefile.in | 15 ++++++++++++--- xulrunner/installer/libxul-embedding-unstable.pc.in | 2 +- xulrunner/installer/libxul-embedding.pc.in | 2 +- xulrunner/installer/mozilla-nss.pc.in | 6 +++--- - 4 files changed, 19 insertions(+), 8 deletions(-) + 4 files changed, 17 insertions(+), 8 deletions(-) Index: mozilla/xulrunner/installer/Makefile.in =================================================================== --- mozilla.orig/xulrunner/installer/Makefile.in +++ mozilla/xulrunner/installer/Makefile.in -@@ -91,41 +91,52 @@ +@@ -91,29 +91,38 @@ mozilla-plugin.pc \ mozilla-gtkmozembed.pc \ mozilla-gtkmozembed-embedding.pc \ @@ -44,27 +44,13 @@ endif +pkg_config_files += mozilla-nss.pc - %.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS) - cat $< | sed \ - -e "s|%prefix%|$(prefix)|" \ - -e "s|%includedir%|$(includedir)|" \ - -e "s|%idldir%|$(idldir)|" \ - -e "s|%sdkdir%|$(sdkdir)|" \ - -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ - -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ - -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ - -e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \ - -e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \ -+ -e "s|%FULL_NSS_LIBS%|$(FULL_NSS_LIBS)|" \ -+ -e "s|%FULL_NSS_CFLAGS%|$(FULL_NSS_CFLAGS)|" \ - -e "s|%NSPR_NAME%|$(NSPR_NAME)|" \ - -e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" > $@ - chmod 644 $@ - - install:: $(pkg_config_files) - @echo pkg_config_file: $(pkg_config_files) - $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(libdir)/pkgconfig + ifdef MOZ_OJI + OJIDEF=-DOJI + else + OJIDEF= + endif + %.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS) Index: mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in =================================================================== --- mozilla.orig/xulrunner/installer/libxul-embedding-unstable.pc.in diff -Nru /tmp/IBGahwxFbJ/xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/patches/bzXXX_urlclassifier_prefs_in_toolkit.patch /tmp/XtH1Q7dl4F/xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/patches/bzXXX_urlclassifier_prefs_in_toolkit.patch --- xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/patches/bzXXX_urlclassifier_prefs_in_toolkit.patch 2009-08-09 11:00:22.000000000 +0100 +++ xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/patches/bzXXX_urlclassifier_prefs_in_toolkit.patch 2009-08-09 10:14:26.000000000 +0100 @@ -1,8 +1,7 @@ --- - toolkit/components/url-classifier/Makefile.in | 3 - toolkit/components/url-classifier/pref/url-classifier.js | 8 + - toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp | 62 +++++++--- - 3 files changed, 59 insertions(+), 14 deletions(-) + toolkit/components/url-classifier/Makefile.in | 3 +++ + toolkit/components/url-classifier/pref/url-classifier.js | 8 ++++++++ + 2 files changed, 11 insertions(+) Index: mozilla/toolkit/components/url-classifier/pref/url-classifier.js =================================================================== @@ -21,14 +20,14 @@ =================================================================== --- mozilla.orig/toolkit/components/url-classifier/Makefile.in +++ mozilla/toolkit/components/url-classifier/Makefile.in -@@ -46,10 +46,13 @@ +@@ -44,10 +44,13 @@ + include $(DEPTH)/config/autoconf.mk + DIRS = public src ifdef ENABLE_TESTS - ifndef MOZ_ENABLE_LIBXUL TOOL_DIRS += tests endif - endif +PREF_JS_EXPORTS = $(srcdir)/pref/url-classifier.js +GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/,url-classifier.js) diff -Nru /tmp/IBGahwxFbJ/xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/patches/series /tmp/XtH1Q7dl4F/xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/patches/series --- xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/patches/series 2009-08-09 11:00:22.000000000 +0100 +++ xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/patches/series 2009-08-09 10:14:26.000000000 +0100 @@ -18,4 +18,4 @@ bzXXX_fix_python_dom_hidden_symbols.patch bzXXX_fix_python_dom_pyxultest.patch testsuite_skip_tests_depending_on_utf8.patch -bz478871_att369648_new_pango_api.patch +bz473629_lp319480_leak_setenv_apprunner.patch diff -Nru /tmp/IBGahwxFbJ/xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/python-xpcom.install /tmp/XtH1Q7dl4F/xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/python-xpcom.install --- xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/python-xpcom.install 1970-01-01 01:00:00.000000000 +0100 +++ xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/python-xpcom.install 2009-08-09 10:14:26.000000000 +0100 @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/xulrunner-1.9*/python +debian/tmp/usr/lib/xulrunner-1.9*/components/libpyloader.so diff -Nru /tmp/IBGahwxFbJ/xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/rules /tmp/XtH1Q7dl4F/xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/rules --- xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/rules 2009-08-09 11:00:22.000000000 +0100 +++ xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/rules 2009-08-09 10:14:26.000000000 +0100 @@ -20,8 +20,8 @@ # minVersion and maxVersion used in install.rdf EM_TRANSLATION_VERSION = $(DEBIAN_XUL_VER) -EM_TRANSLATION_MIN_VERSION = 1.9 -EM_TRANSLATION_MAX_VERSION = $(DEBIAN_XUL_VER) +EM_TRANSLATION_MIN_VERSION = 1.9.1 +EM_TRANSLATION_MAX_VERSION = 1.9.1.* EXTRA_SYSTEM_CONFIGURE_FLAGS = $(NULL) @@ -33,7 +33,7 @@ EXTRA_SYSTEM_CONFIGURE_FLAGS += --disable-tests --disable-mochitest endif -USE_SYSTEM_CAIRO := $(shell pkg-config --exists 'cairo >= 1.5.8'; a=$$?; if test $$a != 1; then echo 1; fi) +USE_SYSTEM_CAIRO := $(shell pkg-config --exists 'cairo >= 1.6.0'; a=$$?; if test $$a != 1; then echo 1; fi) # for old cairo versions we cannot use system cairo ifeq (1,$(USE_SYSTEM_CAIRO)) EXTRA_SYSTEM_CONFIGURE_FLAGS += --enable-system-cairo @@ -41,19 +41,19 @@ EXTRA_SYSTEM_CONFIGURE_FLAGS += --disable-system-cairo endif -USE_SYSTEM_SQLITE := $(shell pkg-config --exists 'sqlite3 >= 3.6.2'; a=$$?; if test $$a != 1; then echo 1; fi) +USE_SYSTEM_SQLITE := $(shell pkg-config --exists 'sqlite3 >= 3.6.10'; a=$$?; if test $$a != 1; then echo 1; fi) ifeq (1,$(USE_SYSTEM_SQLITE)) EXTRA_SYSTEM_CONFIGURE_FLAGS += --enable-system-sqlite else EXTRA_SYSTEM_CONFIGURE_FLAGS += --disable-system-sqlite endif -USE_SYSTEM_NSPR := $(shell pkg-config --exists 'nspr >= 4.7.3'; a=$$?; if test $$a != 1; then echo 1; fi) +USE_SYSTEM_NSPR := $(shell pkg-config --exists 'nspr >= 4.8'; a=$$?; if test $$a != 1; then echo 1; fi) ifeq (1,$(USE_SYSTEM_NSPR)) EXTRA_SYSTEM_CONFIGURE_FLAGS += --with-system-nspr endif -USE_SYSTEM_NSS := $(shell pkg-config --exists 'nss >= 3.12.2'; a=$$?; if test $$a != 1; then echo 1; fi) +USE_SYSTEM_NSS := $(shell pkg-config --exists 'nss >= 3.12.3'; a=$$?; if test $$a != 1; then echo 1; fi) ifeq (1,$(USE_SYSTEM_NSS)) EXTRA_SYSTEM_CONFIGURE_FLAGS += --with-system-nss endif @@ -104,7 +104,7 @@ MOZ_APPLICATION = xulrunner # List all extensions we want -DEB_MOZ_EXTENSIONS=default,python +DEB_MOZ_EXTENSIONS=default,python/xpcom CFLAGS = -g CXXFLAGS = -g @@ -154,6 +154,8 @@ dh_link usr/lib/nss/libnssckbi.so $(DEBIAN_XUL_DIR)/libnssckbi.so endif +PYTHON_SITE_DIR = $(shell python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") + binary-install/$(DEB_MOZ_APPLICATION):: touch debian/xulrunner-$(DEB_MOZ_VERSION)/$(DEBIAN_XUL_DIR)/.autoreg dh_link usr/lib/xulrunner-addons/extensions $(DEBIAN_XUL_DIR)/extensions @@ -165,6 +167,8 @@ endif dh_install debian/system-greprefs.js /etc/xulrunner-$(DEB_MOZ_VERSION)/ dh_link /etc/xulrunner-$(DEB_MOZ_VERSION)/system-greprefs.js $(DEBIAN_XUL_DIR)/greprefs/system-greprefs.js + mkdir -p debian/xulrunner-$(DEB_MOZ_VERSION)/$(PYTHON_SITE_DIR) + dh_link $(DEBIAN_XUL_DIR)/python/xpcom $(PYTHON_SITE_DIR)/xpcom LOCALE_VERSION = $(shell echo $(DEBIAN_VERSION) | sed -e 's/~hg.*/pre/' | tr -d '~') diff -Nru /tmp/IBGahwxFbJ/xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/translation-support/install.rdf.in /tmp/XtH1Q7dl4F/xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/translation-support/install.rdf.in --- xulrunner-1.9.1-1.9.1~b4~hg20090330r24021+nobinonly/debian/translation-support/install.rdf.in 2009-08-09 11:00:22.000000000 +0100 +++ xulrunner-1.9.1-1.9.1.1+build1+nobinonly/debian/translation-support/install.rdf.in 2009-08-09 10:14:26.000000000 +0100 @@ -6,7 +6,7 @@