Merge lp:~ubuntu-branches/ubuntu/precise/gedit-plugins/precise-201112230606 into lp:ubuntu/precise/gedit-plugins

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

56. By Andrew Starr-Bochicchio on 2011-12-23

releasing version 3.2.1-1ubuntu1

55. By Andrew Starr-Bochicchio on 2011-12-23

debian/rules: Call dh_python2 for both /usr/lib/gedit/plugins
and /usr/share/gedit/plugins

54. By Andrew Starr-Bochicchio on 2011-12-23

debian/control{.in}: Add Enhances: gedit (LP: #710656).

53. By Andrew Starr-Bochicchio on 2011-12-23

Fix some formatting in debian/changelog.

52. By Andrew Starr-Bochicchio on 2011-12-22

* Merge from Debian Testing. Remaining Ubuntu changes:
 - debian/control:
  + Set Vcs-Bzr fields and move Debian Vcs fileds to
    XS-Debian-Vcs fields.
  + Switch to dh_python2.
 - debian/rules:
  - Switch to dh_python2.
 - debian/watch:
  + Watch for unstable releases.

* New upstream release.
* debian/watch:
  - Track .xz tarballs.
* debian/control.in:
  - Bump Build-Depends on libpeas-dev to (>= 1.0.0).
  - Bump Build-Depends on gedit-dev to (>= 3.2.1).
  - Bump Depends on gedit to (>= 3.2).
  - Set <email address hidden> as Maintainer.

51. By Andrew Starr-Bochicchio on 2011-12-22

Merging shared upstream rev into target branch.

=== modified file 'debian/control'
--- debian/control	2011-12-23 00:24:38 +0000
+++ debian/control	2011-12-23 06:13:27 +0000
@@ -1,10 +1,17 @@
 Source: gedit-plugins
 Section: gnome
 Priority: optional
+<<<<<<< TREE
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: Debian GNOME Maintainers <[e-mail]>, Josselin Mouette <[e-mail]>, Michael Biebl <[e-mail]>, Sebastian Dröge <[e-mail]>
 Build-Depends: cdbs (>= 0.4.90~),
+=======
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
+Uploaders: Josselin Mouette <[e-mail]>, Michael Biebl <[e-mail]>, Sebastian Dröge <[e-mail]>
+Build-Depends: cdbs (>= 0.4.90~),
+>>>>>>> MERGE-SOURCE
                debhelper (>= 8),
                intltool (>= 0.40.0),
                gnome-pkg-tools (>= 0.11),
@@ -41,6 +48,7 @@
  gedit-plugins contain a set of plugins for gedit, GNOME's text editor.
  .
  The following plugins are included:
+<<<<<<< TREE
   * Join/Split Lines: Join several lines or split long ones
   * Tag list: Provides a method to easily insert commonly used tags/strings into a document without having to type them.
   * Code comment: Comment out or uncomment a selected block of code.
@@ -49,12 +57,34 @@
   * Commander: Command line interface for advanced editing
   * Draw Spaces: Draw Spaces and Tabs
   * Word Completion: Word completion using the completion framework
+=======
+>>>>>>> MERGE-SOURCE
   * Character Map: Insert special characters just by clicking on them.
+<<<<<<< TREE
   * Text Size: Easily increase and decrease the text size
+=======
+  * Tag list: Provides a method to easily insert commonly used tags/strings into a document without having to type them.
+  * Bookmarks: Easy document navigation with bookmarks
+>>>>>>> MERGE-SOURCE
   * Session Saver: Save and restore your working sessions
+<<<<<<< TREE
   * Color Picker: Pick a color from a dialog and insert its hexadecimal representation.
   * SyncTeX: Synchronize between LaTeX and PDF with gedit and evince.
   * Smart Spaces: Forget you're not using tabulations.
   * Multi Edit: Edit document in multiple places at once
   * Bookmarks: Easy document navigation with bookmarks
+=======
+  * Color Picker: Pick a color from a dialog and insert its hexadecimal representation.
+  * Smart Spaces: Forget you're not using tabulations.
+  * Bracket Completion: Automatically adds closing brackets.
+  * Word Completion: Word completion using the completion framework
+  * SyncTeX: Synchronize between LaTeX and PDF with gedit and evince.
+  * Embedded Terminal: Embed a terminal in the bottom pane.
+  * Draw Spaces: Draw Spaces and Tabs
+  * Commander: Command line interface for advanced editing
+  * Join/Split Lines: Join several lines or split long ones
+  * Text Size: Easily increase and decrease the text size
+  * Code comment: Comment out or uncomment a selected block of code.
+  * Multi Edit: Edit document in multiple places at once
+>>>>>>> MERGE-SOURCE