Ubuntu

Merge lp:~ubuntu-branches/ubuntu/oneiric/gedit-plugins/oneiric-201109060911 into lp:ubuntu/oneiric/gedit-plugins

Proposed by Ubuntu Package Importer on 2011-09-06
Status: Rejected
Rejected by: Martin Pitt on 2011-09-08
Proposed branch: lp:~ubuntu-branches/ubuntu/oneiric/gedit-plugins/oneiric-201109060911
Merge into: lp:ubuntu/oneiric/gedit-plugins
Diff against target: 178 lines (+117/-57) 1 file modified (has conflicts)
Text conflict in debian/control
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/oneiric/gedit-plugins/oneiric-201109060911
Reviewer Review Type Date Requested Status
Didier Roche Disapprove on 2011-09-08
Ubuntu branches 2011-09-06 Pending
Review via email: mp+74186@code.launchpad.net

Description of the Change

The package importer has detected a possible inconsistency between the package history in the archve and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric/gedit-plugins reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/gedit-plugins/oneiric-201109060911. 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)

To post a comment you must log in.
Didier Roche (didrocks) wrote :

We track gedit in our desktop branch.

review: Disapprove
Didier Roche (didrocks) wrote :

Usual quilt 3 conflict.

Didier Roche (didrocks) wrote :

oupss, not for that one. it seems that debian/control wasn't refresh in the packaging branch but after a debclean, the autoimporter does the refresh.

Unmerged revisions

47. By Martin Pitt on 2011-09-06

releasing version 3.1.3-0ubuntu1

46. By Martin Pitt on 2011-09-06

new upstream release 3.1.3

Preview Diff

