Viewing all changes in revision 19.
- Committer: Bazaar Package Importer
- Date: 2007-11-17 17:36:34 UTC
- mfrom: (1.1.8 upstream)
- Revision ID: james.westby@ubuntu.com-20071117173634-0e0fr0i6ntedv973
* Merge from debian unstable (LP: #163271), remaining changes:
  - remaining Ubuntu patches in debian/patches:
    - 88_force-no-pragma-visibility-for-gcc-4.2_4.3
    - 88_bz384304_lp117575_linkrecursion_fix_in_startscript
  - xulrunner diversion (xulrunner.{postinst,prerm,install})
  - Maintainer set to Ubuntu MOTU Developers
* Drop debian/patches/{68_python25_api_breakage.dpatch,
  88_ubuntu_pyginputstream.dpatch,88_ubuntu_pyiinputstream.dpatch}
  merge by Debian into debian/patches/35_python_2.5.dpatch
  - update debian/patches/00list
* Drop debian/patches/61_python_py_ssize_t_detect now useless
  - update debian/patches/00list
* Fix FTBFS with cairo lib needing Xrender:
  - add patch 88_bz344818_missing_library_check
  - update debian/patches/00list
* Fix FTBFS with newer nss allowing to build with either old nss 3.11
  or upcoming 3.12.
  - add patch 88_bz399589_fix_missing_symbol_with_new_nss
  - update debian/patches/00list
* Update debian/patches/99_configure.dpatch
  - remaining Ubuntu patches in debian/patches:
    - 88_force-no-pragma-visibility-for-gcc-4.2_4.3
    - 88_bz384304_lp117575_linkrecursion_fix_in_startscript
  - xulrunner diversion (xulrunner.{postinst,prerm,install})
  - Maintainer set to Ubuntu MOTU Developers
* Drop debian/patches/{68_python25_api_breakage.dpatch,
  88_ubuntu_pyginputstream.dpatch,88_ubuntu_pyiinputstream.dpatch}
  merge by Debian into debian/patches/35_python_2.5.dpatch
  - update debian/patches/00list
* Drop debian/patches/61_python_py_ssize_t_detect now useless
  - update debian/patches/00list
* Fix FTBFS with cairo lib needing Xrender:
  - add patch 88_bz344818_missing_library_check
  - update debian/patches/00list
* Fix FTBFS with newer nss allowing to build with either old nss 3.11
  or upcoming 3.12.
  - add patch 88_bz399589_fix_missing_symbol_with_new_nss
  - update debian/patches/00list
* Update debian/patches/99_configure.dpatch
- files added:
- config/nsinstall.py
- files removed:
- debian/patches/35_psm_wakeups.dpatch
- directory/c-sdk/ldap/docs
- directory/c-sdk/ldap/examples/macintosh
- docshell/resources/locale
- docshell/resources/locale/en-US
- embedding/browser/activex/src/pluginhostctrl/cab/redist
- embedding/minimo/chrome
- extensions/inspector/build/src
- intl/unicharutil/tools/data
- plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/Resources/Java
- plugin/oji/MRJ/plugin/Resources
- rdf/resources
- themes/classic/communicator/brand
- themes/modern/communicator/brand
- xpinstall/packager/mac/ASEncoder/rsrc
- xpinstall/wizard/libxpnet/GUSI/lib
- files modified:
- accessible/src/atk/nsAccessibleHyperText.cpp
- embedding/components/printingui/src/mac/printpde/res/English.lproj/Localizable.strings *
- plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/MacOS/JavaEmbeddingPlugin.policy *
- plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/PkgInfo *
expand all
collapse all
added
removed
