Merge mosquitto 1.3.4-2 (universe) from Debian unstable (main)

Bug #1358019 reported by Roger Light
18
This bug affects 3 people
Affects Status Importance Assigned to Milestone
mosquitto (Ubuntu)
Fix Released
Undecided
Roger Light

Bug Description

Please sync mosquitto 1.3.4-2 (universe) from Debian unstable (main)

Explanation of the Ubuntu delta and why it can be dropped:
  * Merge from Debian unstable. Remaining changes:
    - Install apparmor profile.
    - Replace init script with upstart script.
  * debian/patches/fix-972389.patch: Drop, as it was applied in Debian as
    bug-proto-number.patch.

Upstart script changes can be dropped, this is now handled in the Debian package.
The debian package does not install the apparmor profile so this still needs an
Ubuntu specific delta.

Changelog entries since current utopic version 0.15-2ubuntu1:

mosquitto (1.3.4-2) unstable; urgency=low

  * Disable bad "fake ca" test.

 -- Roger A. Light <email address hidden> Sat, 16 Aug 2014 10:52:12 +0100

mosquitto (1.3.4-1) unstable; urgency=medium

  * New upstream release: http://mosquitto.org/2014/08/version-1-3-4-released/
   (closes: #725014, #754787)
  * Add dependency on libuuid, c-ares.
  * Bumped standards version to 3.9.5. No changes needed.
  * Example config files are now installed to
    /usr/share/doc/mosquitto/examples/
  * debian/copyright year updated.
  * compiling.txt is no longer distributed.
  * Updated debian/copyright with new dates.

 -- Roger A. Light <email address hidden> Wed, 06 Aug 2014 00:43:39 +0100

mosquitto (1.2.1-1) unstable; urgency=low

  * New upstream release: http://mosquitto.org/2013/09/version-1-2-1-released/
  * Add Replaces/Break for libmosquitto-dev and libmosquittopp-dev
    (closes: #720637, #720638).

 -- Roger A. Light <email address hidden> Wed, 18 Sep 2013 21:36:01 +0100

mosquitto (1.2-1) unstable; urgency=low

  * New upstream release: http://mosquitto.org/2013/08/version-1-2-released/
    (closes: #685119).
  * Bumped standards release to 3.9.4. No changes needed.
  * Added mosquitto-dbg package for binary debug information.
  * Added python3-mosquitto binary package.
  * Use dh_python2 (and dh_python3) instead of python-support.
  * mosquitto now logs to /var/log/mosquitto/ using logrotate.
  * mosquitto local config should now be placed in /etc/mosquitto/conf.d/

 -- Roger A. Light <email address hidden> Wed, 07 Aug 2013 23:26:19 +0100

Revision history for this message
Roger Light (roger.light) wrote :

This also closes bugs #1037892 and #1035328.

The Debian packaging changed so that the dev packages were not versioned, so it would be best to update debian/control to make libmosquitto-dev replace libmosquitto0-dev and libmosquittopp-dev replace libmosquittopp0-dev.

Revision history for this message
Martin Pitt (pitti) wrote :

This can't be synced due to the Ubuntu changes you pointed out yourself. Retitling and unsubscribing sponsors as there's nothing to sponsor here right now.

summary: - Sync mosquitto 1.3.4-2 (universe) from Debian unstable (main)
+ Merge mosquitto 1.3.4-2 (universe) from Debian unstable (main)
Revision history for this message
Roger Light (roger.light) wrote :

I've carried out the merge in the linked branch. I was wrong before, the Debian package does include the Replaces lines, so it's only the apparmor profile that is ubuntu specific.

Revision history for this message
Launchpad Janitor (janitor) wrote :

Status changed to 'Confirmed' because the bug affects multiple users.

Changed in mosquitto (Ubuntu):
status: New → Confirmed
Revision history for this message
Gianfranco Costamagna (costamagnagianfranco) wrote :

Since I did some work prior to finding this bug, I'm ataching a (bad) debdiff for your convenience.

However it does not contain the lib* conflicts, because I didn't dig into it and I hope the branch is already fine :)

Revision history for this message
Iain Lane (laney) wrote :

Okay, I'd have liked to see this come in a bit earlier (it's only a little more than one week before release now; seems like the sponsors were removed but not re-added after Martin's earlier comments. Thanks for catching Gianfranco), but this seems like an improvement.

Before uploading, please (the sponsor can do this too) find an archive admin willing to handle the NEW processing: https://launchpad.net/~ubuntu-archive/+members - standard practice when we're in freeze.

Revision history for this message
Iain Lane (laney) wrote :

I have been looking at sponsoring this, but I ran into a couple of issues

laney@utopic> bzr bd -S
Building using working tree
Building package in normal mode
Looking for a way to retrieve the upstream tarball
Using the upstream tarball that is present in /home/laney/temp
bzr: ERROR: An error (1) occurred running quilt: None

Applying patch /home/laney/temp/build-area/mosquitto-1.3.4/debian/patches/disable-bad-test.patch
patching file test/lib/Makefile

Applying patch /home/laney/temp/build-area/mosquitto-1.3.4/debian/patches/enable-libwrap.patch
patching file config.mk

Applying patch /home/laney/temp/build-area/mosquitto-1.3.4/debian/patches/fix-prefix.patch
patching file config.mk

Applying patch /home/laney/temp/build-area/mosquitto-1.3.4/debian/patches/install-apparmor.patch
patching file Makefile
Hunk #1 FAILED at 23.
1 out of 1 hunk FAILED -- rejects in file Makefile
Patch /home/laney/temp/build-area/mosquitto-1.3.4/debian/patches/install-apparmor.patch does not apply (enforce with -f)

okay, this is easy enough to fix ...

laney@utopic> bzr bd -S
Building using working tree
Building package in normal mode
Purging the build dir: /home/laney/temp/build-area/mosquitto-1.3.4
Looking for a way to retrieve the upstream tarball
Upstream tarball already exists in build directory, using that
bzr: ERROR: An error (1) occurred running quilt: None

Applying patch /home/laney/temp/build-area/mosquitto-1.3.4/debian/patches/disable-bad-test.patch
patching file test/lib/Makefile
Hunk #1 FAILED at 39.
1 out of 1 hunk FAILED -- rejects in file test/lib/Makefile
Patch /home/laney/temp/build-area/mosquitto-1.3.4/debian/patches/disable-bad-test.patch can be reverse-applied

Hmm.

Would you please ensure that the branch passes 'bzr bd -S', and preferably test build / test the resulting package?

I'm setting to Incomplete, please reset the status back once you've fixed this. Thank you :)

Changed in mosquitto (Ubuntu):
status: Confirmed → Incomplete
assignee: nobody → Roger Light (roger.light)
Revision history for this message
Bhavani Shankar (bhavi) wrote :

Is there any work on this done? Orelse I can fix this and upload

Regards
Bhavi

Revision history for this message
Martin Pitt (pitti) wrote :

Bhavani, if you want to continue with this merge, please do. This is now one of the packages blocking the migration to systemd as it currently only has an upstart job.

Revision history for this message
Gianfranco Costamagna (costamagnagianfranco) wrote :

Sorry I read this only now... I see it is fixed already in vivid, thanks to everybody!

Closing then!

(I still need to figure out why launchpad doesn't send me the mails)

Changed in mosquitto (Ubuntu):
status: Incomplete → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.