1=== modified file 'debian/control'
2--- debian/control 2011-09-06 10:08:41 +0000
3+++ debian/control 2011-09-06 09:16:35 +0000
4@@ -1,57 +1,117 @@
5-Source: gedit-plugins
6-Section: gnome
7-Priority: optional
8-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
9-XSBC-Original-Maintainer: Loic Minier <lool@dooz.org>
10-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Michael Biebl <biebl@debian.org>, Sebastian Dröge <slomo@debian.org>
11-Build-Depends: cdbs (>= 0.4.90~),
12- debhelper (>= 8),
13- intltool (>= 0.40.0),
14- gnome-pkg-tools (>= 0.11),
15- libglib2.0-dev (>= 2.26.0),
16- libgtk-3-dev (>= 3.0.0),
17- libgtksourceview-3.0-dev (>= 3.0.0),
18- libpeas-dev (>= 0.7.3),
19- gedit-dev (>= 3.0.0),
20- python (>= 2.6.6-3~),
21- python-dbus (>= 0.83.1)
22-Standards-Version: 3.9.2
23-Homepage: http://live.gnome.org/Gedit/Plugins
24-Vcs-Bzr: ubuntu:gedit-plugins
25-Vcs-Browser: https://code.launchpad.net/+branch/ubuntu/gedit-plugins
26-X-Python-Version: >= 2.3
27-
28-Package: gedit-plugins
29-Architecture: any
30-Depends: ${shlibs:Depends},
31- ${misc:Depends},
32- ${python:Depends},
33- gedit (>=3.0.0),
34- gir1.2-gucharmap-2.90,
35- gir1.2-peas-1.0,
36- gir1.2-vte-2.90,
37- gir1.2-glib-2.0,
38- gir1.2-gtk-3.0,
39- gir1.2-pango-1.0,
40- gir1.2-gtksource-3.0
41-Description: set of plugins for gedit
42- gedit-plugins contain a set of plugins for gedit, GNOME's text editor.
43- .
44- The following plugins are included:
45- * Smart Spaces: Forget you're not using tabulations.
46- * Color Picker: Pick a color from a dialog and insert its hexadecimal representation.
47- * Multi Edit: Edit document in multiple places at once
48- * Text Size: Easily increase and decrease the text size
49- * Embedded Terminal: Embed a terminal in the bottom pane.
50- * Bracket Completion: Automatically adds closing brackets.
51- * Tag list: Provides a method to easily insert commonly used tags/strings into a document without having to type them.
52- * Session Saver: Save and restore your working sessions
53- * Word Completion: Word completion using the completion framework
54- * Draw Spaces: Draw Spaces and Tabs
55- * Join/Split Lines: Join several lines or split long ones
56- * Character Map: Insert special characters just by clicking on them.
57- * Bookmarks: Easy document navigation with bookmarks
58- * Commander: Command line interface for advanced editing
59- * Code comment: Comment out or uncomment a selected block of code.
60- * SyncTeX: Synchronize between LaTeX and PDF with gedit and evince.
61-
62+<<<<<<< TREE
63+Source: gedit-plugins
64+Section: gnome
65+Priority: optional
66+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
67+XSBC-Original-Maintainer: Loic Minier <lool@dooz.org>
68+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Michael Biebl <biebl@debian.org>, Sebastian Dröge <slomo@debian.org>
69+Build-Depends: cdbs (>= 0.4.90~),
70+ debhelper (>= 8),
71+ intltool (>= 0.40.0),
72+ gnome-pkg-tools (>= 0.11),
73+ libglib2.0-dev (>= 2.26.0),
74+ libgtk-3-dev (>= 3.0.0),
75+ libgtksourceview-3.0-dev (>= 3.0.0),
76+ libpeas-dev (>= 0.7.3),
77+ gedit-dev (>= 3.0.0),
78+ python (>= 2.6.6-3~),
79+ python-dbus (>= 0.83.1)
80+Standards-Version: 3.9.2
81+Homepage: http://live.gnome.org/Gedit/Plugins
82+Vcs-Bzr: ubuntu:gedit-plugins
83+Vcs-Browser: https://code.launchpad.net/+branch/ubuntu/gedit-plugins
84+X-Python-Version: >= 2.3
85+
86+Package: gedit-plugins
87+Architecture: any
88+Depends: ${shlibs:Depends},
89+ ${misc:Depends},
90+ ${python:Depends},
91+ gedit (>=3.0.0),
92+ gir1.2-gucharmap-2.90,
93+ gir1.2-peas-1.0,
94+ gir1.2-vte-2.90,
95+ gir1.2-glib-2.0,
96+ gir1.2-gtk-3.0,
97+ gir1.2-pango-1.0,
98+ gir1.2-gtksource-3.0
99+Description: set of plugins for gedit
100+ gedit-plugins contain a set of plugins for gedit, GNOME's text editor.
101+ .
102+ The following plugins are included:
103+ * Smart Spaces: Forget you're not using tabulations.
104+ * Color Picker: Pick a color from a dialog and insert its hexadecimal representation.
105+ * Multi Edit: Edit document in multiple places at once
106+ * Text Size: Easily increase and decrease the text size
107+ * Embedded Terminal: Embed a terminal in the bottom pane.
108+ * Bracket Completion: Automatically adds closing brackets.
109+ * Tag list: Provides a method to easily insert commonly used tags/strings into a document without having to type them.
110+ * Session Saver: Save and restore your working sessions
111+ * Word Completion: Word completion using the completion framework
112+ * Draw Spaces: Draw Spaces and Tabs
113+ * Join/Split Lines: Join several lines or split long ones
114+ * Character Map: Insert special characters just by clicking on them.
115+ * Bookmarks: Easy document navigation with bookmarks
116+ * Commander: Command line interface for advanced editing
117+ * Code comment: Comment out or uncomment a selected block of code.
118+ * SyncTeX: Synchronize between LaTeX and PDF with gedit and evince.
119+
120+=======
121+Source: gedit-plugins
122+Section: gnome
123+Priority: optional
124+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
125+XSBC-Original-Maintainer: Loic Minier <lool@dooz.org>
126+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Michael Biebl <biebl@debian.org>, Sebastian Dröge <slomo@debian.org>
127+Build-Depends: cdbs (>= 0.4.90~),
128+ debhelper (>= 8),
129+ intltool (>= 0.40.0),
130+ gnome-pkg-tools (>= 0.11),
131+ libglib2.0-dev (>= 2.26.0),
132+ libgtk-3-dev (>= 3.0.0),
133+ libgtksourceview-3.0-dev (>= 3.0.0),
134+ libpeas-dev (>= 0.7.3),
135+ gedit-dev (>= 3.0.0),
136+ python (>= 2.6.6-3~),
137+ python-dbus (>= 0.83.1)
138+Standards-Version: 3.9.2
139+Homepage: http://live.gnome.org/Gedit/Plugins
140+Vcs-Bzr: ubuntu:gedit-plugins
141+Vcs-Browser: https://code.launchpad.net/+branch/ubuntu/gedit-plugins
142+X-Python-Version: >= 2.3
143+
144+Package: gedit-plugins
145+Architecture: any
146+Depends: ${shlibs:Depends},
147+ ${misc:Depends},
148+ ${python:Depends},
149+ gedit (>=3.0.0),
150+ gir1.2-gucharmap-2.90,
151+ gir1.2-peas-1.0,
152+ gir1.2-vte-2.90,
153+ gir1.2-glib-2.0,
154+ gir1.2-gtk-3.0,
155+ gir1.2-pango-1.0,
156+ gir1.2-gtksource-3.0
157+Description: set of plugins for gedit
158+ gedit-plugins contain a set of plugins for gedit, GNOME's text editor.
159+ .
160+ The following plugins are included:
161+ * Commander: Command line interface for advanced editing
162+ * Bookmarks: Easy document navigation with bookmarks
163+ * Join/Split Lines: Join several lines or split long ones
164+ * Session Saver: Save and restore your working sessions
165+ * Multi Edit: Edit document in multiple places at once
166+ * Bracket Completion: Automatically adds closing brackets.
167+ * Text Size: Easily increase and decrease the text size
168+ * Smart Spaces: Forget you're not using tabulations.
169+ * Character Map: Insert special characters just by clicking on them.
170+ * Color Picker: Pick a color from a dialog and insert its hexadecimal representation.
171+ * Code comment: Comment out or uncomment a selected block of code.
172+ * SyncTeX: Synchronize between LaTeX and PDF with gedit and evince.
173+ * Draw Spaces: Draw Spaces and Tabs
174+ * Word Completion: Word completion using the completion framework
175+ * Tag list: Provides a method to easily insert commonly used tags/strings into a document without having to type them.
176+ * Embedded Terminal: Embed a terminal in the bottom pane.
177+
178+>>>>>>> MERGE-SOURCE

Subscribers

People subscribed via source and target branches

to all changes: