Please merge transmission 1.40-1 (main) from Debian unstable (main)

Setting this back to In Progress again. I just spoke with Leo Antunes (the Debian maintainer for transmission). He has found a couple of bugs in 1.40-1, and is preparing a 1.40-2 upload to fix them.

So, there's not much point in merging 1.40-1.

As an FYI, since this may affect how much work you want to put into the 1.40 patch, the release date for 1.41 is tentatively two weeks from now.

Thanks charles. Yeah, it might be worth holding off until then.

Thanks, Chris. In the meantime, Debian has -2, so the diff needs to be updated. Also, the current diff replaces quilt with dpatch; we should absolutely avoid changing the build and patch system in Ubuntu, instead we should convert our dpatches to quilt.

The X-Ubuntu-Gettext-Domain and clutch replaces are Ubuntu specific, but the curl build dep and .pot file build can easily go to Debian, and should at least be filed there.

Thanks! I'm subscribed now, I'll upload a new merge as soon as you send it here.

Martin,

I've re-done the merge with 1.40-2 now. I spoke with Leo about the Ubuntu delta last week and I was hoping that some of it would have ended up in 1.40-2. I think you already opened a bug on the Debian BTS about the pot file build fix didn't you? I haven't opened a bug about the libcurl-dev dependency, but Leo is aware of it.

I've migrated the patch system (and the one Ubuntu patch) to quilt in this build and removed the build-dep on dpatch. I had to add a build-dep on quilt, as Debian haven't actually implemented a patch system in transmission yet (the include in debian/rules was commented out).

I found a bug in the new transmission-daemon postinst script, which I've fixed for Ubuntu. I'll send this patch to Debian.

I opened a bug report in Debian for the error in the dpkg-statoverride call:

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=508310

This bug was fixed in the package transmission - 1.40-2ubuntu1

---------------
transmission (1.40-2ubuntu1) jaunty; urgency=low

  * Merge from debian unstable (LP: #305298), remaining changes:
    - debian/control:
      - Don't just build-depend on libcurl-dev, which is
        a virtual package.
      - Added replaces & provides clutch (now included as part of transmission).
      - Build-depends on quilt.
    - debian/rules:
      - Uncommented "include /usr/share/quilt/quilt.make".
      - Added patch/unpatch targets for Quilt.
      - Create a PO template during package build.
    - debian/transmission-daemon.postinst: Corrected dpkg-statoverride call
    - 20_add_X-Ubuntu-Gettext-Domain.diff: Add X-Ubuntu-Gettext-Domain
      to .desktop file.
  * Converted patch system from dpatch to quilt.

transmission (1.40-2) unstable; urgency=low

  * debian/transmission-daemon.postinst: add --group to adduser call
    and add workaround for the lack of the flag in 1.40-1 (closes: #507766)
  * debian/control: make transmission-cli recommend transmission-daemon,
    instead of depending
  * debian/transmission-daemon.init: add --retry to stop action to avoid
    race condition during install

transmission (1.40-1) unstable; urgency=low

  * New upstream release (closes: #505846)
    - No longer re-download parts unnecessarily (closes: #500971)
    - badwidth limit code rewritten (closes: #495693)
  * debian/control:
    - added transmission-gtk Recommends on xdg-utils (closes: #497978)
    - separated transmission-daemon package (closes: #503744)
    - added "Replaces: transmission-cli" to daemon package
    - added intltool build-dep
    - remove "free" from short description (it's in main, that's redundant)
  * added initscript for the daemon (closes: #503961)

 -- Chris Coulson <email address hidden> Tue, 09 Dec 2008 18:34:12 +0000