Please merge tulip 3.1.2-2.3 (universe) from debian unstable (main)

What about the ubuntu changes you dropped? for example changes since 3.1.2-2ubuntu1 . Are they still relevant? If not, please explain that and explain why in the changelog.

This bug was fixed in the package tulip - 3.1.2-2.3ubuntu1

---------------
tulip (3.1.2-2.3ubuntu1) maverick; urgency=low

  * Merge from debian unstable. (LP: #608628) Remaining changes:
    - debian/control: Change libgl1-mesa-swx11-dev to libgl1-mesa-dev in
      Build-Depends, this fix FTBFS (LP: #553638)
    - libqt4-assistant -> libqtassistantclient4 transition, add
      libqtassistantclient-dev to B-D.
  * Dropped changes:
    - Fixed in 3.1.2-2.1: Use ttf-dejavu-core instead of ttf-bitstream-vera,
      changing the symlinks to the local names as well. (Closes: #528152)
    - Fixed in 3.1.2-2.1: Add docbook-xsl to Build-Depends and add
      debian/patches/11-use-docbook-xsl-catalog.dpatch that uses its catalog.
      This prevents the build from accessing the Internet.
    - Fixed in 3.1.2-2.1: Add texlive-extra-utils to Build-Depends
      so that epstopdf is available.
    - Fixed in 3.1.2-2.2: Add 10-gcc44-ftbfs.dpatch patch to fix
      FTBFS (LP: #379986) with GCC 4.4;
      patch taken from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=527215
      and forwarded to upstream, SourceForge.net bug's ID: 2807906.
    - Dropped dpatch as we dont have patches anymore.

tulip (3.1.2-2.3) unstable; urgency=medium

  * Non-maintainer upload.
  * Change section of generated manpages to .3tulip (Closes: #557054, #558473)
  * urgency set to medium due to RC bug fix

tulip (3.1.2-2.2) unstable; urgency=low

  * Non-maintainer upload.
  * Added missing headers for gcc4.4 (Closes: #527215)

tulip (3.1.2-2.1) unstable; urgency=low

  * Non-maintainer upload.
  * Use ttf-dejavu instead of ttf-bitstream-vera (now gone), patch from
    James Westby (Closes: #528152)
  * Add build-dep on texlive-extra-utils for epstopdf
  * Use local docbook-xsl catalog for saxon instead of relying on network
    access, patch from James Westby
 -- Jean-Louis Dupond <email address hidden> Mon, 19 Jul 2010 18:43:56 +0100