Please merge blender 2.48a+dfsg-1 (universe) from Debian experimental (main)

The newest version in ubuntu had the following changes applied:

blender (2.46+dfsg-6ubuntu1) jaunty; urgency=low

  * Rebuild for libavcodec51 -> libavcodec52 transition.
  * Add patch correcting header file locations.
  * Add libvorbis-dev and libgsm1-dev to Build-Depends.
  * Use avcodec_decode_audio2() in source/blender/src/hddaudio.c

The attached debdiff incorporates the last three of them in the new version 2.48a. I can also confirm that it builds fine.

Blender changelogs from 2.46 are available at the following locations:
http://www.blender.org/development/release-logs/blender-247/
http://www.blender.org/development/release-logs/blender-248/
http://www.blender.org/development/release-logs/blender-248/blender-248a/

If anyone wants to test it on Jaunty, there's a package available in my PPA: https://launchpad.net/~khashayar/+archive

Builds, installs, and runs fine on Jaunty.

Missing:

Put Ubuntu MOTU Developers as Maintainer and Cyril Brulebois as XSBC-Original-Maintainer.

Here's a new debdiff that also fixes the Maintainer and XSBC-Original-Maintainer fields.

This isn't a sync, unsubscribing ubuntu-archive.

Unfortunately this merge isn't complete. Since it is a merge, the previous changelog entries from the previous merges, and any other Ubuntu changelog entries for this package need to be kept. It is also a good idea to mention in the changelog entry that you create, that this is a merge, and the changes that are being kept in the Ubuntu package, compared to the Debian package. I suggest you have a read of http://wiki.ubuntu.com/Merging as a starting point. I am pretty sure there are more useful documents on the wiki about merging, however I don't have the URLs to hand at the moment.

Hope the above helps you.

Morten, an hour from now and Feature Freeze will be applied.

I'm going to upload a fixed patch

Uploaded.

blender (2.48a+dfsg-1ubuntu1) jaunty; urgency=low

  [ Khashayar Naderehvandi ]
  * Merge from debian experimental (LP: #320045), Ubuntu remaining changes:
    - Add patch correcting header file locations.
    - Add libvorbis-dev and libgsm1-dev to Build-Depends.
    - Use avcodec_decode_audio2() in source/blender/src/hddaudio.c

  [ Alessio Treglia ]
  * Add missing previous changelog entries.

This bug was fixed in the package blender - 2.48a+dfsg-1ubuntu1

---------------
blender (2.48a+dfsg-1ubuntu1) jaunty; urgency=low

  [ Khashayar Naderehvandi ]
  * Merge from debian experimental (LP: #320045), Ubuntu remaining changes:
    - Add patch correcting header file locations.
    - Add libvorbis-dev and libgsm1-dev to Build-Depends.
    - Use avcodec_decode_audio2() in source/blender/src/hddaudio.c

  [ Alessio Treglia ]
  * Add missing previous changelog entries.

blender (2.48a+dfsg-1) experimental; urgency=low

  * New upstream release (Closes: #503680).
  * Patches:
     - 01_sanitize_sys.path: Refresh accordingly.
     - 30_gameengine_libgl_location_fix: Drop, patched code went away.
     - 40_freetype_fix_miscall: Drop, patched code is now commented out.
     - 45_fix_python_syntax_warning: Drop, was a backport.
     - 50_debian_build_config: Refresh.
     - 60_various_workarounds: Drop, no longer needed.
  * No longer unpatch before cleaning (one never knows).
  * Tidy up debian/TODO.

 -- Khashayar Naderehvandi <email address hidden> Thu, 22 Jan 2009 16:53:59 +0100

Darn, sorry :-(

I had a patch ready, but was browsing lauchpad to see if it would close other bugs before uploading (didn't realize we were that close to FF).

Well, thanks for taking care of it, Alessio.