Merge lp:~ubuntu-branches/ubuntu/precise/gedit-plugins/precise-201201201905 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-201201201905. 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

53. By Andrew Starr-Bochicchio on 2012-01-19

releasing version 3.3.1-0ubuntu1

52. By Andrew Starr-Bochicchio on 2012-01-19

Merge lp:~andrewsomething/ubuntu/precise/gedit-plugins/3.3.1

=== modified file 'configure' (properties changed: +x to -x)
=== modified file 'debian/control'
--- debian/control	2012-01-19 12:04:07 +0000
+++ debian/control	2012-01-20 19:11:25 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 Source: gedit-plugins
 Section: gnome
 Priority: optional
@@ -60,3 +61,66 @@
   * Multi Edit: Edit document in multiple places at once
   * Bookmarks: Easy document navigation with bookmarks
  
+=======
+Source: gedit-plugins
+Section: gnome
+Priority: optional
+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~),
+               debhelper (>= 8),
+               intltool (>= 0.40.0),
+               gnome-pkg-tools (>= 0.11),
+               libglib2.0-dev (>= 2.26.0),
+               libgtk-3-dev (>= 3.0.0),
+               libgtksourceview-3.0-dev (>= 3.0.0),
+               libpeas-dev (>= 1.0.0),
+               gedit-dev (>= 3.2.1),
+               python (>= 2.6.6-3~),
+               python-dbus (>= 0.83.1)
+Standards-Version: 3.9.2
+Homepage: http://live.gnome.org/Gedit/Plugins
+Vcs-Bzr: ubuntu:gedit-plugins
+Vcs-Browser: https://code.launchpad.net/+branch/ubuntu/gedit-plugins
+XS-Debian-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/gedit-plugins
+XS-Debian-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/gedit-plugins
+X-Python-Version: >= 2.3
+
+Package: gedit-plugins
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         ${python:Depends},
+         gedit (>= 3.2),
+         gir1.2-gucharmap-2.90,
+         gir1.2-peas-1.0,
+         gir1.2-vte-2.90,
+         gir1.2-glib-2.0,
+         gir1.2-gtk-3.0,
+         gir1.2-pango-1.0,
+         gir1.2-gtksource-3.0
+Recommends: python-zeitgeist
+Enhances: gedit
+Description: set of plugins for gedit
+ gedit-plugins contain a set of plugins for gedit, GNOME's text editor.
+ .
+ The following plugins are included:
+  * Character Map: Insert special characters just by clicking on them.
+  * 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
+  * Session Saver: Save and restore your working sessions
+  * 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