Gnome Python Desktop

Merge lp:~stefanor/gnome-python-desktop/merge-2.30.0-3 into lp:~ubuntu-desktop/gnome-python-desktop/ubuntu

  1. merge-2.30.0-3
  2. Merge into ubuntu
Proposed by Stefano Rivera
Status: Merged
Merged at revision: 50
Proposed branch: lp:~stefanor/gnome-python-desktop/merge-2.30.0-3
Merge into: lp:~ubuntu-desktop/gnome-python-desktop/ubuntu
Diff against target: 388 lines (+111/-32)
5 files modified
debian/changelog (+48/-0)
debian/control (+15/-16)
debian/control.in (+15/-16)
debian/patches/01_wnck_enums.patch (+32/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~stefanor/gnome-python-desktop/merge-2.30.0-3
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+40296@code.launchpad.net

Description of the change

  * Merge from Debian unstable (LP: #403078). Remaining changes:
    - debian/control:
      + Remove bug-buddy build-depend
      + Add Vcs-Bzr link
      + python-evince suggest evince
      + Replace libevince-dev (which does not exist in Ubuntu) with our split
        libevview-dev/libevdocument-dev.
      + Add libtool build dependency.
    - debian/rules:
      + Run autotools on build
    - debian/python-evince.examples:
      + Add examples for evince
    - debian/watch:
      + Watch unstable series
    - 90_autotools.patch:
      + Not required, autotools now run on build
    - evince-2.32.patch:
      + To build against current evince.
  * Dropped changes:
    - Use Ubuntu version for gnome-python-desktop conflicts, predates lucid.

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Good work!

review: Approve

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 2010-09-08 01:58:24 +0000
3+++ debian/changelog 2010-11-07 22:37:47 +0000
4@@ -1,3 +1,50 @@
5+gnome-python-desktop (2.30.0-3ubuntu1) natty; urgency=low
6+
7+ * Merge from Debian unstable (LP: #403078). Remaining changes:
8+ - debian/control:
9+ + Remove bug-buddy build-depend
10+ + Add Vcs-Bzr link
11+ + python-evince suggest evince
12+ + Replace libevince-dev (which does not exist in Ubuntu) with our split
13+ libevview-dev/libevdocument-dev.
14+ + Add libtool build dependency.
15+ - debian/rules:
16+ + Run autotools on build
17+ - debian/python-evince.examples:
18+ + Add examples for evince
19+ - debian/watch:
20+ + Watch unstable series
21+ - 90_autotools.patch:
22+ + Not required, autotools now run on build
23+ - evince-2.32.patch:
24+ + To build against current evince.
25+ * Dropped changes:
26+ - Use Ubuntu version for gnome-python-desktop conflicts, predates lucid.
27+
28+ -- Stefano Rivera <stefanor@ubuntu.com> Mon, 08 Nov 2010 00:09:09 +0200
29+
30+gnome-python-desktop (2.30.0-3) unstable; urgency=low
31+
32+ * debian/patches/01_wnck_enums.patch:
33+ - Patch from upstream bugzilla, fix flags in the wnck module that were
34+ declared as enums. Closes: #597414.
35+
36+ -- Emilio Pozuelo Monfort <pochu@debian.org> Mon, 27 Sep 2010 19:42:52 +0200
37+
38+gnome-python-desktop (2.30.0-2) unstable; urgency=low
39+
40+ [ Emilio Pozuelo Monfort ]
41+ * debian/control.in:
42+ - Build depend on libgnome-media-dev on Hurd now that it's built there.
43+ Thus build the python-mediaprofiles package.
44+ - Build depend on bug-buddy on Hurd too since it's built there now.
45+
46+ [ Josselin Mouette ]
47+ * Use Replaces instead of Conflicts to ease APT finding the correct
48+ upgrade path.
49+
50+ -- Josselin Mouette <joss@debian.org> Sat, 18 Sep 2010 13:56:28 +0200
51+
52 gnome-python-desktop (2.30.0-1ubuntu5) maverick; urgency=low
53
54 [ Stefano Rivera ]
55@@ -385,3 +432,4 @@
56 the package it is today.
57
58 -- Daniel Holbach <daniel.holbach@ubuntu.com> Mon, 23 Jan 2006 12:01:08 +0100
59+
60
61=== modified file 'debian/control'
62--- debian/control 2010-08-04 16:59:01 +0000
63+++ debian/control 2010-11-07 22:37:47 +0000
64@@ -29,7 +29,7 @@
65 libwnck-dev (>= 2.19.3),
66 libpanel-applet2-dev (>= 2.13.4),
67 libtotem-plparser-dev (>= 1.4.0),
68- libgnome-media-dev (>= 2.10.0) [!hurd-i386],
69+ libgnome-media-dev (>= 2.10.0),
70 libgconf2-dev (>= 2.10.0),
71 libmetacity-dev (>= 1:2.21.5),
72 libgnome-keyring-dev (>= 0.5.0),
73@@ -54,7 +54,7 @@
74 python-gnomedesktop (>= ${source:Version}),
75 python-gnomekeyring (>= ${source:Version}),
76 python-gtop (>= ${source:Version}),
77- python-mediaprofiles (>= ${source:Version}) [!hurd-any],
78+ python-mediaprofiles (>= ${source:Version}),
79 python-metacity (>= ${source:Version}),
80 python-rsvg (>= ${source:Version}),
81 python-totem-plparser (>= ${source:Version}),
82@@ -62,7 +62,6 @@
83 python-gnome2-dev,
84 python-gtk2-dev
85 Replaces: python-gnome2-dev (<< 2.9.0)
86-Conflicts: python-gnome2-dev (<< 2.9.0)
87 Description: Python bindings for the GNOME desktop environment
88 This archive contains files that allow you to build wrappers for addons
89 that interoperate gnome-python.
90@@ -85,7 +84,7 @@
91 ${python:Depends},
92 python-gtk2
93 Suggests: bug-buddy
94-Conflicts: python-gnome2-desktop (<< 2.26.0-0ubuntu3)
95+Replaces: python-gnome2-desktop (<< 2.24.0-2)
96 Description: Python module for bug-buddy
97 This package contains a module that will allow programs using it to
98 report bugs using the bug-buddy reporting tool, if it is installed.
99@@ -97,7 +96,7 @@
100 ${python:Depends},
101 python-gtk2
102 Suggests: evince
103-Conflicts: python-gnome2-desktop (<< 2.26.0-0ubuntu3)
104+Replaces: python-gnome2-desktop (<< 2.24.0-2)
105 Description: Python bindings for the evince libraries
106 This package contains modules that allows to display documents
107 supported by the evince libraries in Python applications.
108@@ -109,7 +108,7 @@
109 ${python:Depends},
110 python-gtk2
111 Suggests: evolution-data-server
112-Conflicts: python-gnome2-desktop (<< 2.26.0-0ubuntu3)
113+Replaces: python-gnome2-desktop (<< 2.24.0-2)
114 Description: Python bindings for the evolution libraries
115 This package contains modules that allows to talk with the evolution
116 data server to manipulate the address book and calendar in Python.
117@@ -122,7 +121,7 @@
118 python-pyorbit,
119 python-gtk2
120 Suggests: gnome-panel
121-Conflicts: python-gnome2-desktop (<< 2.26.0-0ubuntu3)
122+Replaces: python-gnome2-desktop (<< 2.24.0-2)
123 Description: Python bindings for the GNOME panel applet library
124 This package contains a module that allows to write applets for the
125 GNOME panel in Python.
126@@ -133,7 +132,7 @@
127 ${shlibs:Depends},
128 ${python:Depends},
129 python-gtk2
130-Conflicts: python-gnome2-desktop (<< 2.26.0-0ubuntu3)
131+Replaces: python-gnome2-desktop (<< 2.24.0-2)
132 Description: Python bindings for the GNOME desktop library
133 This package contains a module that allows to write applications using
134 the GNOME desktop library in Python.
135@@ -145,7 +144,7 @@
136 ${python:Depends},
137 python-gtk2
138 Suggests: gnome-keyring
139-Conflicts: python-gnome2-desktop (<< 2.26.0-0ubuntu3)
140+Replaces: python-gnome2-desktop (<< 2.24.0-2)
141 Description: Python bindings for the GNOME keyring library
142 This package contains a module that allows to access and manipulate
143 the GNOME keyring framework in Python.
144@@ -156,18 +155,18 @@
145 ${shlibs:Depends},
146 ${python:Depends},
147 python-gtk2
148-Conflicts: python-gnome2-desktop (<< 2.26.0-0ubuntu3)
149+Replaces: python-gnome2-desktop (<< 2.24.0-2)
150 Description: Python bindings for the Gtop library
151 This package contains a module that allows to use the Gtop system
152 information library in Python applications.
153
154 Package: python-mediaprofiles
155-Architecture: linux-any kfreebsd-any netbsd-any
156+Architecture: any
157 Depends: ${misc:Depends},
158 ${shlibs:Depends},
159 ${python:Depends},
160 python-gtk2
161-Conflicts: python-gnome2-desktop (<< 2.26.0-0ubuntu3)
162+Replaces: python-gnome2-desktop (<< 2.24.0-2)
163 Description: Python bindings for the GNOME media profiles library
164 This package contains a module that allows to use the GNOME media
165 profiles widgets in Python applications.
166@@ -179,7 +178,7 @@
167 ${python:Depends},
168 python-gtk2
169 Suggests: metacity
170-Conflicts: python-gnome2-desktop (<< 2.26.0-0ubuntu3)
171+Replaces: python-gnome2-desktop (<< 2.24.0-2)
172 Description: Python bindings for metacity
173 This package contains a module that allows to manipulate the internals
174 of the Metacity window manager in Python applications.
175@@ -191,7 +190,7 @@
176 ${python:Depends},
177 librsvg2-common,
178 python-gtk2
179-Conflicts: python-gnome2-desktop (<< 2.26.0-0ubuntu3)
180+Replaces: python-gnome2-desktop (<< 2.24.0-2)
181 Description: Python bindings for the RSVG library
182 This package contains a module that allows to use librsvg to read and
183 write SVG files from Python applications.
184@@ -202,7 +201,7 @@
185 ${shlibs:Depends},
186 ${python:Depends},
187 python-gtk2
188-Conflicts: python-gnome2-desktop (<< 2.26.0-0ubuntu3)
189+Replaces: python-gnome2-desktop (<< 2.24.0-2)
190 Description: Python bindings for the Totem playlist parser library
191 This package contains a module that allows to use the Totem playlist
192 parser library from Python applications.
193@@ -213,7 +212,7 @@
194 ${shlibs:Depends},
195 ${python:Depends},
196 python-gtk2
197-Conflicts: python-gnome2-desktop (<< 2.26.0-0ubuntu3)
198+Replaces: python-gnome2-desktop (<< 2.24.0-2)
199 Description: Python bindings for the WNCK library
200 This package contains a module that allows to communicate with the
201 Window Manager using the EWMH specification from Python applications.
202
203=== modified file 'debian/control.in'
204--- debian/control.in 2010-08-04 16:59:01 +0000
205+++ debian/control.in 2010-11-07 22:37:47 +0000
206@@ -24,7 +24,7 @@
207 libwnck-dev (>= 2.19.3),
208 libpanel-applet2-dev (>= 2.13.4),
209 libtotem-plparser-dev (>= 1.4.0),
210- libgnome-media-dev (>= 2.10.0) [!hurd-i386],
211+ libgnome-media-dev (>= 2.10.0),
212 libgconf2-dev (>= 2.10.0),
213 libmetacity-dev (>= 1:2.21.5),
214 libgnome-keyring-dev (>= 0.5.0),
215@@ -49,7 +49,7 @@
216 python-gnomedesktop (>= ${source:Version}),
217 python-gnomekeyring (>= ${source:Version}),
218 python-gtop (>= ${source:Version}),
219- python-mediaprofiles (>= ${source:Version}) [!hurd-any],
220+ python-mediaprofiles (>= ${source:Version}),
221 python-metacity (>= ${source:Version}),
222 python-rsvg (>= ${source:Version}),
223 python-totem-plparser (>= ${source:Version}),
224@@ -57,7 +57,6 @@
225 python-gnome2-dev,
226 python-gtk2-dev
227 Replaces: python-gnome2-dev (<< 2.9.0)
228-Conflicts: python-gnome2-dev (<< 2.9.0)
229 Description: Python bindings for the GNOME desktop environment
230 This archive contains files that allow you to build wrappers for addons
231 that interoperate gnome-python.
232@@ -80,7 +79,7 @@
233 ${python:Depends},
234 python-gtk2
235 Suggests: bug-buddy
236-Conflicts: python-gnome2-desktop (<< 2.26.0-0ubuntu3)
237+Replaces: python-gnome2-desktop (<< 2.24.0-2)
238 Description: Python module for bug-buddy
239 This package contains a module that will allow programs using it to
240 report bugs using the bug-buddy reporting tool, if it is installed.
241@@ -92,7 +91,7 @@
242 ${python:Depends},
243 python-gtk2
244 Suggests: evince
245-Conflicts: python-gnome2-desktop (<< 2.26.0-0ubuntu3)
246+Replaces: python-gnome2-desktop (<< 2.24.0-2)
247 Description: Python bindings for the evince libraries
248 This package contains modules that allows to display documents
249 supported by the evince libraries in Python applications.
250@@ -104,7 +103,7 @@
251 ${python:Depends},
252 python-gtk2
253 Suggests: evolution-data-server
254-Conflicts: python-gnome2-desktop (<< 2.26.0-0ubuntu3)
255+Replaces: python-gnome2-desktop (<< 2.24.0-2)
256 Description: Python bindings for the evolution libraries
257 This package contains modules that allows to talk with the evolution
258 data server to manipulate the address book and calendar in Python.
259@@ -117,7 +116,7 @@
260 python-pyorbit,
261 python-gtk2
262 Suggests: gnome-panel
263-Conflicts: python-gnome2-desktop (<< 2.26.0-0ubuntu3)
264+Replaces: python-gnome2-desktop (<< 2.24.0-2)
265 Description: Python bindings for the GNOME panel applet library
266 This package contains a module that allows to write applets for the
267 GNOME panel in Python.
268@@ -128,7 +127,7 @@
269 ${shlibs:Depends},
270 ${python:Depends},
271 python-gtk2
272-Conflicts: python-gnome2-desktop (<< 2.26.0-0ubuntu3)
273+Replaces: python-gnome2-desktop (<< 2.24.0-2)
274 Description: Python bindings for the GNOME desktop library
275 This package contains a module that allows to write applications using
276 the GNOME desktop library in Python.
277@@ -140,7 +139,7 @@
278 ${python:Depends},
279 python-gtk2
280 Suggests: gnome-keyring
281-Conflicts: python-gnome2-desktop (<< 2.26.0-0ubuntu3)
282+Replaces: python-gnome2-desktop (<< 2.24.0-2)
283 Description: Python bindings for the GNOME keyring library
284 This package contains a module that allows to access and manipulate
285 the GNOME keyring framework in Python.
286@@ -151,18 +150,18 @@
287 ${shlibs:Depends},
288 ${python:Depends},
289 python-gtk2
290-Conflicts: python-gnome2-desktop (<< 2.26.0-0ubuntu3)
291+Replaces: python-gnome2-desktop (<< 2.24.0-2)
292 Description: Python bindings for the Gtop library
293 This package contains a module that allows to use the Gtop system
294 information library in Python applications.
295
296 Package: python-mediaprofiles
297-Architecture: linux-any kfreebsd-any netbsd-any
298+Architecture: any
299 Depends: ${misc:Depends},
300 ${shlibs:Depends},
301 ${python:Depends},
302 python-gtk2
303-Conflicts: python-gnome2-desktop (<< 2.26.0-0ubuntu3)
304+Replaces: python-gnome2-desktop (<< 2.24.0-2)
305 Description: Python bindings for the GNOME media profiles library
306 This package contains a module that allows to use the GNOME media
307 profiles widgets in Python applications.
308@@ -174,7 +173,7 @@
309 ${python:Depends},
310 python-gtk2
311 Suggests: metacity
312-Conflicts: python-gnome2-desktop (<< 2.26.0-0ubuntu3)
313+Replaces: python-gnome2-desktop (<< 2.24.0-2)
314 Description: Python bindings for metacity
315 This package contains a module that allows to manipulate the internals
316 of the Metacity window manager in Python applications.
317@@ -186,7 +185,7 @@
318 ${python:Depends},
319 librsvg2-common,
320 python-gtk2
321-Conflicts: python-gnome2-desktop (<< 2.26.0-0ubuntu3)
322+Replaces: python-gnome2-desktop (<< 2.24.0-2)
323 Description: Python bindings for the RSVG library
324 This package contains a module that allows to use librsvg to read and
325 write SVG files from Python applications.
326@@ -197,7 +196,7 @@
327 ${shlibs:Depends},
328 ${python:Depends},
329 python-gtk2
330-Conflicts: python-gnome2-desktop (<< 2.26.0-0ubuntu3)
331+Replaces: python-gnome2-desktop (<< 2.24.0-2)
332 Description: Python bindings for the Totem playlist parser library
333 This package contains a module that allows to use the Totem playlist
334 parser library from Python applications.
335@@ -208,7 +207,7 @@
336 ${shlibs:Depends},
337 ${python:Depends},
338 python-gtk2
339-Conflicts: python-gnome2-desktop (<< 2.26.0-0ubuntu3)
340+Replaces: python-gnome2-desktop (<< 2.24.0-2)
341 Description: Python bindings for the WNCK library
342 This package contains a module that allows to communicate with the
343 Window Manager using the EWMH specification from Python applications.
344
345=== added file 'debian/patches/01_wnck_enums.patch'
346--- debian/patches/01_wnck_enums.patch 1970-01-01 00:00:00 +0000
347+++ debian/patches/01_wnck_enums.patch 2010-11-07 22:37:47 +0000
348@@ -0,0 +1,32 @@
349+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=630063
350+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597414
351+
352+--- a/wnck/wnck.defs
353++++ b/wnck/wnck.defs
354+@@ -100,7 +100,7 @@
355+ )
356+ )
357+
358+-(define-enum WindowState
359++(define-flags WindowState
360+ (in-module "Wnck")
361+ (c-name "WnckWindowState")
362+ (gtype-id "WNCK_TYPE_WINDOW_STATE")
363+@@ -121,7 +121,7 @@
364+ )
365+ )
366+
367+-(define-enum WindowActions
368++(define-flags WindowActions
369+ (in-module "Wnck")
370+ (c-name "WnckWindowActions")
371+ (gtype-id "WNCK_TYPE_WINDOW_ACTIONS")
372+@@ -184,7 +184,7 @@
373+ )
374+ )
375+
376+-(define-enum WindowMoveResizeMask
377++(define-flags WindowMoveResizeMask
378+ (in-module "Wnck")
379+ (c-name "WnckWindowMoveResizeMask")
380+ (gtype-id "WNCK_TYPE_WINDOW_MOVE_RESIZE_MASK")
381
382=== modified file 'debian/patches/series'
383--- debian/patches/series 2010-09-07 06:24:27 +0000
384+++ debian/patches/series 2010-11-07 22:37:47 +0000
385@@ -1,2 +1,3 @@
386+01_wnck_enums.patch
387 02_maintainer_mode.patch
388 evince-2.32.patch

Subscribers

People subscribed via source and target branches

to all changes: