Merge lp:~ricotz/gnome-terminal/ubuntu into lp:~ubuntu-desktop/gnome-terminal/ubuntu

Proposed by Rico Tzschichholz on 2011-12-15
Status: Merged
Merged at revision: 93
Proposed branch: lp:~ricotz/gnome-terminal/ubuntu
Merge into: lp:~ubuntu-desktop/gnome-terminal/ubuntu
Diff against target: 430 lines (+102/-106)
11 files modified
debian/changelog (+48/-38)
debian/compat (+1/-1)
debian/control (+6/-8)
debian/control.in (+5/-7)
debian/fonts.conf (+0/-11)
debian/gnome-terminal-data.install (+5/-5)
debian/gnome-terminal.install (+3/-2)
debian/patches/01_lpi.patch (+11/-11)
debian/patches/20_add_alt_screen_toggle_ui.patch (+19/-19)
debian/rules (+2/-2)
debian/watch (+2/-2)
To merge this branch: bzr merge lp:~ricotz/gnome-terminal/ubuntu
Reviewer Review Type Date Requested Status
Martin Pitt 2011-12-15 Approve on 2011-12-15
Review via email: mp+85850@code.launchpad.net

Description of the change

New upsteam 3.2.1 merged with debian unstable

To post a comment you must log in.
Martin Pitt (pitti) wrote :

