Merge lp:~ubuntu-branches/ubuntu/utopic/gtk-doc/utopic-201408050406 into lp:ubuntu/utopic/gtk-doc

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

32. By Jackson Doak on 2014-08-02

* Merge from debian. Remaining changes:
  - debian/control.in: Drop optional highlight dependency, which is in
    universe.
* Team upload.
* New upstream release
* debian/control: Bump standards-version to 3.9.5 (no changes)

31. By Jackson Doak on 2014-08-02

Merging shared upstream rev into target branch.

=== modified file 'debian/control'
--- debian/control	2014-08-03 06:25:50 +0000
+++ debian/control	2014-08-05 04:15:33 +0000
@@ -5,10 +5,17 @@
 Source: gtk-doc
 Section: gnome
 Priority: optional
+<<<<<<< TREE
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>, Jeremy Bicha <[e-mail]>, Michael Biebl <[e-mail]>
 Standards-Version: 3.9.5
+=======
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
+Uploaders: Andreas Henriksson <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>, Josselin Mouette <[e-mail]>, Martin Pitt <[e-mail]>, Michael Biebl <[e-mail]>, Sebastian Dröge <[e-mail]>, Sjoerd Simons <[e-mail]>
+Standards-Version: 3.9.5
+>>>>>>> MERGE-SOURCE
 Build-Depends: cdbs,
                debhelper (>= 8),
                gnome-pkg-tools (>= 0.10),