Please merge: XMMS2 0.5 DrLecter

xmms2 (0.5DrLecter-1ubuntu1) intrepid; urgency=low

  * Merge from debian experimental (LP: #241098), remaining changes:
    - debian/control: Update Maintainer field
    - debian/control: add lpia to xmms2-plugin-alsa supported architectures
    - src/include/xmmsclient/xmmsclient++/helpers.h: Added #include <limits.h>
    - debian/control: Added liba52-0.7.4-dev to build depends
    - debian/rules: Added patch, patch-stamp and unpatch

 -- Benjamin Drung <email address hidden> Wed, 18 Jun 2008 23:49:47 +0200

Can you give me the link to the Debian source package?

The Debian source should be found here: http://ftp.debian.org/debian/pool/main/x/xmms2/xmms2_0.5DrLecter.orig.tar.gz but it doesn't (yet). I get the source package directly from the Debian Maintainer (Florian Ragwitz).

You can grab the Debian source package here http://files.perldition.org/xmms2_0.5DrLecter-debsrc.tar.bz2 while the Debian package is waiting to be accepted in experimental: http://ftp-master.debian.org/new/xmms2_0.5DrLecter-1.html . You can find the Ubuntu package on my PPA: https://launchpad.net/~bdrung/+archive

We should 100% make sure we have the same .orig.tar.gz (same md5sum) as Debian. If not, we will not be able to sync.

[13:45:50][rafl] nano: they just need to use the same orig.tar.gz
[13:45:58][rafl] nano: http://files.perldition.org/xmms2_0.5DrLecter.orig.tar.gz 1709295 e81873805886d7422a35e4c409ff6407
[13:46:07][rafl] nano: but it's in that -debsrc tarball too

Feel free to drop by #xmms2 at irc.freenode.net if you have more questions, there you can find rafl too, our debian package maintainer.

I can't find the following change in your package:
 src/include/xmmsclient/xmmsclient++/helpers.h: Added #include <limits.h>

Also why is "debian/rules: Added patch, patch-stamp and unpatch" needed if the change is applied directly to the source?

The rest of the package seems to be fine althought it's hard to confirm the merge without a xmms2_0.5DrLecter-1.dsc and xmms2_0.5DrLecter-1.diff.gz

I spoke to soon, it fails to build for some reason:

../src/include/xmmsclient/xmmsclient++/helpers.h: In function 'std::string Xmms::getUserConfDir()':
../src/include/xmmsclient/xmmsclient++/helpers.h:47: error: 'PATH_MAX' was not declared in this scope
../src/include/xmmsclient/xmmsclient++/helpers.h:48: error: 'buf' was not declared in this scope
../src/include/xmmsclient/xmmsclient++/helpers.h:52: error: 'buf' was not declared in this scope
ERROR: == Runner == task failed! (return code 129 for #50)
ERROR: == Task == -- task details begin --
action: cpp
idx: 50
source: [</tmp/buildd/xmms2-0.5DrLecter/src/clients/lib/xmmsclient++/bindata.cpp>]
target: [<b:/tmp/buildd/xmms2-0.5DrLecter/src/clients/lib/xmmsclient++/bindata.os>]
-- task details end --
Compilation failed
 (error raised in module Scripting)
make: *** [build-stamp] Error 1
dpkg-buildpackage: failure: debian/rules build gave error exit status 2
pbuilder: Failed autobuilding of package
 -> Aborting with an error

That's due to a patch to last ubuntu package of xmms2 not being migrated upstream. Add #include "limits.h" or whatever that patch did and you're good to go.

Yesterday 0.5DrLecter-1 was accepted in unstable: http://packages.qa.debian.org/x/xmms2.html . I will update the package when its available in Debian. There were small changes. Also I will add the missing patch file.

Nice! Looking forward to it!

xmms2 (0.5DrLecter-1ubuntu1) intrepid; urgency=low

  * Merge from debian unstable (LP: #241098), remaining changes:
    + debian/control:
      + Update Maintainer field
      + add lpia to xmms2-plugin-alsa supported architectures
      + Added liba52-0.7.4-dev to build depends
    + debian/rules: Added patch, patch-stamp and unpatch
    + changed 01_gcc4.3.patch:
      + src/include/xmmsclient/xmmsclient++/helpers.h: Added #include <climits>
  * New upstream relase fixes LP: #212566, #222341

 -- Benjamin Drung <email address hidden> Fri, 04 Jul 2008 12:44:25 +0200

Here is a diff to the Debian version. You can grab the Debian files from http://ftp.debian.org/debian/pool/main/x/xmms2/ . The orig.tar.gz provided above is the same as the one you can grab from Debian.

A new version in Debian arrived: 0.5DrLecter-2. I have updated the package.

xmms2 (0.5DrLecter-2ubuntu1) intrepid; urgency=low

  * Merge from debian unstable (LP: #241098), remaining changes:
    + debian/control:
      + Update Maintainer field
      + add lpia to xmms2-plugin-alsa supported architectures
      + Added liba52-0.7.4-dev to build depends
    + debian/rules: Added patch, patch-stamp and unpatch
    + changed 01_gcc4.3.patch:
      + src/include/xmmsclient/xmmsclient++/helpers.h: Added #include <climits>
  * New upstream relase fixes LP: #212566, #222341

 -- Benjamin Drung <email address hidden> Fri, 04 Jul 2008 16:23:34 +0200

And here is a debdiff to Debians version. Currently 0.5DrLecter-2 is waiting in the incoming queue: http://incoming.debian.org/

This bug was fixed in the package xmms2 - 0.5DrLecter-2ubuntu1

---------------
xmms2 (0.5DrLecter-2ubuntu1) intrepid; urgency=low

  * Merge from debian unstable (LP: #241098), remaining changes:
    + debian/control:
      + Update Maintainer field
      + add lpia to xmms2-plugin-alsa supported architectures
      + Added liba52-0.7.4-dev to build depends
    + debian/rules: Added patch, patch-stamp and unpatch
    + changed 01_gcc4.3.patch:
      + src/include/xmmsclient/xmmsclient++/helpers.h: Added #include <climits>
  * New upstream relase fixes LP: #212566, #222341

xmms2 (0.5DrLecter-2) unstable; urgency=medium

  * Make wma playback work with the latest libavcodec.
    + Cherry-pick fae1d0: Move ALAC hack from avcodec to mp4 to make
      avcodec more general.
    + Cherry-pick be6f8e: Fix wma file playing with newer libavcodec.

xmms2 (0.5DrLecter-1) unstable; urgency=low

  * New upstream release.
    + Remove the xmms2-plugin-gnomevfs package. The plugin has been
      removed upstream.
    + Remove the xmms2-plugin-avformat package. xmms2-plugin-asf replaces
      it.
    + Add xmms2-plugin-karaoke.
    + Add xmms2-plugin-airplay.
    + Add xmms2-plugin-speex.
    + Add xmms2-plugin-gme.
    + Add xmms2-plugin-gvfs.
    + Rename library packages to reflect SONAME changes.
  * Bump Standards-Version to 3.8.0 (no changes required).
  * Update COPYING and debian/copyright.
    + Cherry-pick 615391: Add license for src/plugin/sid/md5.* to COPYING.
    + Cherry-pick 58a583: Mention the GPLed faad plugin in COPYING.

 -- Benjamin Drung <email address hidden> Fri, 04 Jul 2008 16:23:34 +0200