Please merge xulrunner (universe) from Debian unstable (main)

[Arthur Loiret]

Hello,

New upstream release in latest Debian revision,

Remaining Ubuntu changes:
    + Fixing __x86_64__ and __ia64__ FTBFS
      - Added 88_ubuntu_pyginputstream.dpatch
      - Added 88_ubuntu_pyiinputstream.dpatch
    + debian/control: Change Maintainer/XSBC-Original-Maintainer field.

Thanks.

[Scott Kitterman (kitterman)]

You need to explain the current Ubuntu unique changes and why it is safe to synch over them (e.g. changes all incorporated in Debian or Upstream).

[Arthur Loiret (arthur.loiret)]

Ubuntu changes not necessary anymore (amd64 specific patches), build fine on debian: http://buildd.debian.org/fetch.cgi?&pkg=xulrunner&ver=1.8.1.4-1&arch=amd64&stamp=1180214273&file=log.

[Michael Bienia (geser)]

From a test-build of xulrunner 1.8.1.4-1 in a gutsy pbuilder on AMD64:

PyGInputStream.cpp
c++ -o PyGInputStream.o -c -fvisibility=hidden -DMOZILLA_INTERNAL_API -DOSTYPE=\"Linux2.6\" -DOSARCH=\"Linux\"
 -DBUILD_ID=0000000000 -I/usr/include/python2.5 -I../../../../dist/include/xpcom -I../../../../dist/include/st
ring -I../../../../dist/include/pyxpcom -I../../../../dist/include -I/usr/include/nspr -fPIC -fno-rtti
 -fno-exceptions -Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-p
rivacy -Wno-non-virtual-dtor -Wno-long-long -fshort-wchar -pthread -pipe -DNDEBUG -DTRIMMED -O2 -fno-strict-a
liasing -g -DMOZILLA_CLIENT -include ../../../../mozilla-config.h -Wp,-MD,.deps/PyGInputStream.pp PyGInputSt
ream.cpp
PyGInputStream.cpp: In member function 'virtual nsresult PyG_nsIInputStream::Read(char*, PRUint32, PRUint32*)'
:
PyGInputStream.cpp:108: error: cannot convert 'int*' to 'Py_ssize_t*' for argument '3' to 'int PyObject_AsRead
Buffer(PyObject*, const void**, Py_ssize_t*)'
make[5]: *** [PyGInputStream.o] Error 1

So this (or better) patches are still needed (also for IA64).

[Arthur Loiret (arthur.loiret)]

Bug changed to do a merge, here is the debdiff.
Thanks.

[Arthur Loiret (arthur.loiret)]

FTBFS on ia64, here is a new debdiff.

[Arthur Loiret (arthur.loiret)]

Successfully built on ia64 and amd64.