Thank you! this looks fine

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 2011-07-19 22:22:23 +0000
3+++ debian/changelog 2011-12-15 12:47:35 +0000
4@@ -1,46 +1,56 @@
5-gnome-terminal (3.0.1-0ubuntu3) oneiric; urgency=low
6-
7- * debian/patches/01_onlyshowin.patch:
8- - Add Unity to OnlyShowIn value (LP: #803519)
9-
10- -- Michael Terry <mterry@ubuntu.com> Tue, 19 Jul 2011 18:21:19 -0400
11-
12-gnome-terminal (3.0.1-0ubuntu2) oneiric; urgency=low
13-
14- * debian/patches/50_add_unity_quicklist.patch:
15- - add unity quicklist support
16-
17- -- Didier Roche <didrocks@ubuntu.com> Tue, 31 May 2011 11:49:45 +0200
18-
19-gnome-terminal (3.0.1-0ubuntu1) oneiric; urgency=low
20-
21- * New upstream release
22-
23- -- Rodrigo Moya <rodrigo.moya@canonical.com> Wed, 25 May 2011 10:36:19 +0200
24-
25-gnome-terminal (3.0.0-2ubuntu1) oneiric; urgency=low
26+gnome-terminal (3.2.1-2ubuntu1) precise; urgency=low
27+
28+ * Sync with debian, remaining changes:
29+ - debian/control:
30+ + Build-Depend on liblaunchpad-integration-3.0-dev, dh-autoreconf
31+ and gnome-common
32+ - debian/patches:
33+ + 01_lpi.patch: Launchpad integration patch
34+ + 01_onlyshowin.patch: Add Unity to OnlyShowIn value (LP: #803519)
35+ + 02_add_transparency_properties.patch: Allow background
36+ transparency to be controlled from the GTK theme. Needs rebase
37+ + 20_add_alt_screen_toggle_ui.patch: Hook new vte
38+ alternate screen scrolling toggle via UI
39+ + 50_add_unity_quicklist.patch: Add unity quicklist support
40+ - debian/rules: Include autoreconf.mk
41+ - debian/watch: Allow retrieving of unstable releases
42+
43+ -- Rico Tzschichholz <ricotz@ubuntu.com> Thu, 15 Dec 2011 13:04:33 +0100
44+
45+gnome-terminal (3.2.1-2) unstable; urgency=low
46+
47+ * Reintroduce gtk2 build-dependency, it’s required for
48+ gtk-builder-convert.
49+
50+ -- Josselin Mouette <joss@debian.org> Sun, 20 Nov 2011 00:25:02 +0100
51+
52+gnome-terminal (3.2.1-1) experimental; urgency=low
53+
54+ * New upstream release.
55+ * Bump vte requirement.
56+ * Stop forcing gtk+ version, only gtk+ 3.x is supported now.
57+
58+ -- Josselin Mouette <joss@debian.org> Sat, 12 Nov 2011 17:52:40 +0100
59+
60+gnome-terminal (3.0.1-1) unstable; urgency=low
61
62 [ Raphaël Hertzog ]
63 * Add lintian overrides for menu-icon-missing.
64
65- [ Rodrigo Moya ]
66- * Rebase on Debian and the GNOME3 PPA (Thanks to Rico Tzschichholz).
67- Remaining Ubuntu-specific changes:
68- * debian/control:
69- - Build-Depend on liblaunchpad-integration-3.0-dev, dh-autoreconf and gnome-common
70- - Replaces: gnome-terminal-data (<< 2.28.1-1ubuntu1)
71- * debian/patches/01_lpi.patch:
72- - Launchpad integration patch
73- * debian/patches/02_add_transparency_properties.patch:
74- - Allow background transparency to be controlled from the GTK theme. Needs rebase
75- * debian/patches/20_add_alt_screen_toggle_ui.patch:
76- - Hook new vte alternate screen scrolling toggle via UI
77- * debian/rules:
78- - Include autoreconf.mk
79- * debian/watch:
80- - Allow retrieving of unstable releases
81+ [ Michael Biebl ]
82+ * debian/watch: Switch to .bz2 tarballs.
83+ * New upstream release.
84+ * debian/control.in
85+ - Drop Build-Depends on libdbus-glib-1-dev.
86+ - Drop Build-Depends on dpkg-dev (>= 1.13.19), even the version from lenny
87+ is recent enough.
88+ - Add Vcs-* fields.
89+ * Bump debhelper compatibility level to 8.
90+ - Update Build-Depends on debhelper.
91+ - Strip debian/tmp/ from .install files.
92+ * Remove debian/fonts.conf, unused.
93
94- -- Rodrigo Moya <rodrigo.moya@canonical.com> Tue, 17 May 2011 16:17:22 +0200
95+ -- Michael Biebl <biebl@debian.org> Thu, 16 Jun 2011 16:19:04 +0200
96
97 gnome-terminal (3.0.0-1) experimental; urgency=low
98
99
100=== modified file 'debian/compat'
101--- debian/compat 2008-06-18 08:31:47 +0000
102+++ debian/compat 2011-12-15 12:47:35 +0000
103@@ -1,1 +1,1 @@
104-5
105+8
106
107=== modified file 'debian/control'
108--- debian/control 2011-05-17 14:38:48 +0000
109+++ debian/control 2011-12-15 12:47:35 +0000
110@@ -6,28 +6,26 @@
111 Source: gnome-terminal
112 Section: gnome
113 Priority: optional
114+Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
115 XSBC-Original-Maintainer: Guilherme de S. Pastore <gpastore@debian.org>
116-Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
117-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Luca Falavigna <dktrkranz@debian.org>, Sebastian Dröge <slomo@debian.org>
118+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Frederic Peters <fpeters@debian.org>, Josselin Mouette <joss@debian.org>, Michael Biebl <biebl@debian.org>, Sebastian Dröge <slomo@debian.org>
119 Standards-Version: 3.9.2
120 Build-Depends: cdbs (>= 0.4.41),
121- debhelper (>= 5),
122+ debhelper (>= 8),
123 dh-autoreconf,
124 gnome-common,
125 intltool (>= 0.40.0),
126 libx11-dev,
127 libgtk-3-dev (>= 3.0.0),
128- libgtk2.0-dev (>= 2.24.0),
129+ libgtk2.0-dev,
130 libglib2.0-dev (>= 2.26.0),
131- libvte-2.90-dev (>= 0.27.3),
132+ libvte-2.90-dev (>= 1:0.30.0),
133 scrollkeeper,
134 libsm-dev,
135 gnome-pkg-tools (>= 0.10),
136- dpkg-dev (>= 1.13.19),
137 docbook-to-man,
138 gnome-doc-utils,
139 libgconf2-dev (>= 2.31.3),
140- libdbus-glib-1-dev (>= 0.6),
141 gsettings-desktop-schemas-dev (>= 0.1.0),
142 liblaunchpad-integration-3.0-dev
143 Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-terminal/ubuntu
144@@ -39,7 +37,7 @@
145 gsettings-desktop-schemas (>= 0.1.0),
146 gnome-terminal-data (>= ${gnome:Version}),
147 gnome-terminal-data (<< ${gnome:NextVersion})
148-Replaces: gnome-terminal-data (<< 2.28.1-1ubuntu1)
149+Replaces: gnome-terminal-data (<< 2.26.2-3)
150 Provides: x-terminal-emulator
151 Recommends: yelp,
152 gvfs
153
154=== modified file 'debian/control.in'
155--- debian/control.in 2011-05-17 14:38:48 +0000
156+++ debian/control.in 2011-12-15 12:47:35 +0000
157@@ -1,28 +1,26 @@
158 Source: gnome-terminal
159 Section: gnome
160 Priority: optional
161+Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
162 XSBC-Original-Maintainer: Guilherme de S. Pastore <gpastore@debian.org>
163-Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
164 Uploaders: @GNOME_TEAM@
165 Standards-Version: 3.9.2
166 Build-Depends: cdbs (>= 0.4.41),
167- debhelper (>= 5),
168+ debhelper (>= 8),
169 dh-autoreconf,
170 gnome-common,
171 intltool (>= 0.40.0),
172 libx11-dev,
173 libgtk-3-dev (>= 3.0.0),
174- libgtk2.0-dev (>= 2.24.0),
175+ libgtk2.0-dev,
176 libglib2.0-dev (>= 2.26.0),
177- libvte-2.90-dev (>= 0.27.3),
178+ libvte-2.90-dev (>= 1:0.30.0),
179 scrollkeeper,
180 libsm-dev,
181 gnome-pkg-tools (>= 0.10),
182- dpkg-dev (>= 1.13.19),
183 docbook-to-man,
184 gnome-doc-utils,
185 libgconf2-dev (>= 2.31.3),
186- libdbus-glib-1-dev (>= 0.6),
187 gsettings-desktop-schemas-dev (>= 0.1.0),
188 liblaunchpad-integration-3.0-dev
189 Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-terminal/ubuntu
190@@ -34,7 +32,7 @@
191 gsettings-desktop-schemas (>= 0.1.0),
192 gnome-terminal-data (>= ${gnome:Version}),
193 gnome-terminal-data (<< ${gnome:NextVersion})
194-Replaces: gnome-terminal-data (<< 2.28.1-1ubuntu1)
195+Replaces: gnome-terminal-data (<< 2.26.2-3)
196 Provides: x-terminal-emulator
197 Recommends: yelp,
198 gvfs
199
200=== removed file 'debian/fonts.conf'
201--- debian/fonts.conf 2008-06-18 08:31:47 +0000
202+++ debian/fonts.conf 1970-01-01 00:00:00 +0000
203@@ -1,11 +0,0 @@
204-<match target="font">
205- <test qual="any" name="size" compare="more">
206- <int>7</int>
207- </test>
208- <test qual="any" name="size" compare="less">
209- <int>12</int>
210- </test>
211- <edit name="antialias" mode="assign">
212- <bool>false</bool>
213- </edit>
214-</match>
215
216=== modified file 'debian/gnome-terminal-data.install'
217--- debian/gnome-terminal-data.install 2009-12-01 06:50:13 +0000
218+++ debian/gnome-terminal-data.install 2011-12-15 12:47:35 +0000
219@@ -1,7 +1,7 @@
220-debian/tmp/etc
221-debian/tmp/usr/share/gnome-terminal
222-debian/tmp/usr/share/locale
223-debian/tmp/usr/share/gnome
224-debian/tmp/usr/share/omf
225+etc
226+usr/share/gnome-terminal
227+usr/share/locale
228+usr/share/gnome
229+usr/share/omf
230
231 debian/gnome-terminal.xpm /usr/share/pixmaps
232
233=== modified file 'debian/gnome-terminal.install'
234--- debian/gnome-terminal.install 2010-06-25 03:38:38 +0000
235+++ debian/gnome-terminal.install 2011-12-15 12:47:35 +0000
236@@ -1,3 +1,4 @@
237-debian/tmp/usr/bin
238-debian/tmp/usr/share/applications
239+usr/bin
240+usr/share/applications
241+
242 debian/gnome-terminal.wrapper /usr/bin
243
244=== modified file 'debian/patches/01_lpi.patch'
245--- debian/patches/01_lpi.patch 2011-05-17 14:38:48 +0000
246+++ debian/patches/01_lpi.patch 2011-12-15 12:47:35 +0000
247@@ -1,11 +1,11 @@
248 Description: Launchpad integration
249 Author: ?
250
251-Index: gnome-terminal-2.33.90/configure.ac
252+Index: gnome-terminal-3.2.1/configure.ac
253 ===================================================================
254---- gnome-terminal-2.33.90.orig/configure.ac
255-+++ gnome-terminal-2.33.90/configure.ac
256-@@ -92,6 +92,7 @@
257+--- gnome-terminal-3.2.1.orig/configure.ac
258++++ gnome-terminal-3.2.1/configure.ac
259+@@ -87,6 +87,7 @@
260 gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
261 gconf-2.0 >= $GCONF_REQUIRED
262 gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
263@@ -13,10 +13,10 @@
264 $PLATFORM_DEPS])
265
266 # ********
267-Index: gnome-terminal-2.33.90/src/terminal-window.c
268+Index: gnome-terminal-3.2.1/src/terminal-window.c
269 ===================================================================
270---- gnome-terminal-2.33.90.orig/src/terminal-window.c
271-+++ gnome-terminal-2.33.90/src/terminal-window.c
272+--- gnome-terminal-3.2.1.orig/src/terminal-window.c
273++++ gnome-terminal-3.2.1/src/terminal-window.c
274 @@ -32,6 +32,7 @@
275 #include <gdk/gdkkeysyms.h>
276 #define GDK_KEY(symbol) GDK_##symbol
277@@ -25,7 +25,7 @@
278
279 #include "terminal-accels.h"
280 #include "terminal-app.h"
281-@@ -2123,6 +2124,7 @@
282+@@ -2114,6 +2115,7 @@
283 gtk_box_pack_start (GTK_BOX (main_vbox),
284 priv->menubar,
285 FALSE, FALSE, 0);
286@@ -33,10 +33,10 @@
287
288 /* Add tabs menu */
289 priv->tabs_menu = terminal_tabs_menu_new (window);
290-Index: gnome-terminal-2.33.90/src/terminal.xml
291+Index: gnome-terminal-3.2.1/src/terminal.xml
292 ===================================================================
293---- gnome-terminal-2.33.90.orig/src/terminal.xml
294-+++ gnome-terminal-2.33.90/src/terminal.xml
295+--- gnome-terminal-3.2.1.orig/src/terminal.xml
296++++ gnome-terminal-3.2.1/src/terminal.xml
297 @@ -73,6 +73,7 @@
298 </menu>
299 <menu action="Help">
300
301=== modified file 'debian/patches/20_add_alt_screen_toggle_ui.patch'
302--- debian/patches/20_add_alt_screen_toggle_ui.patch 2011-05-17 14:38:48 +0000
303+++ debian/patches/20_add_alt_screen_toggle_ui.patch 2011-12-15 12:47:35 +0000
304@@ -1,10 +1,10 @@
305 Description: Hook new vte alternate screen scrolling toggle via UI
306 Author: ?
307
308-Index: gnome-terminal-2.33.90/src/gnome-terminal.schemas.in
309+Index: gnome-terminal-3.2.1/src/gnome-terminal.schemas.in
310 ===================================================================
311---- gnome-terminal-2.33.90.orig/src/gnome-terminal.schemas.in
312-+++ gnome-terminal-2.33.90/src/gnome-terminal.schemas.in
313+--- gnome-terminal-3.2.1.orig/src/gnome-terminal.schemas.in
314++++ gnome-terminal-3.2.1/src/gnome-terminal.schemas.in
315 @@ -418,6 +418,23 @@
316 </schema>
317
318@@ -29,10 +29,10 @@
319 <key>/schemas/apps/gnome-terminal/profiles/Default/exit_action</key>
320 <applyto>/apps/gnome-terminal/profiles/Default/exit_action</applyto>
321 <owner>gnome-terminal</owner>
322-Index: gnome-terminal-2.33.90/src/profile-editor.c
323+Index: gnome-terminal-3.2.1/src/profile-editor.c
324 ===================================================================
325---- gnome-terminal-2.33.90.orig/src/profile-editor.c
326-+++ gnome-terminal-2.33.90/src/profile-editor.c
327+--- gnome-terminal-3.2.1.orig/src/profile-editor.c
328++++ gnome-terminal-3.2.1/src/profile-editor.c
329 @@ -279,6 +279,10 @@
330 SET_SENSITIVE ("scroll-on-output-checkbutton",
331 !terminal_profile_property_locked (profile, TERMINAL_PROFILE_SCROLL_ON_OUTPUT));
332@@ -44,7 +44,7 @@
333 if (!prop_name || prop_name == I_(TERMINAL_PROFILE_EXIT_ACTION))
334 SET_SENSITIVE ("exit-action-combobox",
335 !terminal_profile_property_locked (profile, TERMINAL_PROFILE_EXIT_ACTION));
336-@@ -899,6 +903,7 @@
337+@@ -914,6 +918,7 @@
338 CONNECT ("scrollbar-position-combobox", TERMINAL_PROFILE_SCROLLBAR_POSITION);
339 CONNECT ("scroll-on-keystroke-checkbutton", TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE);
340 CONNECT ("scroll-on-output-checkbutton", TERMINAL_PROFILE_SCROLL_ON_OUTPUT);
341@@ -52,10 +52,10 @@
342 CONNECT ("show-menubar-checkbutton", TERMINAL_PROFILE_DEFAULT_SHOW_MENUBAR);
343 CONNECT ("solid-radiobutton", TERMINAL_PROFILE_BACKGROUND_TYPE);
344 CONNECT ("system-font-checkbutton", TERMINAL_PROFILE_USE_SYSTEM_FONT);
345-Index: gnome-terminal-2.33.90/src/profile-preferences.glade
346+Index: gnome-terminal-3.2.1/src/profile-preferences.glade
347 ===================================================================
348---- gnome-terminal-2.33.90.orig/src/profile-preferences.glade
349-+++ gnome-terminal-2.33.90/src/profile-preferences.glade
350+--- gnome-terminal-3.2.1.orig/src/profile-preferences.glade
351++++ gnome-terminal-3.2.1/src/profile-preferences.glade
352 @@ -2416,6 +2416,27 @@
353 </packing>
354 </child>
355@@ -84,10 +84,10 @@
356 <child>
357 <widget class="GtkCheckButton" id="scroll-on-keystroke-checkbutton">
358 <property name="visible">True</property>
359-Index: gnome-terminal-2.33.90/src/terminal-profile.c
360+Index: gnome-terminal-3.2.1/src/terminal-profile.c
361 ===================================================================
362---- gnome-terminal-2.33.90.orig/src/terminal-profile.c
363-+++ gnome-terminal-2.33.90/src/terminal-profile.c
364+--- gnome-terminal-3.2.1.orig/src/terminal-profile.c
365++++ gnome-terminal-3.2.1/src/terminal-profile.c
366 @@ -75,6 +75,7 @@
367 PROP_SCROLLBAR_POSITION,
368 PROP_SCROLL_ON_KEYSTROKE,
369@@ -120,10 +120,10 @@
370 TERMINAL_PROFILE_PROPERTY_BOOLEAN (SILENT_BELL, DEFAULT_SILENT_BELL, KEY_SILENT_BELL);
371 TERMINAL_PROFILE_PROPERTY_BOOLEAN (UPDATE_RECORDS, DEFAULT_UPDATE_RECORDS, KEY_UPDATE_RECORDS);
372 TERMINAL_PROFILE_PROPERTY_BOOLEAN (USE_CUSTOM_COMMAND, DEFAULT_USE_CUSTOM_COMMAND, KEY_USE_CUSTOM_COMMAND);
373-Index: gnome-terminal-2.33.90/src/terminal-profile.h
374+Index: gnome-terminal-3.2.1/src/terminal-profile.h
375 ===================================================================
376---- gnome-terminal-2.33.90.orig/src/terminal-profile.h
377-+++ gnome-terminal-2.33.90/src/terminal-profile.h
378+--- gnome-terminal-3.2.1.orig/src/terminal-profile.h
379++++ gnome-terminal-3.2.1/src/terminal-profile.h
380 @@ -93,6 +93,7 @@
381 #define TERMINAL_PROFILE_SCROLLBAR_POSITION "scrollbar-position"
382 #define TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE "scroll-on-keystroke"
383@@ -132,10 +132,10 @@
384 #define TERMINAL_PROFILE_SILENT_BELL "silent-bell"
385 #define TERMINAL_PROFILE_TITLE_MODE "title-mode"
386 #define TERMINAL_PROFILE_TITLE "title"
387-Index: gnome-terminal-2.33.90/src/terminal-screen.c
388+Index: gnome-terminal-3.2.1/src/terminal-screen.c
389 ===================================================================
390---- gnome-terminal-2.33.90.orig/src/terminal-screen.c
391-+++ gnome-terminal-2.33.90/src/terminal-screen.c
392+--- gnome-terminal-3.2.1.orig/src/terminal-screen.c
393++++ gnome-terminal-3.2.1/src/terminal-screen.c
394 @@ -963,6 +963,9 @@
395 if (!prop_name || prop_name == I_(TERMINAL_PROFILE_SCROLL_ON_OUTPUT))
396 vte_terminal_set_scroll_on_output (vte_terminal,
397
398=== modified file 'debian/rules'
399--- debian/rules 2011-05-17 14:38:48 +0000
400+++ debian/rules 2011-12-15 12:47:35 +0000
401@@ -1,17 +1,17 @@
402 #!/usr/bin/make -f
403 # -*- mode: makefile; coding: utf-8 -*-
404
405+include /usr/share/cdbs/1/rules/autoreconf.mk
406 include /usr/share/cdbs/1/rules/debhelper.mk
407 include /usr/share/cdbs/1/rules/utils.mk
408 include /usr/share/cdbs/1/class/gnome.mk
409-include /usr/share/cdbs/1/rules/autoreconf.mk
410 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
411 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
412 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
413
414 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
415
416-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --with-gtk=3.0
417+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
418
419 build/gnome-terminal::
420 /usr/bin/docbook-to-man debian/gnome-terminal.sgml > debian/gnome-terminal.1
421
422=== modified file 'debian/watch'
423--- debian/watch 2010-05-24 04:52:45 +0000
424+++ debian/watch 2011-12-15 12:47:35 +0000
425@@ -1,3 +1,3 @@
426-version=2
427+version=3
428 http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/([\d\.]+)\d/ \
429- gnome-terminal-(.*)\.tar\.gz
430+ gnome-terminal-(.*)\.tar\.bz2

Subscribers

People subscribed via source and target branches