Merge lp:~ubuntu-branches/ubuntu/saucy/ofono/saucy-201308142201 into lp:ubuntu/saucy/ofono

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/saucy/ofono reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/saucy/ofono/saucy-201308142201. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

41. By Mathieu Trudel-Lapierre on 2013-08-14

releasing version 1.12-0ubuntu7

40. By Mathieu Trudel-Lapierre on 2013-08-14

debian/patches/rilmodem-support.patch: cleanup build warnings.

39. By Mathieu Trudel-Lapierre on 2013-08-14

debian/rules: add logic to prevent -dbg package from
being stripped.

38. By Ricardo Salveti on 2013-08-09

releasing version 1.12-0ubuntu6

37. By Ricardo Salveti on 2013-08-09

debian/patches/rilmodem-support.patch: disable unit tests
for PowerPC by adding BYTE_ORDER == LITTLE_ENDIAN guards.

36. By Ricardo Salveti on 2013-08-09

releasing version 1.12-0ubuntu5

35. By Ricardo Salveti on 2013-08-09

debian/control: changing ofono-scripts to all

34. By Ricardo Salveti on 2013-08-09

releasing version 1.12-0ubuntu4

33. By Ricardo Salveti on 2013-08-09

Removing old log files when merging branch from Tony

32. By Ricardo Salveti on 2013-08-09

debian/control: adding proper python dependencies