Please merge audacious 2.0.1-1 (universe) from Debian unstable (main)

Hi,

On Wed, 2009-06-03 at 20:30 +0000, Jean-Louis Dupond wrote:
> ** Attachment removed: "Debdiff of debian dsc & ubuntu1 dsc"
> http://launchpadlibrarian.net/27467532/deb.diff
>
> ** Attachment added: "Debdiff of debian dsc & ubuntu1 dsc"
> http://launchpadlibrarian.net/27469484/deb2.diff
>

This merge is done wrong. Specifically, it

 - doesn't list the remaining Ubuntu changes;
 - adds new changes without adding any rationale for doing so;
 - doesn't follow the standard changelog format for merges.

I would prefer to overlook the changes in the Ubuntu packaging. It
hasn't received much attention since my last restructuring of the Ubuntu
patchset in 1.4. I'm sure there's cruft in it that needs to go, and
other patches that need to be rebased instead of being dropped entirely.

So if you don't mind, I would prefer to look into this after
audacious-plugins/2.0.1-2 hits sid later today.

Hi dupondje,

Please address the above comment. You also should take a look at the following wiki page, and familiarize yourself with the standard format for merges:

https://wiki.ubuntu.com/UbuntuDevelopment/Merging

grab-merge (which is included as part of the ubuntu-dev-tools package) can help you out with some of this.

Un-subscribing universe sponsors. Please re-subscribe when the merge is ready.

Thanks!

Benjamin,

A small hint, there is a small fixed version available on mentors.debian.org :)

I cannot find it on mentors.debian.net.

Its indeed gone it seems :(

audacious (2.0.1-1ubuntu1) karmic; urgency=low

  * Merge from Debian unstable (LP: 383271), remaining changes:
    + debian/patches/004-change-default-outputplugin.patch:
      Set pulseaudio as output plugin in the default config structure.
    + debian/control
      + audacious package recommends python-chardet.
      + conflict with audacious-crossfade from hardy to prevent segfaults.
  * Dropped Ubuntu changes:
    - debian/patches/005-playlist_play_clicked_file.patch: Not needed anymore.
    - debian/patches/Update-Spanish-translation.patch: Applied upstream.
  * Drop debian/patches/003-change-default-skin.patch, do not change the
    default theme. Keep close to upstream.

 -- Benjamin Drung <email address hidden> Sun, 07 Jun 2009 18:31:01 +0200

I forgot a sharp in the changelog. Here is the updated one.

This bug was fixed in the package audacious - 2.0.1-1ubuntu1

---------------
audacious (2.0.1-1ubuntu1) karmic; urgency=low

  * Merge from Debian unstable (LP: #383271), remaining changes:
    + debian/patches/004-change-default-outputplugin.patch:
      Set pulseaudio as output plugin in the default config structure.
    + debian/control
      + audacious package recommends python-chardet.
      + conflict with audacious-crossfade from hardy to prevent segfaults.
  * Dropped Ubuntu changes:
    - debian/patches/005-playlist_play_clicked_file.patch: Not needed anymore.
    - debian/patches/Update-Spanish-translation.patch: Applied upstream.
  * Drop debian/patches/003-change-default-skin.patch, do not change the
    default theme. Keep close to upstream.

 -- Benjamin Drung <email address hidden> Sun, 07 Jun 2009 18:31:01 +0200

can you backport to the jaunty (9.04) ?

You can find the package in my backports PPA: https://launchpad.net/~bdrung/+archive/backports

Hi Benjamin,
It seems audacious-plugins is not present in your backports PPA. Would you please add it? Thanks.

Ok, I have uploaded audacious-plugins to my PPA: https://launchpad.net/~bdrung/+archive/ppa
When audacious-plugins hits karmic (9.10), then you will find it in my backports PPA as well.

So, uh...

you guys do realize that audacious isn't installable because you guys didn't sync the plugins, right?

i mean, i hope you guys know this, right??

...bleah.

...oh, it finally hit. nevermind.