diff -u mozilla-1.7.3/debian/changelog mozilla-1.7.3/debian/changelog --- mozilla-1.7.3/debian/changelog +++ mozilla-1.7.3/debian/changelog @@ -1,3 +1,19 @@ +mozilla (2:1.7.3-4.backports.org.1) unstable; urgency=high + + * recompiled for http://www.backports.org/ + + removed binutils, libxt-dev, libxft-dev, libfontconfig1-dev, gcc-3.2 and + g++3.2 from build-dependencies and dependencies in debian/control + + added a patch to modify required version of libidl-dev in configure + script + + reduced required version of libidl-dev in debian/control + + removed dpkg dependency from mozilla meta-package in debian/control + + removed xft support from debian/rules and debian/control + + removed myspell-dictionary from recommends in debian/control + + disabled svg support in debian/rules + + added a patch from Marc Herbert to workaround a bug in gtk+ 2.0.2 + + -- Norbert Tretkowski Sun, 02 Dec 2004 02:16:35 +0100 + mozilla (2:1.7.3-5) unstable; urgency=high * debian/patches/mips-xgot-inline: diff -u mozilla-1.7.3/debian/rules mozilla-1.7.3/debian/rules --- mozilla-1.7.3/debian/rules +++ mozilla-1.7.3/debian/rules @@ -78,7 +78,7 @@ NULL = IMAGES_OPTIONS = \ - --enable-svg \ + --disable-svg \ --without-system-mng \ --without-system-png \ $(NULL) @@ -100,7 +100,7 @@ --enable-default-toolkit=gtk2 \ --enable-toolkit=gtk2 \ --disable-gnomevfs \ - --enable-xft \ + --disable-xft \ --disable-installer \ --with-gssapi=/dev/null \ $(NULL) diff -u mozilla-1.7.3/debian/control mozilla-1.7.3/debian/control --- mozilla-1.7.3/debian/control +++ mozilla-1.7.3/debian/control @@ -3,12 +3,12 @@ Section: web Maintainer: Takuo KITAME Standards-Version: 3.6.1 -Build-Depends: binutils (>= 2.15-4), libgtk2.0-dev, debhelper (>= 4.1.16), zip, libjpeg62-dev | libjpeg-dev, libungif4-dev, libz-dev, autoconf2.13, bzip2, patch, sharutils, docbook-to-man, libfreetype6-dev, libxft-dev (>= 2.1-6), libfontconfig1-dev (>= 2.1-13), gcc (>= 3.3) [!amd64], g++ (>=3.3) [!amd64], libidl-dev (>= 0.8), po-debconf, libxp-dev, libxt-dev, gcc-3.4 [amd64], g++-3.4 [amd64] +Build-Depends: libgtk2.0-dev, debhelper (>= 4.1.16), zip, libjpeg62-dev | libjpeg-dev, libungif4-dev, libz-dev, autoconf2.13, bzip2, patch, sharutils, docbook-to-man, libfreetype6-dev, libidl-dev (>= 0.7.4), po-debconf Package: mozilla Architecture: any Section: web -Depends: mozilla-browser (= ${Source-Version}), mozilla-mailnews (= ${Source-Version}), mozilla-psm (= ${Source-Version}), dpkg (>= 1.10.9) +Depends: mozilla-browser (= ${Source-Version}), mozilla-mailnews (= ${Source-Version}), mozilla-psm (= ${Source-Version}) Suggests: mozilla-chatzilla (= ${Source-Version}) Replaces: mozilla-dmotif, mozilla-smotif Conflicts: galeon (<< 1.2.8-3), skipstone (<< 0.8.3-4) @@ -23,7 +23,7 @@ Architecture: any Section: web Depends: ${shlibs:Depends}, libnspr4 (= ${Source-Version}), debconf (>= 1), psmisc -Recommends: mozilla-psm (= ${Source-Version}), myspell-en-us | myspell-dictionary +Recommends: mozilla-psm (= ${Source-Version}) Suggests: xprt-xprintorg Conflicts: mozilla (<< 1:0.8), epiphany-browser (<= 1.2.6-1), galeon-common (<= 1.3.15-2), kazehakaze (<= 0.1.6-1), mozilla-xft, mozilla-locale-auto Provides: www-browser, mozilla-xft @@ -61,7 +61,6 @@ Depends: mozilla-browser (= ${Source-Version}) Provides: mail-reader, imap-client, news-reader Replaces: mozilla (<< 1:0.8), mozilla-browser (<< 2:0.9.5-1), mozilla-mailnews (<< 2:0.9.6-6) -Recommends: myspell-en-us | myspell-dictionary Description: The Mozilla Internet application suite - mail and news support Mail/news client based on the Mozilla web browser. The mail/news client supports IMAP, POP, and NNTP and has an easy to use interface. only in patch2: unchanged: --- mozilla-1.7.3.orig/debian/patches/reduce-libidl-dependency +++ mozilla-1.7.3/debian/patches/reduce-libidl-dependency @@ -0,0 +1,11 @@ +--- mozilla/configure.in.orig Wed May 26 04:25:16 2004 ++++ mozilla/configure.in Sun Jan 2 01:58:27 2005 +@@ -5064,7 +5064,7 @@ + fi + + if test "$MOZ_ENABLE_GTK2"; then +- PKG_CHECK_MODULES(LIBIDL, libIDL-2.0 >= 0.8.0,_LIBIDL_FOUND=1) ++ PKG_CHECK_MODULES(LIBIDL, libIDL-2.0 >= 0.7.4,_LIBIDL_FOUND=1) + fi + if test -z "$_LIBIDL_FOUND"; then + AM_PATH_LIBIDL($LIBIDL_VERSION,_LIBIDL_FOUND=1) only in patch2: unchanged: --- mozilla-1.7.3.orig/debian/patches/fix-gtk2-build-error +++ mozilla-1.7.3/debian/patches/fix-gtk2-build-error @@ -0,0 +1,26 @@ +--- mozilla/embedding/browser/gtk/src/gtkmozembed2.cpp.orig Tue Jun 1 20:39:39 2004 ++++ mozilla/embedding/browser/gtk/src/gtkmozembed2.cpp Sun Jan 2 02:49:56 2005 +@@ -641,12 +641,17 @@ + + #ifdef MOZ_WIDGET_GTK2 + GtkWidget *toplevel = gtk_widget_get_toplevel(widget); +- gtk_signal_disconnect_by_func(GTK_OBJECT(toplevel), +- GTK_SIGNAL_FUNC(handle_toplevel_focus_in), +- embedPrivate); +- gtk_signal_disconnect_by_func(GTK_OBJECT(toplevel), +- GTK_SIGNAL_FUNC(handle_toplevel_focus_out), +- embedPrivate); ++ // the #define gtk_signal_disconnect_by_func() is buggy in woody:gtksignal.h ++ gtk_signal_compat_matched (GTK_OBJECT(toplevel), ++ GTK_SIGNAL_FUNC(handle_toplevel_focus_in), ++ embedPrivate, ++ (GSignalMatchType)(G_SIGNAL_MATCH_FUNC | ++ G_SIGNAL_MATCH_DATA), 0); ++ gtk_signal_compat_matched (GTK_OBJECT(toplevel), ++ GTK_SIGNAL_FUNC(handle_toplevel_focus_out), ++ embedPrivate, ++ (GSignalMatchType)(G_SIGNAL_MATCH_FUNC | ++ G_SIGNAL_MATCH_DATA), 0); + #endif /* MOZ_WIDGET_GTK2 */ + + if (GTK_WIDGET_CLASS(embed_parent_class)->unrealize)