Gnome Virtual Terminal Emulator

Merge lp:~ubuntu-desktop/vte/ubuntugtk3 into lp:~ubuntu-desktop/vte/ubuntu

  1. ubuntugtk3
  2. Merge into ubuntu
Proposed by Michael Terry
Status: Merged
Merge reported by: Michael Terry
Merged at revision: not available
Proposed branch: lp:~ubuntu-desktop/vte/ubuntugtk3
Merge into: lp:~ubuntu-desktop/vte/ubuntu
Diff against target: 597 lines (+353/-22)
17 files modified
debian/changelog (+38/-0)
debian/control (+55/-6)
debian/control.in (+55/-6)
debian/gir1.0-vte-0.0.install (+1/-1)
debian/gir1.0-vte-2.90.install (+1/-0)
debian/libvte-2.90-9.install (+2/-0)
debian/libvte-2.90-9.lintian-overrides (+1/-0)
debian/libvte-2.90-9.symbols (+135/-0)
debian/libvte-2.90-dev.install (+5/-0)
debian/libvte-common.install (+1/-1)
debian/libvte-dev.install (+4/-3)
debian/libvte9-udeb.install (+1/-1)
debian/libvte9.install (+0/-1)
debian/patches/fix_gtk3_api_changes.patch (+16/-0)
debian/patches/series (+1/-0)
debian/rules (+36/-2)
debian/watch (+1/-1)
To merge this branch: bzr merge lp:~ubuntu-desktop/vte/ubuntugtk3
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Review via email: mp+43642@code.launchpad.net
To post a comment you must log in.

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-12-09 03:20:43 +0000
3+++ debian/changelog 2010-12-14 13:50:09 +0000
4@@ -1,3 +1,41 @@
5+vte (1:0.27.2-0ubuntu1) natty; urgency=low
6+
7+ * fix_gtk3_api_changes.patch:
8+ - Fix GTK3 API breakage
9+ * debian/control:
10+ - Drop libvte-bin package, after consulting with Debian
11+ * debian/rules:
12+ - Use separate libexecdir to put binaries in separate folder
13+ for the gtk3 version of the library
14+
15+ -- Michael Terry <mterry@ubuntu.com> Mon, 13 Dec 2010 17:00:11 -0500
16+
17+vte (1:0.27.2-0ubuntu1~build2) natty; urgency=low
18+
19+ * debian/rules:
20+ - Fix when gtk3 version is installed
21+
22+ -- Michael Terry <mterry@ubuntu.com> Tue, 23 Nov 2010 15:31:24 -0500
23+
24+vte (1:0.27.2-0ubuntu1~build1) natty; urgency=low
25+
26+ * New upstream version
27+ * debian/watch:
28+ - Fix regular expression to work
29+ * debian/rules:
30+ - Fix python install line to specify version of python, fixes FTBFS
31+ * Adds support for gtk3, adding:
32+ - libvte-2.90-9
33+ - gir1.0-vte-2.90
34+ - libvte-2.90-dev
35+ - libvte-bin
36+ * Renamed gir1.0-vte-1.0 to gir1.0-vte-0.0, since that is the version of
37+ the gir used. There are no rdepends.
38+ * Moved the helper program from the library package to a new libvte-bin
39+ package
40+
41+ -- Michael Terry <mterry@ubuntu.com> Tue, 23 Nov 2010 10:13:27 -0500
42+
43 vte (1:0.26.2-0ubuntu1) natty; urgency=low
44
45 * New upstream release
46
47=== modified file 'debian/control'
48--- debian/control 2010-12-09 03:20:43 +0000
49+++ debian/control 2010-12-14 13:50:09 +0000
50@@ -17,9 +17,12 @@
51 libglib2.0-dev (>= 2.22.0),
52 libcairo2-dev,
53 libx11-dev,
54- libgtk2.0-dev (>= 2.19.7-2),
55+ libgtk2.0-dev (>= 2.20.0),
56+ libgtk3.0-dev (>= 2.91.0),
57 gobject-introspection (>= 0.6.7),
58 libgirepository1.0-dev (>= 0.6.7),
59+ gir1.0-gtk-2.0,
60+ gir1.0-gtk-3.0,
61 gettext,
62 python-gtk2-dev,
63 python-all-dev (>= 2.3.5-11),
64@@ -31,7 +34,7 @@
65 libpango1.0-dev (>= 1.22.0),
66 libgladeui-1-dev,
67 intltool (>= 0.35)
68-Build-Depends-Indep: libglib2.0-doc, libgtk2.0-doc, libatk1.0-doc
69+Build-Depends-Indep: libglib2.0-doc, libgtk2.0-doc, libgtk3.0-doc, libatk1.0-doc
70 Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/vte/ubuntu
71
72 Package: libvte9
73@@ -64,7 +67,7 @@
74 This package contains the minimal runtime library needed by the Debian
75 installer.
76
77-Package: gir1.0-vte-1.0
78+Package: gir1.0-vte-0.0
79 Section: libs
80 Architecture: any
81 Depends: ${gir:Depends},
82@@ -90,7 +93,8 @@
83 libx11-dev,
84 libgtk2.0-dev (>= 2.14.0),
85 libpango1.0-dev (>= 1.22.0),
86- libglib2.0-dev (>= 2.22.0)
87+ libglib2.0-dev (>= 2.22.0),
88+ libvte-common
89 Provides: python-vte-dev
90 Description: Terminal emulator widget for GTK+ 2.0 - development files
91 The VTE library inserts terminal capability strings into a trie, and then
92@@ -101,12 +105,57 @@
93 This package contains development files for the VTE library and its
94 Python bindings.
95
96+Package: libvte-2.90-9
97+Architecture: any
98+Section: libs
99+Depends: ${misc:Depends},
100+ ${shlibs:Depends},
101+ libvte-common
102+Description: Terminal emulator widget for GTK+ 3.0 - runtime files
103+ The VTE library inserts terminal capability strings into a trie, and then
104+ uses it to determine if data received from a pseudo-terminal is a control
105+ sequence or just random data. The sample program "interpret" illustrates
106+ more or less what the widget sees after it filters incoming data.
107+
108+Package: gir1.0-vte-2.90
109+Section: libs
110+Architecture: any
111+Depends: ${gir:Depends},
112+ ${misc:Depends},
113+ libvte-common
114+Description: GObject introspection data for the VTE library
115+ This package contains introspection data for VTE, a terminal emulator
116+ widget for GTK+.
117+ .
118+ It can be used by packages using the GIRepository format to generate
119+ dynamic bindings.
120+
121+Package: libvte-2.90-dev
122+Architecture: any
123+Section: libdevel
124+Depends: ${misc:Depends},
125+ libvte-2.90-9 (= ${binary:Version}),
126+ libcairo2-dev,
127+ libx11-dev,
128+ libgtk3.0-dev (>= 2.91.0),
129+ libpango1.0-dev (>= 1.22.0),
130+ libglib2.0-dev (>= 2.22.0),
131+ libvte-common
132+Description: Terminal emulator widget for GTK+ 3.0 - development files
133+ The VTE library inserts terminal capability strings into a trie, and then
134+ uses it to determine if data received from a pseudo-terminal is a control
135+ sequence or just random data. The sample program "interpret" illustrates
136+ more or less what the widget sees after it filters incoming data.
137+ .
138+ This package contains development files for the VTE library and its
139+ Python bindings.
140+
141 Package: libvte-common
142 Architecture: all
143 Section: libs
144 Depends: ${misc:Depends}
145 Replaces: libvte2 (<= 0.5.1-2)
146-Description: Terminal emulator widget for GTK+ 2.0 - common files
147+Description: Terminal emulator widget for GTK+ - common files
148 The VTE library inserts terminal capability strings into a trie, and then
149 uses it to determine if data received from a pseudo-terminal is a control
150 sequence or just random data. The sample program "interpret" illustrates
151@@ -139,7 +188,7 @@
152 Architecture: all
153 Section: doc
154 Depends: ${misc:Depends}
155-Description: Terminal emulator widget for GTK+ 2.0 - documentation
156+Description: Terminal emulator widget for GTK+ - documentation
157 The VTE library inserts terminal capability strings into a trie, and then
158 uses it to determine if data received from a pseudo-terminal is a control
159 sequence or just random data. The sample program "interpret" illustrates
160
161=== modified file 'debian/control.in'
162--- debian/control.in 2010-12-09 03:20:43 +0000
163+++ debian/control.in 2010-12-14 13:50:09 +0000
164@@ -12,9 +12,12 @@
165 libglib2.0-dev (>= 2.22.0),
166 libcairo2-dev,
167 libx11-dev,
168- libgtk2.0-dev (>= 2.19.7-2),
169+ libgtk2.0-dev (>= 2.20.0),
170+ libgtk3.0-dev (>= 2.91.0),
171 gobject-introspection (>= 0.6.7),
172 libgirepository1.0-dev (>= 0.6.7),
173+ gir1.0-gtk-2.0,
174+ gir1.0-gtk-3.0,
175 gettext,
176 python-gtk2-dev,
177 python-all-dev (>= 2.3.5-11),
178@@ -26,7 +29,7 @@
179 libpango1.0-dev (>= 1.22.0),
180 libgladeui-1-dev,
181 intltool (>= 0.35)
182-Build-Depends-Indep: libglib2.0-doc, libgtk2.0-doc, libatk1.0-doc
183+Build-Depends-Indep: libglib2.0-doc, libgtk2.0-doc, libgtk3.0-doc, libatk1.0-doc
184 Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/vte/ubuntu
185
186 Package: libvte9
187@@ -59,7 +62,7 @@
188 This package contains the minimal runtime library needed by the Debian
189 installer.
190
191-Package: gir1.0-vte-1.0
192+Package: gir1.0-vte-0.0
193 Section: libs
194 Architecture: any
195 Depends: ${gir:Depends},
196@@ -85,7 +88,8 @@
197 libx11-dev,
198 libgtk2.0-dev (>= 2.14.0),
199 libpango1.0-dev (>= 1.22.0),
200- libglib2.0-dev (>= 2.22.0)
201+ libglib2.0-dev (>= 2.22.0),
202+ libvte-common
203 Provides: python-vte-dev
204 Description: Terminal emulator widget for GTK+ 2.0 - development files
205 The VTE library inserts terminal capability strings into a trie, and then
206@@ -96,12 +100,57 @@
207 This package contains development files for the VTE library and its
208 Python bindings.
209
210+Package: libvte-2.90-9
211+Architecture: any
212+Section: libs
213+Depends: ${misc:Depends},
214+ ${shlibs:Depends},
215+ libvte-common
216+Description: Terminal emulator widget for GTK+ 3.0 - runtime files
217+ The VTE library inserts terminal capability strings into a trie, and then
218+ uses it to determine if data received from a pseudo-terminal is a control
219+ sequence or just random data. The sample program "interpret" illustrates
220+ more or less what the widget sees after it filters incoming data.
221+
222+Package: gir1.0-vte-2.90
223+Section: libs
224+Architecture: any
225+Depends: ${gir:Depends},
226+ ${misc:Depends},
227+ libvte-common
228+Description: GObject introspection data for the VTE library
229+ This package contains introspection data for VTE, a terminal emulator
230+ widget for GTK+.
231+ .
232+ It can be used by packages using the GIRepository format to generate
233+ dynamic bindings.
234+
235+Package: libvte-2.90-dev
236+Architecture: any
237+Section: libdevel
238+Depends: ${misc:Depends},
239+ libvte-2.90-9 (= ${binary:Version}),
240+ libcairo2-dev,
241+ libx11-dev,
242+ libgtk3.0-dev (>= 2.91.0),
243+ libpango1.0-dev (>= 1.22.0),
244+ libglib2.0-dev (>= 2.22.0),
245+ libvte-common
246+Description: Terminal emulator widget for GTK+ 3.0 - development files
247+ The VTE library inserts terminal capability strings into a trie, and then
248+ uses it to determine if data received from a pseudo-terminal is a control
249+ sequence or just random data. The sample program "interpret" illustrates
250+ more or less what the widget sees after it filters incoming data.
251+ .
252+ This package contains development files for the VTE library and its
253+ Python bindings.
254+
255 Package: libvte-common
256 Architecture: all
257 Section: libs
258 Depends: ${misc:Depends}
259 Replaces: libvte2 (<= 0.5.1-2)
260-Description: Terminal emulator widget for GTK+ 2.0 - common files
261+Description: Terminal emulator widget for GTK+ - common files
262 The VTE library inserts terminal capability strings into a trie, and then
263 uses it to determine if data received from a pseudo-terminal is a control
264 sequence or just random data. The sample program "interpret" illustrates
265@@ -134,7 +183,7 @@
266 Architecture: all
267 Section: doc
268 Depends: ${misc:Depends}
269-Description: Terminal emulator widget for GTK+ 2.0 - documentation
270+Description: Terminal emulator widget for GTK+ - documentation
271 The VTE library inserts terminal capability strings into a trie, and then
272 uses it to determine if data received from a pseudo-terminal is a control
273 sequence or just random data. The sample program "interpret" illustrates
274
275=== renamed file 'debian/gir1.0-vte-1.0.install' => 'debian/gir1.0-vte-0.0.install'
276--- debian/gir1.0-vte-1.0.install 2010-08-31 03:04:57 +0000
277+++ debian/gir1.0-vte-0.0.install 2010-12-14 13:50:09 +0000
278@@ -1,1 +1,1 @@
279-usr/lib/girepository-1.0
280+usr/lib/girepository-1.0/Vte-0.0.typelib
281
282=== added file 'debian/gir1.0-vte-2.90.install'
283--- debian/gir1.0-vte-2.90.install 1970-01-01 00:00:00 +0000
284+++ debian/gir1.0-vte-2.90.install 2010-12-14 13:50:09 +0000
285@@ -0,0 +1,1 @@
286+usr/lib/girepository-1.0/Vte-2.90.typelib
287
288=== added file 'debian/libvte-2.90-9.install'
289--- debian/libvte-2.90-9.install 1970-01-01 00:00:00 +0000
290+++ debian/libvte-2.90-9.install 2010-12-14 13:50:09 +0000
291@@ -0,0 +1,2 @@
292+usr/lib/libvte2_90.so.*
293+usr/lib/libvte-2.90-9/*
294
295=== added file 'debian/libvte-2.90-9.lintian-overrides'
296--- debian/libvte-2.90-9.lintian-overrides 1970-01-01 00:00:00 +0000
297+++ debian/libvte-2.90-9.lintian-overrides 2010-12-14 13:50:09 +0000
298@@ -0,0 +1,1 @@
299+libvte-2.90-9 binary: package-name-doesnt-match-sonames libvte2-90-9
300
301=== added file 'debian/libvte-2.90-9.symbols'
302--- debian/libvte-2.90-9.symbols 1970-01-01 00:00:00 +0000
303+++ debian/libvte-2.90-9.symbols 2010-12-14 13:50:09 +0000
304@@ -0,0 +1,135 @@
305+libvte2_90.so.9 libvte-2.90-9 #MINVER#
306+ _vte_debug_flags@Base 1:0.27.2
307+ _vte_debug_init@Base 1:0.27.2
308+ _vte_pty_close@Base 1:0.27.2
309+ _vte_pty_get_size@Base 1:0.27.2
310+ _vte_pty_open@Base 1:0.27.2
311+ _vte_pty_set_size@Base 1:0.27.2
312+ _vte_pty_set_utf8@Base 1:0.27.2
313+ vte_pty_child_setup@Base 1:0.27.2
314+ vte_pty_close@Base 1:0.27.2
315+ vte_pty_error_get_type@Base 1:0.27.2
316+ vte_pty_error_quark@Base 1:0.27.2
317+ vte_pty_flags_get_type@Base 1:0.27.2
318+ vte_pty_get_fd@Base 1:0.27.2
319+ vte_pty_get_size@Base 1:0.27.2
320+ vte_pty_get_type@Base 1:0.27.2
321+ vte_pty_new@Base 1:0.27.2
322+ vte_pty_new_foreign@Base 1:0.27.2
323+ vte_pty_set_size@Base 1:0.27.2
324+ vte_pty_set_term@Base 1:0.27.2
325+ vte_pty_set_utf8@Base 1:0.27.2
326+ vte_reaper_add_child@Base 1:0.27.2
327+ vte_reaper_get@Base 1:0.27.2
328+ vte_reaper_get_type@Base 1:0.27.2
329+ vte_terminal_accessible_factory_get_type@Base 1:0.27.2
330+ vte_terminal_accessible_factory_new@Base 1:0.27.2
331+ vte_terminal_accessible_get_type@Base 1:0.27.2
332+ vte_terminal_accessible_new@Base 1:0.27.2
333+ vte_terminal_anti_alias_get_type@Base 1:0.27.2
334+ vte_terminal_copy_clipboard@Base 1:0.27.2
335+ vte_terminal_copy_primary@Base 1:0.27.2
336+ vte_terminal_cursor_blink_mode_get_type@Base 1:0.27.2
337+ vte_terminal_cursor_shape_get_type@Base 1:0.27.2
338+ vte_terminal_erase_binding_get_type@Base 1:0.27.2
339+ vte_terminal_feed@Base 1:0.27.2
340+ vte_terminal_feed_child@Base 1:0.27.2
341+ vte_terminal_feed_child_binary@Base 1:0.27.2
342+ vte_terminal_fork_command@Base 1:0.27.2
343+ vte_terminal_fork_command_full@Base 1:0.27.2
344+ vte_terminal_forkpty@Base 1:0.27.2
345+ vte_terminal_get_adjustment@Base 1:0.27.2
346+ vte_terminal_get_allow_bold@Base 1:0.27.2
347+ vte_terminal_get_audible_bell@Base 1:0.27.2
348+ vte_terminal_get_char_ascent@Base 1:0.27.2
349+ vte_terminal_get_char_descent@Base 1:0.27.2
350+ vte_terminal_get_char_height@Base 1:0.27.2
351+ vte_terminal_get_char_width@Base 1:0.27.2
352+ vte_terminal_get_child_exit_status@Base 1:0.27.2
353+ vte_terminal_get_column_count@Base 1:0.27.2
354+ vte_terminal_get_cursor_blink_mode@Base 1:0.27.2
355+ vte_terminal_get_cursor_position@Base 1:0.27.2
356+ vte_terminal_get_cursor_shape@Base 1:0.27.2
357+ vte_terminal_get_default_emulation@Base 1:0.27.2
358+ vte_terminal_get_emulation@Base 1:0.27.2
359+ vte_terminal_get_encoding@Base 1:0.27.2
360+ vte_terminal_get_font@Base 1:0.27.2
361+ vte_terminal_get_has_selection@Base 1:0.27.2
362+ vte_terminal_get_icon_title@Base 1:0.27.2
363+ vte_terminal_get_mouse_autohide@Base 1:0.27.2
364+ vte_terminal_get_padding@Base 1:0.27.2
365+ vte_terminal_get_pty@Base 1:0.27.2
366+ vte_terminal_get_pty_object@Base 1:0.27.2
367+ vte_terminal_get_row_count@Base 1:0.27.2
368+ vte_terminal_get_status_line@Base 1:0.27.2
369+ vte_terminal_get_text@Base 1:0.27.2
370+ vte_terminal_get_text_include_trailing_spaces@Base 1:0.27.2
371+ vte_terminal_get_text_range@Base 1:0.27.2
372+ vte_terminal_get_type@Base 1:0.27.2
373+ vte_terminal_get_using_xft@Base 1:0.27.2
374+ vte_terminal_get_visible_bell@Base 1:0.27.2
375+ vte_terminal_get_window_title@Base 1:0.27.2
376+ vte_terminal_im_append_menuitems@Base 1:0.27.2
377+ vte_terminal_is_word_char@Base 1:0.27.2
378+ vte_terminal_match_add@Base 1:0.27.2
379+ vte_terminal_match_add_gregex@Base 1:0.27.2
380+ vte_terminal_match_check@Base 1:0.27.2
381+ vte_terminal_match_clear_all@Base 1:0.27.2
382+ vte_terminal_match_remove@Base 1:0.27.2
383+ vte_terminal_match_set_cursor@Base 1:0.27.2
384+ vte_terminal_match_set_cursor_name@Base 1:0.27.2
385+ vte_terminal_match_set_cursor_type@Base 1:0.27.2
386+ vte_terminal_new@Base 1:0.27.2
387+ vte_terminal_paste_clipboard@Base 1:0.27.2
388+ vte_terminal_paste_primary@Base 1:0.27.2
389+ vte_terminal_pty_new@Base 1:0.27.2
390+ vte_terminal_reset@Base 1:0.27.2
391+ vte_terminal_search_find_next@Base 1:0.27.2
392+ vte_terminal_search_find_previous@Base 1:0.27.2
393+ vte_terminal_search_get_gregex@Base 1:0.27.2
394+ vte_terminal_search_get_wrap_around@Base 1:0.27.2
395+ vte_terminal_search_set_gregex@Base 1:0.27.2
396+ vte_terminal_search_set_wrap_around@Base 1:0.27.2
397+ vte_terminal_select_all@Base 1:0.27.2
398+ vte_terminal_select_none@Base 1:0.27.2
399+ vte_terminal_set_allow_bold@Base 1:0.27.2
400+ vte_terminal_set_alternate_screen_scroll@Base 1:0.27.2
401+ vte_terminal_set_audible_bell@Base 1:0.27.2
402+ vte_terminal_set_background_image@Base 1:0.27.2
403+ vte_terminal_set_background_image_file@Base 1:0.27.2
404+ vte_terminal_set_background_saturation@Base 1:0.27.2
405+ vte_terminal_set_background_tint_color@Base 1:0.27.2
406+ vte_terminal_set_background_transparent@Base 1:0.27.2
407+ vte_terminal_set_backspace_binding@Base 1:0.27.2
408+ vte_terminal_set_color_background@Base 1:0.27.2
409+ vte_terminal_set_color_bold@Base 1:0.27.2
410+ vte_terminal_set_color_cursor@Base 1:0.27.2
411+ vte_terminal_set_color_dim@Base 1:0.27.2
412+ vte_terminal_set_color_foreground@Base 1:0.27.2
413+ vte_terminal_set_color_highlight@Base 1:0.27.2
414+ vte_terminal_set_colors@Base 1:0.27.2
415+ vte_terminal_set_cursor_blink_mode@Base 1:0.27.2
416+ vte_terminal_set_cursor_blinks@Base 1:0.27.2
417+ vte_terminal_set_cursor_shape@Base 1:0.27.2
418+ vte_terminal_set_default_colors@Base 1:0.27.2
419+ vte_terminal_set_delete_binding@Base 1:0.27.2
420+ vte_terminal_set_emulation@Base 1:0.27.2
421+ vte_terminal_set_encoding@Base 1:0.27.2
422+ vte_terminal_set_font@Base 1:0.27.2
423+ vte_terminal_set_font_from_string@Base 1:0.27.2
424+ vte_terminal_set_font_from_string_full@Base 1:0.27.2
425+ vte_terminal_set_font_full@Base 1:0.27.2
426+ vte_terminal_set_mouse_autohide@Base 1:0.27.2
427+ vte_terminal_set_opacity@Base 1:0.27.2
428+ vte_terminal_set_pty@Base 1:0.27.2
429+ vte_terminal_set_pty_object@Base 1:0.27.2
430+ vte_terminal_set_scroll_background@Base 1:0.27.2
431+ vte_terminal_set_scroll_on_keystroke@Base 1:0.27.2
432+ vte_terminal_set_scroll_on_output@Base 1:0.27.2
433+ vte_terminal_set_scrollback_lines@Base 1:0.27.2
434+ vte_terminal_set_size@Base 1:0.27.2
435+ vte_terminal_set_visible_bell@Base 1:0.27.2
436+ vte_terminal_set_word_chars@Base 1:0.27.2
437+ vte_terminal_watch_child@Base 1:0.27.2
438+ vte_terminal_write_contents@Base 1:0.27.2
439+ vte_terminal_write_flags_get_type@Base 1:0.27.2
440
441=== added file 'debian/libvte-2.90-dev.install'
442--- debian/libvte-2.90-dev.install 1970-01-01 00:00:00 +0000
443+++ debian/libvte-2.90-dev.install 2010-12-14 13:50:09 +0000
444@@ -0,0 +1,5 @@
445+usr/include/vte-2.90
446+usr/lib/pkgconfig/vte-2.90.pc
447+usr/lib/libvte2_90.a
448+usr/lib/libvte2_90.so
449+usr/share/gir-1.0/Vte-2.90.gir
450
451=== modified file 'debian/libvte-common.install'
452--- debian/libvte-common.install 2009-05-08 08:05:57 +0000
453+++ debian/libvte-common.install 2010-12-14 13:50:09 +0000
454@@ -1,3 +1,3 @@
455 usr/share/locale
456-usr/share/vte/termcap
457+usr/share/vte/termcap-*
458 usr/share/glade3
459
460=== modified file 'debian/libvte-dev.install'
461--- debian/libvte-dev.install 2010-08-31 03:04:57 +0000
462+++ debian/libvte-dev.install 2010-12-14 13:50:09 +0000
463@@ -1,6 +1,7 @@
464-usr/include
465-usr/lib/pkgconfig
466+usr/include/vte-0.0
467+usr/lib/pkgconfig/vte.pc
468+usr/lib/pkgconfig/pyvte.pc
469 usr/lib/libvte.a
470 usr/lib/libvte.so
471 usr/share/pygtk/2.0/defs
472-usr/share/gir-1.0
473+usr/share/gir-1.0/Vte-0.0.gir
474
475=== modified file 'debian/libvte9-udeb.install'
476--- debian/libvte9-udeb.install 2008-11-18 13:39:29 +0000
477+++ debian/libvte9-udeb.install 2010-12-14 13:50:09 +0000
478@@ -1,2 +1,2 @@
479 usr/lib/libvte.so.*
480-usr/share/vte/termcap/xterm
481+usr/share/vte/termcap-0.0/xterm
482
483=== modified file 'debian/libvte9.install'
484--- debian/libvte9.install 2010-08-17 08:12:45 +0000
485+++ debian/libvte9.install 2010-12-14 13:50:09 +0000
486@@ -1,3 +1,2 @@
487 usr/lib/libvte.so.*
488-usr/lib/vte-0.0/* usr/lib/libvte9/
489 usr/lib/libvte9/*
490
491=== added file 'debian/patches/fix_gtk3_api_changes.patch'
492--- debian/patches/fix_gtk3_api_changes.patch 1970-01-01 00:00:00 +0000
493+++ debian/patches/fix_gtk3_api_changes.patch 2010-12-14 13:50:09 +0000
494@@ -0,0 +1,16 @@
495+Index: vte-0.27.2/src/vtebg.c
496+===================================================================
497+--- vte-0.27.2.orig/src/vtebg.c 2010-12-13 16:14:54.627609272 -0500
498++++ vte-0.27.2/src/vtebg.c 2010-12-13 16:15:16.467609272 -0500
499+@@ -240,7 +240,11 @@
500+
501+ window = gdk_screen_get_root_window(screen);
502+ pvt->native.window = window;
503++#if GTK_CHECK_VERSION (2, 91, 6)
504++ pvt->native.native_window = gdk_x11_window_get_xid(window);
505++#else
506+ pvt->native.native_window = gdk_x11_drawable_get_xid(window);
507++#endif
508+ #if GTK_CHECK_VERSION (2, 90, 8)
509+ pvt->native.display = gdk_window_get_display(window);
510+ #else
511
512=== modified file 'debian/patches/series'
513--- debian/patches/series 2010-10-06 11:50:18 +0000
514+++ debian/patches/series 2010-12-14 13:50:09 +0000
515@@ -4,3 +4,4 @@
516 91_keep_fds.patch
517 93_add_alt_screen_scroll_toggle.patch
518 lp621927_set_default_term.patch
519+fix_gtk3_api_changes.patch
520
521=== modified file 'debian/rules'
522--- debian/rules 2010-12-09 03:20:43 +0000
523+++ debian/rules 2010-12-14 13:50:09 +0000
524@@ -1,6 +1,7 @@
525 #!/usr/bin/make -f
526
527 libvteN := $(shell sed -rn 's/^Package:[[:space:]]*(libvte[0-9]+)[[:space:]]*$$/\1/p' debian/control)
528+libvteNgtk3 := $(shell sed -rn 's/^Package:[[:space:]]*(libvte-2.90-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
529 udeb := $(libvteN)-udeb
530
531 buildbasedir := $(CURDIR)/debian/build
532@@ -18,7 +19,7 @@
533
534 DEB_CONFIGURE_LIBEXECDIR := \$${prefix}/lib/$(libvteN)
535 DEB_FIXPERMS_EXCLUDE += gnome-pty-helper
536-DEB_DH_MAKESHLIBS_ARGS_ALL += -V '$(libvteN) (>= 1:0.24.0)' --add-udeb=$(udeb)
537+DEB_DH_MAKESHLIBS_ARGS_libvte9 += -V '$(libvteN) (>= 1:0.24.0)' --add-udeb=$(udeb)
538
539 DEB_CONFIGURE_EXTRA_FLAGS += \
540 --enable-glade-catalogue \
541@@ -37,6 +38,39 @@
542
543 DEB_DH_INSTALL_ARGS = --sourcedir=$(if $(findstring $(udeb),$(cdbs_curpkg)),$(DEB_DESTDIR_$(udeb)),$(DEB_DESTDIR))
544
545+binary-predeb/gir%::
546+ dh_girepository -p$(cdbs_curpkg)
547+
548+######
549+# gtk3 rules
550+gtk3-configure-stamp:
551+ : # configure for GTK+ 3.0
552+ set -e; \
553+ rm -rf $(buildbasedir)/gtk3; \
554+ mkdir $(buildbasedir)/gtk3; \
555+ cd $(buildbasedir)/gtk3; \
556+ $(DEB_CONFIGURE_SCRIPT_ENV) $(DEB_CONFIGURE_SCRIPT) \
557+ $(filter-out --srcdir=%, $(DEB_CONFIGURE_NORMAL_ARGS) \
558+ $(cdbs_configure_flags) \
559+ $(DEB_CONFIGURE_EXTRA_FLAGS) \
560+ $(DEB_CONFIGURE_USER_FLAGS)) \
561+ --with-gtk=3.0 --libexecdir="\$${prefix}/lib/$(libvteNgtk3)"
562+ touch $@
563+gtk3-build-stamp: gtk3-configure-stamp
564+ : # build for GTK+ 3.0
565+ $(MAKE) -C $(buildbasedir)/gtk3
566+ touch $@
567+gtk3-install-stamp: gtk3-build-stamp
568+ : # install for GTK+ 3.0
569+ $(MAKE) -C $(buildbasedir)/gtk3 install DESTDIR=$(DEB_DESTDIR)
570+ touch $@
571+common-configure-arch:: gtk3-configure-stamp
572+common-build-arch:: gtk3-build-stamp
573+common-install-prehook-indep:: gtk3-install-stamp
574+common-install-prehook-arch:: gtk3-install-stamp
575+clean::
576+ rm -f gtk3-*-stamp
577+
578 ######
579 # udeb rules
580 configure/$(udeb):: $(DEB_BUILDDIR_$(udeb))/config.status
581@@ -73,7 +107,7 @@
582 configure/python-vte:: $(addprefix configure-stamp-, $(PY_VERSIONS))
583
584 build-stamp-%:
585- make -C $(buildbasedir)/$*
586+ make -C $(buildbasedir)/$* PYTHON=`which $*`
587 touch $@
588
589 build/python-vte:: $(addprefix build-stamp-, $(PY_VERSIONS))
590
591=== modified file 'debian/watch'
592--- debian/watch 2010-05-24 04:41:47 +0000
593+++ debian/watch 2010-12-14 13:50:09 +0000
594@@ -1,2 +1,2 @@
595 version=3
596-http://ftp.gnome.org/pub/GNOME/sources/vte/([\d\.]+)[\d]/ vte-(.*)\.tar\.gz
597+http://ftp.gnome.org/pub/GNOME/sources/vte/([\d\.]+[\d])/ vte-(.*)\.tar\.gz

Subscribers

People subscribed via source and target branches

to all changes: