Ubuntu
x11proto-input package

Merge lp:~ubuntu-branches/ubuntu/utopic/x11proto-input/utopic-201407131811 into lp:ubuntu/utopic/x11proto-input

  1. Utopic (14.10)
  2. utopic-201407131811
  3. Merge into utopic
Proposed by Ubuntu Package Importer
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/utopic/x11proto-input/utopic-201407131811
Merge into: lp:ubuntu/utopic/x11proto-input
Diff against target: 308 lines (+285/-0) (has conflicts)
2 files modified
debian/changelog (+250/-0)
debian/control (+35/-0)
Text conflict in debian/changelog
Text conflict in debian/control
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/utopic/x11proto-input/utopic-201407131811
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+226613@code.launchpad.net

Description of the change

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

Unmerged revisions

14. By Timo Aaltonen

* Merge from unreleased debian git.
  - new upstream release

13. By Maarten Lankhorst

New upstream release candidate.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-07-13 10:17:18 +0000
3+++ debian/changelog 2014-07-13 18:19:21 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 x11proto-input (2.3.1-1) unstable; urgency=medium
7
8 * New upstream release.
9@@ -246,3 +247,252 @@
10 * First x11proto-input release.
11
12 -- Daniel Stone <daniel.stone@ubuntu.com> Mon, 16 May 2005 22:10:17 +1000
13+=======
14+x11proto-input (2.3-0ubuntu1) raring; urgency=low
15+
16+ * Merge from unreleased debian git.
17+ - new upstream release
18+
19+ -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 22 Apr 2013 10:42:21 +0300
20+
21+x11proto-input (2.3-1) UNRELEASED; urgency=low
22+
23+ * New upstream release.
24+
25+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Tue, 08 Jan 2013 15:01:59 +0100
26+
27+x11proto-input (2.2-1) unstable; urgency=low
28+
29+ * New upstream release.
30+ * Upload to unstable
31+
32+ -- Julien Cristau <jcristau@debian.org> Sun, 15 Apr 2012 16:17:02 +0200
33+
34+x11proto-input (2.1.99.6-1) experimental; urgency=low
35+
36+ [ Chase Douglas ]
37+ * New upstream release candidate.
38+
39+ -- Cyril Brulebois <kibi@debian.org> Fri, 10 Feb 2012 21:53:18 +0100
40+
41+x11proto-input (2.1.99.5-2) experimental; urgency=low
42+
43+ * Merge multiarch support from unstable branch.
44+
45+ -- Steve Langasek <vorlon@debian.org> Wed, 25 Jan 2012 12:24:17 -0800
46+
47+x11proto-input (2.1.99.5-1) experimental; urgency=low
48+
49+ * New upstream release candidate.
50+
51+ -- Cyril Brulebois <kibi@debian.org> Mon, 09 Jan 2012 01:40:27 +0100
52+
53+x11proto-input (2.1.99.4-1) experimental; urgency=low
54+
55+ * New upstream release candidate.
56+ * Remove --enable-unstable-protocol, no longer needed.
57+
58+ -- Cyril Brulebois <kibi@debian.org> Wed, 21 Dec 2011 09:41:06 +0100
59+
60+x11proto-input (2.1.99.3-1) experimental; urgency=low
61+
62+ * New upstream release candidate:
63+ - With multitouch support.
64+ * Pass --enable-unstable-protocol to configure accordingly.
65+ * Bump xutils-dev build-dep for new macros, add asciidoc build-dep.
66+ * Get rid of .docs, XI{,2}proto.txt were already listed in .install; and
67+ add XI{,2}proto.html there accordingly (thanks, asciidoc).
68+
69+ -- Cyril Brulebois <kibi@debian.org> Thu, 15 Dec 2011 14:15:31 +0100
70+
71+x11proto-input (2.0.2-2) unstable; urgency=low
72+
73+ * Mark x11proto-input-dev Multi-Arch: foreign
74+ * Install .pc file to /usr/share/pkgconfig instead of
75+ /usr/lib/pkgconfig
76+
77+ -- Steve Langasek <vorlon@debian.org> Fri, 17 Jun 2011 08:56:37 -0700
78+
79+x11proto-input (2.0.2-1) unstable; urgency=low
80+
81+ * New upstream release.
82+ * Switch to dh:
83+ - Bump debhelper build-dep and compat to 8.
84+ - Use dh-autoreconf and quilt sequences, rewrite rules file.
85+ - Add placeholder quilt series file.
86+ * Get rid of xsfbs accordingly.
87+ * Update Uploaders list. Thanks, David and Andres!
88+ * Get rid of old Breaks on libxi-dev, even squeeze has a higher version.
89+ * Wrap (Build-)Depends.
90+ * Bump Standards-Version (no changes).
91+
92+ -- Cyril Brulebois <kibi@debian.org> Thu, 09 Jun 2011 15:30:57 +0200
93+
94+x11proto-input (2.0.1-1) unstable; urgency=low
95+
96+ [ Julien Cristau ]
97+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
98+ good reason. Thanks, Colin Watson!
99+ * Remove myself from Uploaders
100+
101+ [ Cyril Brulebois ]
102+ * New upstream release.
103+ * Update debian/copyright.
104+ * No longer pass --disable-shared, this option is gone.
105+ * Ship XIproto.txt and XI2proto.txt
106+ * Switch from --list-missing to --fail-missing for additional safety.
107+ * Add myself to Uploaders.
108+
109+ -- Cyril Brulebois <kibi@debian.org> Fri, 12 Nov 2010 17:08:10 +0100
110+
111+x11proto-input (2.0-2) unstable; urgency=low
112+
113+ * Upload to unstable.
114+
115+ -- Julien Cristau <jcristau@debian.org> Wed, 06 Jan 2010 12:30:54 +0000
116+
117+x11proto-input (2.0-1) experimental; urgency=low
118+
119+ [ Julien Cristau ]
120+ * Add Depends on x11proto-core-dev.
121+ * Install the XI1 and XI2 specs in the package.
122+
123+ [ Timo Aaltonen ]
124+ * New upstream release.
125+ * Bump the build-dep on xutils-dev (>= 1:7.5~1).
126+
127+ -- Julien Cristau <jcristau@debian.org> Thu, 26 Nov 2009 15:34:18 +0100
128+
129+x11proto-input (1.9.99.902-1) experimental; urgency=low
130+
131+ [ Timo Aaltonen ]
132+ * Add README.source from xsfbs. Bump Standards-Version to 3.8.1.
133+
134+ [ Julien Cristau ]
135+ * Drop Pre-Depends on x11-common and Conflicts/Replaces on libxi-dev. This
136+ was only needed for upgrades from sarge.
137+ * Bump Standards-Version to 3.8.3.
138+ * New upstream release candidate
139+ + XInput.h moved to libXi
140+ * Breaks libxi-dev << 1.2.99 to make sure XInput.h doesn't go missing.
141+ * Bump xutils-dev build-dep to 1:7.4+4.
142+
143+ -- Julien Cristau <jcristau@debian.org> Sat, 12 Sep 2009 14:52:31 +0200
144+
145+x11proto-input (1.5.0-2) unstable; urgency=low
146+
147+ * Pull from upstream: Protect _XiDevicePresenceNotifyEvent declaration
148+ against C++ includes.
149+ * Upload to unstable.
150+
151+ -- Julien Cristau <jcristau@debian.org> Sun, 15 Feb 2009 21:10:05 +0100
152+
153+x11proto-input (1.5.0-1) experimental; urgency=low
154+
155+ * New upstream release.
156+ * Drop unused build-dep on libtool.
157+
158+ -- Julien Cristau <jcristau@debian.org> Fri, 19 Dec 2008 15:27:32 +0100
159+
160+x11proto-input (1.4.4-1) unstable; urgency=low
161+
162+ [ Timo Aaltonen ]
163+ * New upstream release.
164+ * Switch to running autoreconf at build time, and build-depend on automake,
165+ libtool and xutils-dev.
166+
167+ [ Julien Cristau ]
168+ * debian/rules: allow parallel builds.
169+
170+ -- Julien Cristau <jcristau@debian.org> Thu, 28 Aug 2008 00:06:54 +0200
171+
172+x11proto-input (1.4.3-2) unstable; urgency=low
173+
174+ * Fix from upstream: don't include <X11/Xmd.h> in XI.h, and use unsigned int
175+ instead of CARD32 (Closes: #470245).
176+
177+ -- Julien Cristau <jcristau@debian.org> Mon, 10 Mar 2008 14:39:22 +0100
178+
179+x11proto-input (1.4.3-1) unstable; urgency=low
180+
181+ [ Brice Goglin ]
182+ * Update the long description.
183+ * Add URL in debian/copyright.
184+ * Remove Fabio from Uploaders, with his permission.
185+
186+ [ Julien Cristau ]
187+ * New upstream release.
188+ * debian/control updates:
189+ + add myself to Uploaders, and remove Branden with his permission
190+ + bump Standards-Version to 3.7.3 (no changes)
191+ + drop the XS- prefix from Vcs fields
192+
193+ -- Julien Cristau <jcristau@debian.org> Fri, 07 Mar 2008 13:50:08 +0100
194+
195+x11proto-input (1.4.2-1) unstable; urgency=low
196+
197+ * New upstream release
198+
199+ -- David Nusinow <dnusinow@debian.org> Mon, 30 Apr 2007 20:07:45 -0400
200+
201+x11proto-input (1.4.1-2) unstable; urgency=low
202+
203+ * Add XS-Vcs-* to debian/control.
204+ * Remove Fabio from Uploaders with his permission.
205+ * Drop outdated CVS info from the description.
206+ * Upload to unstable.
207+
208+ -- Julien Cristau <jcristau@debian.org> Fri, 20 Apr 2007 21:51:49 +0200
209+
210+x11proto-input (1.4.1-1) experimental; urgency=low
211+
212+ * New upstream release.
213+
214+ -- Julien Cristau <jcristau@debian.org> Thu, 15 Feb 2007 16:04:00 +0100
215+
216+x11proto-input (1.4-1) experimental; urgency=low
217+
218+ * New upstream version (X11R7.2).
219+ * Use debhelper 5.
220+
221+ -- Drew Parsons <dparsons@debian.org> Sun, 12 Nov 2006 20:44:18 +1100
222+
223+x11proto-input (1.3.2-4) unstable; urgency=low
224+
225+ * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
226+ idempotency fix.
227+ * Run dh_install w/ --list-missing.
228+ * Change debhelper build-dep-indep to a normal build-dep, as dh_clean
229+ is called inside the clean rule.
230+ * Drop duplicate x11-common dep in -dev package.
231+ * Bump standards version to 3.7.2.0.
232+ * Version x11-common pre-dep in -dev package to 1:7.0.0 to match
233+ the rest of Debian.
234+
235+ -- Andres Salomon <dilinger@debian.org> Fri, 21 Jul 2006 02:57:18 -0400
236+
237+x11proto-input (1.3.2-3) unstable; urgency=low
238+
239+ * Upload to unstable
240+
241+ -- David Nusinow <dnusinow@debian.org> Thu, 23 Mar 2006 21:36:06 -0500
242+
243+x11proto-input (1.3.2-2) experimental; urgency=low
244+
245+ * Add epoch to versioned Pre-Depends on x11-common to make upgrades
246+ from monolithic x11-common work (Closes: #351779).
247+
248+ -- Michel Dänzer <daenzer@debian.org> Thu, 9 Feb 2006 16:40:59 +0100
249+
250+x11proto-input (1.3.2-1) experimental; urgency=low
251+
252+ * First upload to Debian
253+
254+ -- David Nusinow <dnusinow@debian.org> Fri, 30 Dec 2005 14:36:03 -0500
255+
256+x11proto-input (1.3-1) breezy; urgency=low
257+
258+ * First x11proto-input release.
259+
260+ -- Daniel Stone <daniel.stone@ubuntu.com> Mon, 16 May 2005 22:10:17 +1000
261+>>>>>>> MERGE-SOURCE
262
263=== modified file 'debian/control'
264--- debian/control 2014-07-13 10:17:18 +0000
265+++ debian/control 2014-07-13 18:19:21 +0000
266@@ -1,3 +1,4 @@
267+<<<<<<< TREE
268 Source: x11proto-input
269 Section: x11
270 Priority: optional
271@@ -30,3 +31,37 @@
272 <URL:http://www.X.org>
273 .
274 This package is built from the X.org inputproto proto module.
275+=======
276+Source: x11proto-input
277+Section: x11
278+Priority: optional
279+Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
280+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
281+Uploaders: Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
282+Build-Depends:
283+ debhelper (>= 8),
284+ dh-autoreconf,
285+ quilt,
286+ xutils-dev (>= 1:7.5+4),
287+ asciidoc,
288+Standards-Version: 3.9.2
289+Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-input
290+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-input.git
291+
292+Package: x11proto-input-dev
293+Architecture: all
294+Depends:
295+ ${shlibs:Depends},
296+ ${misc:Depends},
297+ x11proto-core-dev,
298+Multi-Arch: foreign
299+Description: X11 Input extension wire protocol
300+ This package provides development headers describing the wire protocol
301+ for the Input extension, used to control all manner of options related
302+ to input device handling.
303+ .
304+ More information about X.Org can be found at:
305+ <URL:http://www.X.org>
306+ .
307+ This package is built from the X.org inputproto proto module.
308+>>>>>>> MERGE-SOURCE

Subscribers

People subscribed via source and target branches

to all changes: