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