Merge lp:~ubuntu-branches/ubuntu/precise/libubuntuone/precise-201201231105 into lp:ubuntu/precise/libubuntuone

[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/precise/libubuntuone reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/libubuntuone/precise-201201231105. 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

102. By Martin Pitt on 2012-01-23

releasing version 2.99.2-0ubuntu1

101. By Martin Pitt on 2012-01-23

debian/copyright, debian/watch: Drop "edge." prefix from Launchpad URLs.

100. By Martin Pitt on 2012-01-23

* New upstream release.
  - Removes static Python bindings.
  - Disables mono bindings for transition to GTK+ 3.x.
* debian/rules:
  - Much simpler build without static python bindings.
* debian/control:
  - Update the dependencies and drop the mono/python packages.
* debian/python-ubuntuone.install, debian/libubuntuone1.0-cil*.install*:
  - Remove the mono and Python bindings packages.
* debian/patches:
  - No longer need the mono cil directory patch without mono bindings.
* debian/watch:
  - Update for the new version number.
* debian/source:
  - Define source format 3.0 (quilt).

=== added directory 'debian/source'
=== renamed directory 'debian/source' => 'debian/source.moved'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2012-01-23 11:12:26 +0000
@@ -0,0 +1,2 @@
+3.0 (quilt)
+