Please merge bluez-utils 3.30 from debian unstable

I've also uploaded this to my PPA at https://bugs.edge.launchpad.net/~superm1/+archive

Steve: can you please take a look at it?

.

Mario, as the new bluez-utils version has converted from services to plugins, maintainer scripts need to remove remaining .service files from /etc/bluetooth/ [1]. I reckon this needs to be done for input.service network.service and serial.service which Debian doesn't include.

Does this merge drop network and serial (now) plugins that we used to have earlier?

[1] http://sourceforge.net/mailarchive/forum.php?thread_name=1207252447.18442.11.camel%40californication&forum_name=bluez-announce

Matti,

Ah you are correct. I'll upload a new diff tomorrow to clean up when it
detects an upgrade for these cases.

On Thu, May 29, 2008 at 2:34 PM, Matti Lindell <email address hidden> wrote:

> Mario, as the new bluez-utils version has converted from services to
> plugins, maintainer scripts need to remove remaining .service files from
> /etc/bluetooth/ [1]. I reckon this needs to be done for input.service
> network.service and serial.service which Debian doesn't include.
>
> Does this merge drop network and serial (now) plugins that we used to
> have earlier?
>
> [1]
>
> http://sourceforge.net/mailarchive/forum.php?thread_name=1207252447.18442.11.camel%40californication&forum_name
> =bluez-announce<http://sourceforge.net/mailarchive/forum.php?thread_name=1207252447.18442.11.camel%40californication&forum_name=bluez-announce>
>
> --
> Please merge bluez-utils 3.30 from debian unstable
> https://bugs.launchpad.net/bugs/235576
> You received this bug notification because you are a direct subscriber
> of the bug.
>

--
Mario Limonciello
<email address hidden>

Hi,

Here is an updated patch. I made sure that that the services were properly cleaned up and also that the new plugins are kept in place.

Matti:
Thanks for being so meticulous to catch such things :)

Some comments after a look at the diff.

* The bluez-serial package mentions audio in the description, I'm guessing this should be serial.
2. The changelog entry about introducing 2 new packages is formatted such that at a glance, one thinks it is a merge delta, when in fact its a new change to the package after the merge. I'd suggest putting it as a new item under everything else, with a top-level * point to make it clearer that it is not something carried over as part of the merge.

Here is a cleaned up debdiff per Luke's recommendations.

This bug was fixed in the package bluez-utils - 3.30-3ubuntu1

---------------
bluez-utils (3.30-3ubuntu1) intrepid; urgency=low

  * Merge with debian unstable, remaining changes: (LP: #235576)
    - debian/control:
      * Leave maintainer as Ubuntu Core Dev
    - debian/patches:
      * Drop 060_gst_marginal, it's now included in debian patch
        006_a2dpsink_marginal
      * Leave 007_dell_bluetooth.patch as it's not upstream until 3.32.
      * Leave 002_hcid_conf_defaults delta to debian.
    - debian/bluez-utils.preinst:
      * Check for upgrades before 3.30 and cleanup old service files
    - debian/rules:
      * Turn off hidd, dund, and pand to try the plugins again.
        If bug #191704 or #192043 crop up again, feel free to re-enable
        these.
      * Install network plugin conf file.
  * Introduce 3 new packages, bluez-network, bluez-serial, bluez-input.
    - debian/bluez-{network,serial,input}.install:
      * Include the plugins for network, serial, and input.
    - debian/rules:
      * Enable network, serial, and input plugins.

bluez-utils (3.30-3) unstable; urgency=low

  * Add watch file
  * Properly guard in bluez-utils.postinst before moving a conffile
    (Closes: #415480)
  * Comment conffile renaming for versions <= 2.19

bluez-utils (3.30-2) unstable; urgency=low

  * Add dbus as dependency in the init script (Closes: #475656)
  * Add a NEWS explaining the switch from services to shared objects
    (Closes: #475076)
  * Downgrade bluez-gnome from recommends to suggests together with
    kdebluetooth (Closes: #448553, #458945)
  * Remove old Conflicts/Replaces on bluez-sdp and bluez-pan

bluez-utils (3.30-1) unstable; urgency=low

  * New upstream release (Closes: #473403)
    + Bump build-dep to libbluetooth-dev >= 3.30
    + Services are now plugins, so drop 001_audio_service_autostart.patch
    + Drop 006_baudrates.patch applied upstream
  * Explicitly enable PAND/DUND/HIDD instead of plugins for now
  * Fix bashism in init script (Closes: #464495)
  * Add patch to register a2dpsink as marginal so it doesn't take over
  * Reload dbus in postinst (Closes: #466013)
  * Change homepage field to bluez.org (Closes: #444332)
  * Rephrase README.Debian and remove references to 2.4 kernel
    (Closes: #413393)

 -- Mario Limonciello <email address hidden> Wed, 28 May 2008 13:40:48 -0500