Please merge kaffe_2:1.1.8-4 (universe) from Debian unstable (main)

Debian->Ubuntu debdiff

Ubuntu->Ubuntu debdiff

kaffe (2:1.1.8-4ubuntu1) intrepid; urgency=low

  * Merge from debian unstable, remaining changes (LP: #235639):
    - libungif4 -> libgif transition: (LP: #174252)
      - debian/control:
        + Changed libungif4-dev to libgif-dev
    - Updated Maintainer field

 -- Nathan Handler <email address hidden> Wed, 28 May 2008 20:23:37 -0500

The merge looks good - for some reason it fails to build:

# Hack to fix glibj.zip for pthreads
rm /tmp/buildd/kaffe-1.1.8/debian/install/usr/lib/kaffe/pthreads/jre/lib/glibj.zip
cp /tmp/buildd/kaffe-1.1.8/debian/install/usr/lib/kaffe/jthreads/jre/lib/glibj.zip
/tmp/buildd/kaffe-1.1.8/debian/install/usr/lib/kaffe/pthreads/jre/lib/glibj.zip
perl debian/file-actions.pl -v /tmp/buildd/kaffe-1.1.8/debian/install
Can't use string ("2/8") as a HASH ref while "strict refs" in use at debian/file-actions.pl line 40, <JL> line 23.
make: *** [install] Error 255
dpkg-buildpackage: failure: fakeroot debian/rules binary gave error exit status 2
pbuilder: Failed autobuilding of package
 -> Aborting with an error
 -> unmounting dev/pts filesystem
 -> unmounting proc filesystem
 -> cleaning the build env
    -> removing directory /var/cache/pbuilder/build//10606 and its subdirectories

Can you update your merge to 2:1.1.8-5?

Daniel, here is the new Debian->Ubuntu debdiff. It is for 2:1.1.8-5 like you requested.

Here is the new Ubuntu->Ubuntu debdiff for 2:1.1.8-5.

kaffe (2:1.1.8-5ubuntu1) intrepid; urgency=low

  * Merge from debian unstable, remaining changes (LP: #235639):
    - libungif4 -> libgif transition: (LP: #174252)
      - debian/control:
        + Changed libungif4-dev to libgif-dev
    - Updated Maintainer field

 -- Nathan Handler <email address hidden> Tue, 03 Jun 2008 12:11:26 -0500

This bug was fixed in the package kaffe - 2:1.1.8-5ubuntu1

---------------
kaffe (2:1.1.8-5ubuntu1) intrepid; urgency=low

  * Merge from debian unstable, remaining changes (LP: #235639):
    - libungif4 -> libgif transition: (LP: #174252)
      - debian/control:
        + Changed libungif4-dev to libgif-dev
    - Updated Maintainer field

kaffe (2:1.1.8-5) unstable; urgency=low

  * Build-Depends on default-jdk-builddep. Closes: #477868
  * Fix debian/file-actions.pl to work with Perl 5.10. Closes: #479716

kaffe (2:1.1.8-4) unstable; urgency=low

  * Make Build-Depends on libasound2-dev only used on linux archs.
    Closes: #397782, #462329
  * Added patch to build against alsa 1.0.16 and up. Closes: #470341
  * Fixed lintian warnings for debian/kaffe.NEWS.
  * Added Vcs-Svn, Vcs-Browser and Homepage fields.
  * Updated Standards-Version to 3.7.3.

 -- Nathan Handler <email address hidden> Tue, 03 Jun 2008 12:11:26 -0500

Good work Nathan!